aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2014-04-05 20:41:38 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2014-04-05 20:41:38 -0700
commit060a76a38e1f3586bc92787bb2c25c2dc04e380e (patch)
tree0a7cfec5978700cc084afbdc907faa1b4e576cfc /src
parent75dbe87a9969d3fb684409f26bb14b593ea68ca7 (diff)
downloadpandoc-060a76a38e1f3586bc92787bb2c25c2dc04e380e.tar.gz
Textile reader: Improved treatment of HTML spans (%).
Closes #1115.
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc/Readers/Textile.hs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs
index b42c5e75d..f19d68e64 100644
--- a/src/Text/Pandoc/Readers/Textile.hs
+++ b/src/Text/Pandoc/Readers/Textile.hs
@@ -376,7 +376,6 @@ inlineParsers = [ inlineMarkup
, endline
, code
, escapedInline
- , htmlSpan
, rawHtmlInline
, rawLaTeXInline'
, note
@@ -400,6 +399,7 @@ inlineMarkup = choice [ simpleInline (string "??") (B.cite [])
, simpleInline (char '-' <* notFollowedBy (char '-')) B.strikeout
, simpleInline (char '^') B.superscript
, simpleInline (char '~') B.subscript
+ , simpleInline (char '%') id
]
-- | Trademark, registered, copyright
@@ -476,10 +476,6 @@ str = do
updateLastStrPos
return $ B.str fullStr
--- | Textile allows HTML span infos, we discard them
-htmlSpan :: Parser [Char] ParserState Inlines
-htmlSpan = try $ B.str <$> ( char '%' *> attributes *> manyTill anyChar (char '%') )
-
-- | Some number of space chars
whitespace :: Parser [Char] ParserState Inlines
whitespace = many1 spaceChar >> return B.space <?> "whitespace"