add3cf7 · typeable/pandoc

git.iko.soy/typeable/pandoc

API change: export blocksToInlines' from Text.Pandoc.Shared

commitadd3cf73a965fb7fa5b45f75442e386294c6fb47 authormb21 <mb21@users.noreply.github.com> dateFri 22 Dec 2017, 12:26 (9 years ago) parent279c254

3 files changed+4−3

unifiedsplit

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

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

337337 unless (null $ filter notParaOrPlain blkList) $

338338 lift $ P.report $ DocxParserWarning $

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

340− return $ fromList $ blocksToInlines blkList

340+ return $ blocksToInlines' blkList

341341

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

343343parPartToInlines (PlainRun r) = runToInlines r

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

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

1212import Text.Pandoc.Options

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

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

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

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

1616import Text.XML.Light

1717

1818type OPML m = StateT OPMLState m

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

7474asHtml s = do

7575 opts <- gets opmlOptions

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

77− return $ fromList $ blocksToInlines bs

77+ return $ blocksToInlines' bs

7878

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

8080asMarkdown s = do

src/Text/Pandoc/Shared.hs+1

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

9191 mapLeft,

9292 -- * for squashing blocks

9393 blocksToInlines,

94+ blocksToInlines',

9495 -- * Safe read

9596 safeRead,

9697 -- * Temp directory