diff options
| -rw-r--r-- | cabal.project | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/AsciiDoc.hs | 13 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | test/asciidoc-reader.native | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/cabal.project b/cabal.project index d223052e9..a04262693 100644 --- a/cabal.project +++ b/cabal.project @@ -30,4 +30,4 @@ source-repository-package source-repository-package type: git location: https://github.com/jgm/asciidoc-hs.git - tag: 6a632651458c9b5334d638993a5ed23c6214cb26 + tag: 3ab89ea03c53f60423759878bb70ea4b3b1986fa 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 diff --git a/stack.yaml b/stack.yaml index cb770a39d..f2876892f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,7 +23,7 @@ extra-deps: - git: https://github.com/jgm/djoths.git commit: 7dc8da53fc092d2d4d91f5f0988840f4faf90368 - git: https://github.com/jgm/asciidoc-hs.git - commit: 6a632651458c9b5334d638993a5ed23c6214cb26 + commit: 3ab89ea03c53f60423759878bb70ea4b3b1986fa ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-24.20 diff --git a/test/asciidoc-reader.native b/test/asciidoc-reader.native index a723ac7fd..3d683b209 100644 --- a/test/asciidoc-reader.native +++ b/test/asciidoc-reader.native @@ -4383,7 +4383,7 @@ Pandoc , Div ( "" , [ "included" ] - , [ ( "path" , "asciidoc-reader-include.adoc" ) ] + , [ ( "path" , "./asciidoc-reader-include.adoc" ) ] ) [ Para [ Str "This" |