2 files changed, 25 insertions, 16 deletions
diff --git a/Text/Pandoc/Writers/HTML.hs b/Text/Pandoc/Writers/HTML.hs
index acb9f32bb..7837493a1 100644
--- a/Text/Pandoc/Writers/HTML.hs
+++ b/Text/Pandoc/Writers/HTML.hs
@@ -33,7 +33,6 @@ import Text.Pandoc.ASCIIMathML
 import Text.Pandoc.CharacterReferences ( decodeCharacterReferences )
 import Text.Pandoc.Shared
 import Text.Pandoc.Readers.TeXMath
-import Text.Regex ( mkRegex, matchRegex )
 import Numeric ( showHex )
 import Data.Char ( ord, toLower, isAlpha )
 import Data.List ( isPrefixOf, intersperse, find )
@@ -162,13 +161,21 @@ footnoteSection opts notes =
      then noHtml
      else thediv ! [theclass "footnotes"] $ hr +++ (olist << notes)
 
+
+-- | Parse a mailto link; return Just (name, domain) or Nothing.
+parseMailto :: String -> Maybe (String, String)
+parseMailto ('m':'a':'i':'l':'t':'o':':':address) =
+  let (name, rest) = span (/='@') address
+      domain = drop 1 rest
+  in  Just (name, domain)
+parseMailto _ = Nothing 
+
 -- | Obfuscate a "mailto:" link using Javascript.
 obfuscateLink :: WriterOptions -> String -> String -> Html
 obfuscateLink opts text src =
-  let emailRegex = mkRegex "^mailto:([^@]*)@(.*)$"
-      src'       = map toLower src
-  in  case (matchRegex emailRegex src') of
-        (Just [name, domain]) ->
+  let src' = map toLower src
+  in  case parseMailto src' of
+        (Just (name, domain)) ->
           let domain'  = substitute "." " dot " domain
               at'      = obfuscateChar '@'
               (linkText, altText) = 
diff --git a/Text/Pandoc/Writers/RTF.hs b/Text/Pandoc/Writers/RTF.hs
index 00cc8c6cd..c95c24b2f 100644
--- a/Text/Pandoc/Writers/RTF.hs
+++ b/Text/Pandoc/Writers/RTF.hs
@@ -31,9 +31,8 @@ module Text.Pandoc.Writers.RTF ( writeRTF ) where
 import Text.Pandoc.Definition
 import Text.Pandoc.Shared
 import Text.Pandoc.Readers.TeXMath
-import Text.Regex ( matchRegexAll, mkRegex )
 import Data.List ( isSuffixOf )
-import Data.Char ( ord )
+import Data.Char ( ord, isDigit )
 
 -- | Convert Pandoc to a string in rich text format.
 writeRTF :: WriterOptions -> Pandoc -> String
@@ -230,15 +229,18 @@ listItemToRTF alignment indent marker [] =
   rtfCompact (indent + listIncrement) (0 - listIncrement) alignment 
              (marker ++ "\\tx" ++ (show listIncrement) ++ "\\tab ") 
 listItemToRTF alignment indent marker list = 
-  let (first:rest) = map (blockToRTF (indent + listIncrement) alignment) list in
-  -- insert the list marker into the (processed) first block
-  let modFirst = case matchRegexAll (mkRegex "\\\\fi-?[0-9]+") first of
-                    Just (before, matched, after, _) -> 
-                                before ++ "\\fi" ++ show (0 - listIncrement) ++ 
-                                " " ++ marker ++ "\\tx" ++ 
-                                show listIncrement ++ "\\tab" ++ after
-                    Nothing -> first in
-  modFirst ++ concat rest
+  let (first:rest) = map (blockToRTF (indent + listIncrement) alignment) list
+      listMarker = "\\fi" ++ show (0 - listIncrement) ++ " " ++ marker ++ "\\tx" ++
+                      show listIncrement ++ "\\tab"
+      insertListMarker ('\\':'f':'i':'-':d:xs) | isDigit d =
+        listMarker ++ dropWhile isDigit xs
+      insertListMarker ('\\':'f':'i':d:xs) | isDigit d =
+        listMarker ++ dropWhile isDigit xs
+      insertListMarker (x:xs) =
+        x : insertListMarker xs
+      insertListmarker [] = []
+      -- insert the list marker into the (processed) first block
+  in  insertListMarker first ++ concat rest
 
 -- | Convert definition list item (label, list of blocks) to RTF.
 definitionListItemToRTF :: Alignment          -- ^ alignment