diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-11-11 21:31:15 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-11-11 21:31:15 -0800 |
| commit | 1bfd8110affb394d648911a33c941f5d44e2422f (patch) | |
| tree | 19cac9f9d2e468c643905c81ad1389471c49fb63 /src/Text | |
| parent | 36d4e649a6a21da84b2ae88be2b66ed82c0f082d (diff) | |
| parent | ca51bbbf166b8fd5d835426e1f499d251f2c110c (diff) | |
| download | pandoc-1bfd8110affb394d648911a33c941f5d44e2422f.tar.gz | |
Merge branch 'master' into citeproc
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Readers/HTML.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs index f47309d3f..5ccbc4fb1 100644 --- a/src/Text/Pandoc/Readers/HTML.hs +++ b/src/Text/Pandoc/Readers/HTML.hs @@ -686,8 +686,8 @@ inline = choice [ charRef code :: GenParser Char ParserState Inline code = try $ do - result <- (htmlOpenTag "code" >> manyTill anyChar (htmlEndTag "code")) - <|> (htmlOpenTag "tt" >> manyTill anyChar (htmlEndTag "tt")) + result <- (htmlOpenTag "code" >> manyTill (noneOf "<>") (htmlEndTag "code")) + <|> (htmlOpenTag "tt" >> manyTill (noneOf "<>") (htmlEndTag "tt")) -- remove internal line breaks, leading and trailing space, -- and decode character references return $ Code $ decodeCharacterReferences $ removeLeadingTrailingSpace $ |