From 14a410ed6e68143c9ec282d8a314bdb4533a226d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 27 Nov 2025 15:11:15 +0100 Subject: Use latest asciidoc --- src/Text/Pandoc/Readers/AsciiDoc.hs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Readers/AsciiDoc.hs b/src/Text/Pandoc/Readers/AsciiDoc.hs index f48eb43d0..ab6938dd5 100644 --- a/src/Text/Pandoc/Readers/AsciiDoc.hs +++ b/src/Text/Pandoc/Readers/AsciiDoc.hs @@ -21,7 +21,6 @@ module Text.Pandoc.Readers.AsciiDoc where import Text.Pandoc.Class -import Text.Pandoc.Sources import Text.Pandoc.Options import Text.Pandoc.Definition import Text.Pandoc.Walk @@ -34,8 +33,9 @@ import qualified Text.Pandoc.Builder as B import Text.Pandoc.Readers.HTML (readHtml) import Control.Monad.Except (throwError) import Control.Monad (mplus) -import Text.Pandoc.Parsing (newPos) +import Text.Pandoc.Parsing (newPos, sourceName) import Text.Pandoc.Logging +import Text.Pandoc.Sources import Control.Monad.State import Data.List (intersperse, foldl') import Data.Char (chr) @@ -47,9 +47,12 @@ import Data.Maybe (fromMaybe) -- | Read AsciiDoc from an input string and return a Pandoc document. readAsciiDoc :: (PandocMonad m, ToSources a) => ReaderOptions -> a -> m Pandoc -readAsciiDoc _opts inp = - A.parseDocument getIncludeFile raiseError - (sourcesToText (toSources inp)) +readAsciiDoc _opts inp = do + let Sources sources = toSources inp + (mconcat <$> mapM + (\(sourcepos, t) -> + A.parseDocument getIncludeFile raiseError (sourceName sourcepos) t) + sources) >>= resolveFootnotes >>= resolveStem >>= resolveIcons -- cgit v1.2.3