@@ -114,11 +114,11 @@ blockToZimWiki opts (Para inlines) = do
114blockToZimWiki opts (RawBlock f str)
114blockToZimWiki opts (RawBlock f str)
115 | f == Format "zimwiki" = return str
115 | f == Format "zimwiki" = return str
116 | f == Format "html" = do cont <- indentFromHTML opts str; return cont
116 | f == Format "html" = do cont <- indentFromHTML opts str; return cont
117− | otherwise = return "" -- $ "** unknown raw block "++ show f ++ "=" ++ str ++ " **"
117+ | otherwise = return ""
119blockToZimWiki _ HorizontalRule = return "\n----\n"
119blockToZimWiki _ HorizontalRule = return "\n----\n"
121−blockToZimWiki opts (Header level _ inlines) = do
121+blockToZimWiki opts (Header level _ inlines) = do
122 contents <- inlineListToZimWiki opts $ removeFormatting inlines -- emphasis, links etc. not allowed in headers
122 contents <- inlineListToZimWiki opts $ removeFormatting inlines -- emphasis, links etc. not allowed in headers
123 let eqs = replicate ( 7 - level ) '='
123 let eqs = replicate ( 7 - level ) '='
124 return $ eqs ++ " " ++ contents ++ " " ++ eqs ++ "\n"
124 return $ eqs ++ " " ++ contents ++ " " ++ eqs ++ "\n"
@@ -204,23 +204,23 @@ indentFromHTML _ str = do
204 let val = drop 10 $ reverse $ drop 1 $ reverse str
204 let val = drop 10 $ reverse $ drop 1 $ reverse str
205 --let val = take ((length valls) - 2) valls
205 --let val = take ((length valls) - 2) valls
206 modify $ \s -> s { stItemNum = read val }
206 modify $ \s -> s { stItemNum = read val }
207− return "" -- $ indent ++ val ++ "." -- zim does its own numbering
207+ return ""
208 else if isInfixOf "<ol>" str then do
208 else if isInfixOf "<ol>" str then do
209 let olcount=countSubStrs "<ol>" str
209 let olcount=countSubStrs "<ol>" str
210 modify $ \s -> s { stIndent = stIndent s ++ replicate olcount '\t', stItemNum = 1 }
210 modify $ \s -> s { stIndent = stIndent s ++ replicate olcount '\t', stItemNum = 1 }
211− return "" -- $ "OL-ON[" ++ newfix ++"]"
211+ return ""
212 else if isInfixOf "</ol>" str then do
212 else if isInfixOf "</ol>" str then do
213 let olcount=countSubStrs "/<ol>" str
213 let olcount=countSubStrs "/<ol>" str
214 modify $ \s -> s{ stIndent = drop olcount (stIndent s) }
214 modify $ \s -> s{ stIndent = drop olcount (stIndent s) }
215− return "" -- $ "OL-OFF[" ++ newfix ++"]"
215+ return ""
217− return $ "" -- ** unknown inner HTML "++ str ++"**"
217+ return ""
219countSubStrs :: String -> String -> Int
219countSubStrs :: String -> String -> Int
220countSubStrs sub str = length $ breakOnAll (pack sub) (pack str)
220countSubStrs sub str = length $ breakOnAll (pack sub) (pack str)
222cleanupCode :: String -> String
222cleanupCode :: String -> String
223−cleanupCode = substitute "<nowiki>" "" . substitute "</nowiki>" ""
223+cleanupCode = substitute "<nowiki>" "" . substitute "</nowiki>" ""
225vcat :: [String] -> String
225vcat :: [String] -> String
226vcat = intercalate "\n"
226vcat = intercalate "\n"