@@ -228,6 +228,7 @@ wrapIfNeeded opts = if writerWrapText opts
230-- auxiliary function for wrappedTeX
230-- auxiliary function for wrappedTeX
231+isNote :: Inline -> Bool
231isNote (Note _) = True
232isNote (Note _) = True
232isNote _ = False
233isNote _ = False
@@ -386,7 +387,10 @@ charsInBalanced' open close = try $ do
387-- Auxiliary functions for romanNumeral:
388-- Auxiliary functions for romanNumeral:
390+lowercaseRomanDigits :: [Char]
389lowercaseRomanDigits = ['i','v','x','l','c','d','m']
391lowercaseRomanDigits = ['i','v','x','l','c','d','m']
393+uppercaseRomanDigits :: [Char]
390uppercaseRomanDigits = map toUpper lowercaseRomanDigits
394uppercaseRomanDigits = map toUpper lowercaseRomanDigits
392-- | Parses a roman numeral (uppercase or lowercase), returns number.
396-- | Parses a roman numeral (uppercase or lowercase), returns number.
@@ -421,13 +425,16 @@ romanNumeral upperCase = do
422-- Parsers for email addresses and URIs
426-- Parsers for email addresses and URIs
428+emailChar :: GenParser Char st Char
424emailChar = alphaNum <|> oneOf "-+_."
429emailChar = alphaNum <|> oneOf "-+_."
431+domainChar :: GenParser Char st Char
426domainChar = alphaNum <|> char '-'
432domainChar = alphaNum <|> char '-'
434+domain :: GenParser Char st [Char]
428domain = do
435domain = do
429 first <- many1 domainChar
436 first <- many1 domainChar
430− dom <- many1 (try (do{ char '.'; many1 domainChar }))
437+ dom <- many1 $ try (char '.' >> many1 domainChar )
431 return $ joinWithSep "." (first:dom)
438 return $ joinWithSep "." (first:dom)
433-- | Parses an email address; returns string.
440-- | Parses an email address; returns string.
@@ -441,6 +448,7 @@ emailAddress = try $ do
441 return $ addr ++ '@':dom
448 return $ addr ++ '@':dom
443-- | Parses a URI.
450-- | Parses a URI.
451+uri :: GenParser Char st String
444uri = try $ do
452uri = try $ do
445 str <- many1 $ satisfy isAllowedInURI
453 str <- many1 $ satisfy isAllowedInURI
446 case parseURI str of
454 case parseURI str of