Removed 'gsub' entirely and replaced its uses with 'substitute'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@501 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
parent
8f0750574a
commit
1121e8738b
6 changed files with 5 additions and 13 deletions
|
@ -291,7 +291,7 @@ authors = try (do
|
|||
authors <- manyTill anyChar (char '}')
|
||||
spaces
|
||||
let authors' = map removeLeadingTrailingSpace $ lines $
|
||||
gsub "\\\\\\\\" "\n" authors
|
||||
substitute "\\\\" "\n" authors
|
||||
updateState (\state -> state { stateAuthors = authors' })
|
||||
return Null)
|
||||
|
||||
|
|
|
@ -887,7 +887,7 @@ titleWith startChar endChar = try (do
|
|||
char endChar
|
||||
skipSpaces
|
||||
notFollowedBy (noneOf ")\n")))
|
||||
let tit' = gsub "\"" """ tit
|
||||
let tit' = substitute "\"" """ tit
|
||||
return tit')
|
||||
|
||||
title = choice [ titleWith '(' ')',
|
||||
|
|
|
@ -33,7 +33,6 @@ module Text.Pandoc.Shared (
|
|||
splitByIndices,
|
||||
substitute,
|
||||
-- * Text processing
|
||||
gsub,
|
||||
joinWithSep,
|
||||
tabsToSpaces,
|
||||
backslashEscape,
|
||||
|
@ -220,13 +219,6 @@ tabsInLine num tabstop (c:cs) =
|
|||
else nextnumraw in
|
||||
replacement ++ (tabsInLine nextnum tabstop cs)
|
||||
|
||||
-- | Substitute string for every occurrence of regular expression.
|
||||
gsub :: String -- ^ Regular expression (as string) to substitute for
|
||||
-> String -- ^ String to substitute for the regex
|
||||
-> String -- ^ String to be substituted in
|
||||
-> String
|
||||
gsub regex replacement str = subRegex (mkRegex regex) str replacement
|
||||
|
||||
-- | Escape designated characters with backslash.
|
||||
backslashEscape :: [Char] -- ^ list of special characters to escape
|
||||
-> String -- ^ string input
|
||||
|
|
|
@ -87,7 +87,7 @@ obfuscateLink opts txt src =
|
|||
src' = map toLower src in
|
||||
case (matchRegex emailRegex src') of
|
||||
(Just [name, domain]) ->
|
||||
let domain' = gsub "\\." " dot " domain
|
||||
let domain' = substitute "." " dot " domain
|
||||
at' = obfuscateChar '@' in
|
||||
let linkText = if src' == ("mailto:" ++ text')
|
||||
then "e"
|
||||
|
|
|
@ -55,7 +55,7 @@ escapeString = backslashEscape "`<\\*_^"
|
|||
|
||||
-- | Escape embedded \" in link title.
|
||||
escapeLinkTitle :: String -> String
|
||||
escapeLinkTitle = gsub "\"" "\\\\\""
|
||||
escapeLinkTitle = substitute "\"" "\\\""
|
||||
|
||||
-- | Take list of inline elements and return wrapped doc.
|
||||
wrappedMarkdown :: [Inline] -> Doc
|
||||
|
|
|
@ -59,7 +59,7 @@ handleUnicode (c:cs) = if (ord c) > 127
|
|||
else c:(handleUnicode cs)
|
||||
|
||||
escapeSpecial = backslashEscape "{\\}"
|
||||
escapeTab = gsub "\\\\t" "\\\\tab "
|
||||
escapeTab = substitute "\\t" "\\tab "
|
||||
|
||||
-- | Escape strings as needed for rich text format.
|
||||
stringToRTF :: String -> String
|
||||
|
|
Loading…
Add table
Reference in a new issue