@@ -44,22 +44,27 @@ import Control.Monad.State
4444
4545data WriterState = WriterState {
4646 stNotes :: Bool -- True if there are notes
47− , stListLevel :: String -- String at beginning of list items, e.g. "**"
48− , stUseTags :: Bool -- True if we should use HTML tags because we're in a complex list
4947 }
5048
51−type MediaWikiWriter = ReaderT WriterOptions (State WriterState)
49+data WriterReader = WriterReader {
50+ 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
53+ }
54+
55+type MediaWikiWriter = ReaderT WriterReader (State WriterState)
5256
5357-- | Convert Pandoc to MediaWiki.
5458writeMediaWiki :: WriterOptions -> Pandoc -> String
5559writeMediaWiki opts document =
56− evalState (runReaderT (pandocToMediaWiki document) opts)
57− WriterState { stNotes = False, stListLevel = [], stUseTags = False }
60+ let initialState = WriterState { stNotes = False }
61+ env = WriterReader { options = opts, stListLevel = [], stUseTags = False }
62+ in evalState (runReaderT (pandocToMediaWiki document) env) initialState
5863
5964-- | Return MediaWiki representation of document.
6065pandocToMediaWiki :: Pandoc -> MediaWikiWriter String
6166pandocToMediaWiki (Pandoc meta blocks) = do
62− opts <- ask
67+ opts <- asks options
6368 metadata <- metaToJSON opts
6469 (fmap trimr . blockListToMediaWiki)
6570 inlineListToMediaWiki
@@ -105,8 +110,8 @@ blockToMediaWiki (Para [Image txt (src,'f':'i':'g':':':tit)]) = do
105110 return $ "[[Image:" ++ src ++ "|frame|none" ++ opt ++ "]]\n"
106111
107112blockToMediaWiki (Para inlines) = do
108− useTags <- gets stUseTags
109− listLevel <- gets stListLevel
113+ useTags <- asks stUseTags
114+ listLevel <- asks stListLevel
110115 contents <- inlineListToMediaWiki inlines
111116 return $ if useTags
112117 then "<p>" ++ contents ++ "</p>"
@@ -157,51 +162,39 @@ blockToMediaWiki (Table capt aligns widths headers rows') = do
157162 return $ "{|\n" ++ caption ++ tableBody ++ "|}\n"
158163
159164blockToMediaWiki x@(BulletList items) = do
160− oldUseTags <- gets stUseTags
161− listLevel <- gets stListLevel
165+ oldUseTags <- asks stUseTags
166+ listLevel <- asks stListLevel
162167 let useTags = oldUseTags || not (isSimpleList x)
163168 if useTags
164169 then do
165− modify $ \s -> s { stUseTags = True }
166− contents <- mapM listItemToMediaWiki items
167− modify $ \s -> s { stUseTags = oldUseTags }
170+ contents <- local (\ s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
168171 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
169172 else do
170− modify $ \s -> s { stListLevel = stListLevel s ++ "*" }
171− contents <- mapM listItemToMediaWiki items
172− modify $ \s -> s { stListLevel = init (stListLevel s) }
173+ contents <- local (\s -> s { stListLevel = stListLevel s ++ "*" }) $ mapM listItemToMediaWiki items
173174 return $ vcat contents ++ if null listLevel then "\n" else ""
174175
175176blockToMediaWiki x@(OrderedList attribs items) = do
176− oldUseTags <- gets stUseTags
177− listLevel <- gets stListLevel
177+ oldUseTags <- asks stUseTags
178+ listLevel <- asks stListLevel
178179 let useTags = oldUseTags || not (isSimpleList x)
179180 if useTags
180181 then do
181− modify $ \s -> s { stUseTags = True }
182− contents <- mapM listItemToMediaWiki items
183− modify $ \s -> s { stUseTags = oldUseTags }
182+ contents <- local (\s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
184183 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
185184 else do
186− modify $ \s -> s { stListLevel = stListLevel s ++ "#" }
187− contents <- mapM listItemToMediaWiki items
188− modify $ \s -> s { stListLevel = init (stListLevel s) }
185+ contents <- local (\s -> s { stListLevel = stListLevel s ++ "#" }) $ mapM listItemToMediaWiki items
189186 return $ vcat contents ++ if null listLevel then "\n" else ""
190187
191188blockToMediaWiki x@(DefinitionList items) = do
192− oldUseTags <- gets stUseTags
193− listLevel <- gets stListLevel
189+ oldUseTags <- asks stUseTags
190+ listLevel <- asks stListLevel
194191 let useTags = oldUseTags || not (isSimpleList x)
195192 if useTags
196193 then do
197− modify $ \s -> s { stUseTags = True }
198− contents <- mapM definitionListItemToMediaWiki items
199− modify $ \s -> s { stUseTags = oldUseTags }
194+ contents <- local (\s -> s { stUseTags = True }) $ mapM definitionListItemToMediaWiki items
200195 return $ "<dl>\n" ++ vcat contents ++ "</dl>\n"
201196 else do
202− modify $ \s -> s { stListLevel = stListLevel s ++ ";" }
203− contents <- mapM definitionListItemToMediaWiki items
204− modify $ \s -> s { stListLevel = init (stListLevel s) }
197+ contents <- local (\s -> s { stListLevel = stListLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
205198 return $ vcat contents ++ if null listLevel then "\n" else ""
206199
207200-- Auxiliary functions for lists:
@@ -221,11 +214,11 @@ listAttribsToString (startnum, numstyle, _) =
221214listItemToMediaWiki :: [Block] -> MediaWikiWriter String
222215listItemToMediaWiki items = do
223216 contents <- blockListToMediaWiki items
224− useTags <- gets stUseTags
217+ useTags <- asks stUseTags
225218 if useTags
226219 then return $ "<li>" ++ contents ++ "</li>"
227220 else do
228− marker <- gets stListLevel
221+ marker <- asks stListLevel
229222 return $ marker ++ " " ++ contents
230223
231224-- | Convert definition list item (label, list of blocks) to MediaWiki.
@@ -234,12 +227,12 @@ definitionListItemToMediaWiki :: ([Inline],[[Block]])
234227definitionListItemToMediaWiki (label, items) = do
235228 labelText <- inlineListToMediaWiki label
236229 contents <- mapM blockListToMediaWiki items
237− useTags <- gets stUseTags
230+ useTags <- asks stUseTags
238231 if useTags
239232 then return $ "<dt>" ++ labelText ++ "</dt>\n" ++
240233 intercalate "\n" (map (\d -> "<dd>" ++ d ++ "</dd>") contents)
241234 else do
242− marker <- gets stListLevel
235+ marker <- asks stListLevel
243236 return $ marker ++ " " ++ labelText ++ "\n" ++
244237 intercalate "\n" (map (\d -> init marker ++ ": " ++ d) contents)
245238