diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-12-22 19:05:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-22 19:05:29 -0700 |
| commit | e3c1449ae6c238f7195981f39bb505da0c69bc0c (patch) | |
| tree | 758fe23c7dce1fca5d38cf9e28277fb129a75d3b | |
| parent | 28b736bf957da0df79ffb211fc5e7ec4ff713c4b (diff) | |
| parent | add3cf73a965fb7fa5b45f75442e386294c6fb47 (diff) | |
| download | pandoc-e3c1449ae6c238f7195981f39bb505da0c69bc0c.tar.gz | |
Merge pull request #4189 from mb21/export-blocksToInlines
API change: export blocksToInlines' from Text.Pandoc.Shared
| -rw-r--r-- | src/Text/Pandoc/Readers/Docx.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/OPML.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs index 7c7845c71..d73da3085 100644 --- a/src/Text/Pandoc/Readers/Docx.hs +++ b/src/Text/Pandoc/Readers/Docx.hs @@ -337,7 +337,7 @@ blocksToInlinesWarn cmtId blks = do unless (null $ filter notParaOrPlain blkList) $ lift $ P.report $ DocxParserWarning $ "Docx comment " ++ cmtId ++ " will not retain formatting" - return $ fromList $ blocksToInlines blkList + return $ blocksToInlines' blkList parPartToInlines :: PandocMonad m => ParPart -> DocxContext m Inlines parPartToInlines (PlainRun r) = runToInlines r diff --git a/src/Text/Pandoc/Readers/OPML.hs b/src/Text/Pandoc/Readers/OPML.hs index 68f3252a9..82266748f 100644 --- a/src/Text/Pandoc/Readers/OPML.hs +++ b/src/Text/Pandoc/Readers/OPML.hs @@ -12,7 +12,7 @@ import Text.Pandoc.Class (PandocMonad) import Text.Pandoc.Options import Text.Pandoc.Readers.HTML (readHtml) import Text.Pandoc.Readers.Markdown (readMarkdown) -import Text.Pandoc.Shared (crFilter, blocksToInlines) +import Text.Pandoc.Shared (crFilter, blocksToInlines') import Text.XML.Light type OPML m = StateT OPMLState m @@ -74,7 +74,7 @@ asHtml :: PandocMonad m => String -> OPML m Inlines asHtml s = do opts <- gets opmlOptions Pandoc _ bs <- readHtml def{ readerExtensions = readerExtensions opts } (pack s) - return $ fromList $ blocksToInlines bs + return $ blocksToInlines' bs asMarkdown :: PandocMonad m => String -> OPML m Blocks asMarkdown s = do diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 975847de4..005603191 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -91,6 +91,7 @@ module Text.Pandoc.Shared ( mapLeft, -- * for squashing blocks blocksToInlines, + blocksToInlines', -- * Safe read safeRead, -- * Temp directory |