diff options
| -rw-r--r-- | deb/stack.yaml | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/ICML.hs | 4 | ||||
| -rw-r--r-- | stack.full.yaml | 2 | ||||
| -rw-r--r-- | stack.yaml | 6 | ||||
| -rw-r--r-- | tests/writer.icml | 4 | ||||
| -rw-r--r-- | windows/stack.yaml | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/deb/stack.yaml b/deb/stack.yaml index 4b8f191dd..287949e97 100644 --- a/deb/stack.yaml +++ b/deb/stack.yaml @@ -14,4 +14,4 @@ flags: packages: - '..' - 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.1.3/pandoc-citeproc-0.8.1.3.tar.gz' -resolver: lts-3.16 +resolver: lts-3.18 diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs index b73fc78cf..4b2e794d3 100644 --- a/src/Text/Pandoc/Writers/ICML.hs +++ b/src/Text/Pandoc/Writers/ICML.hs @@ -27,7 +27,7 @@ import Data.List (isPrefixOf, isInfixOf, stripPrefix) import Data.Text as Text (breakOnAll, pack) import Control.Monad.State import Network.URI (isURI) -import System.FilePath (pathSeparator) +import System.FilePath.Posix (pathSeparator) import qualified Data.Set as Set type Style = [String] @@ -533,7 +533,7 @@ imageICML opts style attr _ (src, _) = do hw = showFl $ ow / 2 hh = showFl $ oh / 2 scale = showFl (imgWidth / ow) ++ " 0 0 " ++ showFl (imgHeight / oh) - src' = if isURI src then src else "file://." ++ pathSeparator : src + src' = if isURI src then src else "file:" ++ src (stlStr, attrs) = styleToStrAttr style props = inTags True "Properties" [] $ inTags True "PathGeometry" [] $ inTags True "GeometryPathType" [("PathOpen","false")] diff --git a/stack.full.yaml b/stack.full.yaml index d149755bd..4ca0a4a69 100644 --- a/stack.full.yaml +++ b/stack.full.yaml @@ -13,4 +13,4 @@ packages: - '../pandoc-types' - '../texmath' extra-deps: [] -resolver: lts-3.16 +resolver: lts-3.18 diff --git a/stack.yaml b/stack.yaml index 1fc16da49..6c6da96fb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,9 +11,5 @@ packages: git: 'https://github.com/jgm/pandoc-types' commit: 7b471a3d129efd8155f6cdcb2f2b58b5605df0fc extra-dep: true -- location: 'https://hackage.haskell.org/package/highlighting-kate-0.6.1/highlighting-kate-0.6.1.tar.gz' - extra-dep: true -- location: 'https://hackage.haskell.org/package/texmath-0.8.4.1/texmath-0.8.4.1.tar.gz' - extra-dep: true extra-deps: [] -resolver: lts-3.16 +resolver: lts-3.18 diff --git a/tests/writer.icml b/tests/writer.icml index b7444ef22..57f9d2f8a 100644 --- a/tests/writer.icml +++ b/tests/writer.icml @@ -2563,7 +2563,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> $ID/Embedded </Profile> </Properties> - <Link Self="ueb" LinkResourceURI="file://./lalune.jpg" /> + <Link Self="ueb" LinkResourceURI="file:lalune.jpg" /> </Image> </Rectangle> </CharacterStyleRange><Br /> @@ -2592,7 +2592,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> $ID/Embedded </Profile> </Properties> - <Link Self="ueb" LinkResourceURI="file://./movie.jpg" /> + <Link Self="ueb" LinkResourceURI="file:movie.jpg" /> </Image> </Rectangle> </CharacterStyleRange> diff --git a/windows/stack.yaml b/windows/stack.yaml index b5f33c933..cf3f2aad4 100644 --- a/windows/stack.yaml +++ b/windows/stack.yaml @@ -14,6 +14,10 @@ flags: packages: - '..' - '../../pandoc-citeproc' +- location: + git: 'https://github.com/jgm/pandoc-types' + commit: 7b471a3d129efd8155f6cdcb2f2b58b5605df0fc + extra-dep: true extra-deps: - 'hsb2hs-0.3.1' -resolver: lts-3.16 +resolver: lts-3.18 |