diff options
| -rw-r--r-- | cabal.project | 4 | ||||
| -rw-r--r-- | pandoc.cabal | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Typst.hs | 2 | ||||
| -rw-r--r-- | stack.yaml | 7 |
4 files changed, 11 insertions, 6 deletions
diff --git a/cabal.project b/cabal.project index 4ca6da52e..17ca535d7 100644 --- a/cabal.project +++ b/cabal.project @@ -9,3 +9,7 @@ constraints: skylighting-format-blaze-html >= 0.1.1.3, -- for now (commercialhaskell/stackage#7545): data-default-class <= 0.2, data-default <= 0.8 +source-repository-package + type: git + location: https://github.com/jgm/typst-hs.git + tag: 130975618114207e5bc8e6120b66ef3b56ffd6a7 diff --git a/pandoc.cabal b/pandoc.cabal index 61b50fb42..fdb4a5317 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -535,7 +535,7 @@ library syb >= 0.1 && < 0.8, tagsoup >= 0.14.6 && < 0.15, temporary >= 1.1 && < 1.4, - texmath >= 0.12.10.1 && < 0.13, + texmath >= 0.12.10.2 && < 0.13, text >= 1.1.1.0 && < 2.2, text-conversions >= 0.3 && < 0.4, time >= 1.5 && < 1.15, @@ -546,7 +546,7 @@ library zip-archive >= 0.4.3.1 && < 0.5, zlib >= 0.5 && < 0.8, xml >= 1.3.12 && < 1.4, - typst >= 0.7 && < 0.8, + typst >= 0.8 && < 0.9, vector >= 0.12 && < 0.14, djot >= 0.1.2.2 && < 0.2, tls >= 2.0.1 && < 2.2, diff --git a/src/Text/Pandoc/Readers/Typst.hs b/src/Text/Pandoc/Readers/Typst.hs index 6b2f989bc..948455f09 100644 --- a/src/Text/Pandoc/Readers/Typst.hs +++ b/src/Text/Pandoc/Readers/Typst.hs @@ -466,7 +466,7 @@ inlineHandlers = M.fromList (B.fromList . blocksToInlines . B.toList <$> pBlocks) body pure $ B.link src "" description) ,("image", \_ fields -> do - path <- getField "path" fields + path <- getField "source" fields <|> getField "path" fields alt <- (B.text <$> getField "alt" fields) `mplus` pure mempty (mbwidth :: Maybe Text) <- fmap (renderLength False) <$> getField "width" fields diff --git a/stack.yaml b/stack.yaml index 352309849..0a33cc4e6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,10 +15,11 @@ extra-deps: - skylighting-format-typst-0.1 - commonmark-extensions-0.2.6 - commonmark-pandoc-0.2.3 -- typst-0.7 -- texmath-0.12.10.1 +- typst-symbols-0.1.8.1 +- texmath-0.12.10.2 - citeproc-0.9 - +- git: https://github.com/jgm/typst-hs.git + commit: 130975618114207e5bc8e6120b66ef3b56ffd6a7 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-23.0 |