add3cf7 · typeable/pandoc

src/Text/Pandoc/Readers/Docx.hs+1−1

@@ -337,7 +337,7 @@ blocksToInlinesWarn cmtId blks = do

337 unless (null $ filter notParaOrPlain blkList) $

338 lift $ P.report $ DocxParserWarning $

339 "Docx comment " ++ cmtId ++ " will not retain formatting"

340− return $ fromList $ blocksToInlines blkList

340+ return $ blocksToInlines' blkList

341

342parPartToInlines :: PandocMonad m => ParPart -> DocxContext m Inlines

343parPartToInlines (PlainRun r) = runToInlines r

src/Text/Pandoc/Readers/OPML.hs+2−2

@@ -12,7 +12,7 @@ import Text.Pandoc.Class (PandocMonad)

12import Text.Pandoc.Options

13import Text.Pandoc.Readers.HTML (readHtml)

14import Text.Pandoc.Readers.Markdown (readMarkdown)

15−import Text.Pandoc.Shared (crFilter, blocksToInlines)

15+import Text.Pandoc.Shared (crFilter, blocksToInlines')

16import Text.XML.Light

17

18type OPML m = StateT OPMLState m

@@ -74,7 +74,7 @@ asHtml :: PandocMonad m => String -> OPML m Inlines

74asHtml s = do

75 opts <- gets opmlOptions

76 Pandoc _ bs <- readHtml def{ readerExtensions = readerExtensions opts } (pack s)

77− return $ fromList $ blocksToInlines bs

77+ return $ blocksToInlines' bs

78

79asMarkdown :: PandocMonad m => String -> OPML m Blocks

80asMarkdown s = do

src/Text/Pandoc/Shared.hs+1

@@ -91,6 +91,7 @@ module Text.Pandoc.Shared (

91 mapLeft,

92 -- * for squashing blocks

93 blocksToInlines,

94+ blocksToInlines',

94 -- * Safe read

95 -- * Safe read

95 safeRead,

96 safeRead,

96 -- * Temp directory

97 -- * Temp directory