diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-09-27 16:18:55 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-09-27 16:18:55 -0700 |
| commit | 5bab9574f615ef41bc0ae85c161e2a88a55bd86c (patch) | |
| tree | 666e1d2612d38f87ba0f6193e3d48b432a9f999b /src/Text/Pandoc/Readers | |
| parent | 7b01edce056394c19efc92a3db46562982b5c36c (diff) | |
| parent | fa2d11c9548dbbfb7354be29ceb894cc5d3ccdbf (diff) | |
| download | pandoc-5bab9574f615ef41bc0ae85c161e2a88a55bd86c.tar.gz | |
Merge pull request #1644 from mpickering/master
Fixes and Enhancements from the tracker
Diffstat (limited to 'src/Text/Pandoc/Readers')
| -rw-r--r-- | src/Text/Pandoc/Readers/HTML.hs | 7 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Org.hs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs index 4ea5f41d5..4e0bb375a 100644 --- a/src/Text/Pandoc/Readers/HTML.hs +++ b/src/Text/Pandoc/Readers/HTML.hs @@ -440,7 +440,7 @@ pCodeBlock :: TagParser Blocks pCodeBlock = try $ do TagOpen _ attr <- pSatisfy (~== TagOpen "pre" []) contents <- manyTill pAnyTag (pCloses "pre" <|> eof) - let rawText = concatMap fromTagText $ filter isTagText contents + let rawText = concatMap tagToString contents -- drop leading newline if any let result' = case rawText of '\n':xs -> xs @@ -451,6 +451,11 @@ pCodeBlock = try $ do _ -> result' return $ B.codeBlockWith (mkAttr attr) result +tagToString :: Tag String -> String +tagToString (TagText s) = s +tagToString (TagOpen "br" _) = "\n" +tagToString _ = "" + inline :: TagParser Inlines inline = choice [ eNoteref diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs index b07f96846..5c00a1b27 100644 --- a/src/Text/Pandoc/Readers/Org.hs +++ b/src/Text/Pandoc/Readers/Org.hs @@ -863,7 +863,7 @@ definitionListItem parseMarkerGetLength = try $ do line1 <- anyLineNewline blank <- option "" ("\n" <$ blankline) cont <- concat <$> many (listContinuation markerLength) - term' <- parseFromString inline term + term' <- parseFromString parseInlines term contents' <- parseFromString parseBlocks $ line1 ++ blank ++ cont return $ (,) <$> term' <*> fmap (:[]) contents' |