diff options
| author | John MacFarlane <[email protected]> | 2022-09-29 10:53:16 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2022-09-29 10:53:16 -0700 |
| commit | e099de1d4d2f4ca865596a6608774c7c0940a0d9 (patch) | |
| tree | 457ee54fde35b62f2f277fa8f0d707f3db4cf19f | |
| parent | 931ccd03766f339ab1053b4d5ad8344f20733d5e (diff) | |
Factor out xml-light into an internal library.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | pandoc.cabal | 24 | ||||
| -rw-r--r-- | xml-light/Text/Pandoc/XML/Light.hs (renamed from src/Text/Pandoc/XML/Light.hs) | 0 | ||||
| -rw-r--r-- | xml-light/Text/Pandoc/XML/Light/Output.hs (renamed from src/Text/Pandoc/XML/Light/Output.hs) | 0 | ||||
| -rw-r--r-- | xml-light/Text/Pandoc/XML/Light/Proc.hs (renamed from src/Text/Pandoc/XML/Light/Proc.hs) | 0 | ||||
| -rw-r--r-- | xml-light/Text/Pandoc/XML/Light/Types.hs (renamed from src/Text/Pandoc/XML/Light/Types.hs) | 0 |
6 files changed, 17 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index cf1d1a9a4..d0fa0d925 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,7 @@ !test/** !tools/** !trypandoc/** +!xml-light/** !windows/** *.bkp *.orig diff --git a/pandoc.cabal b/pandoc.cabal index 6923b0108..1e47f8ef2 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -459,10 +459,24 @@ common common-executable build-depends: pandoc ghc-options: -rtsopts -with-rtsopts=-A8m -threaded +library xml-light + import: common-options + build-depends: xml >= 1.3.12 && < 1.4, + xml-conduit >= 1.9.1.1 && < 1.10, + xml-types >= 0.3 && < 0.4, + containers >= 0.6.0.1 && < 0.7, + text >= 1.1.1.0 && < 2.1 + + hs-source-dirs: xml-light + exposed-modules: Text.Pandoc.XML.Light, + Text.Pandoc.XML.Light.Types, + Text.Pandoc.XML.Light.Proc, + Text.Pandoc.XML.Light.Output library import: common-options - build-depends: Glob >= 0.7 && < 0.11, + build-depends: xml-light, + Glob >= 0.7 && < 0.11, JuicyPixels >= 3.1.6.1 && < 3.4, SHA >= 1.6 && < 1.7, aeson >= 2.0 && < 2.2, @@ -528,12 +542,10 @@ library time >= 1.5 && < 1.14, unicode-collation >= 0.1.1 && < 0.2, unicode-transforms >= 0.3 && < 0.5, - xml >= 1.3.12 && < 1.4, - xml-conduit >= 1.9.1.1 && < 1.10, - xml-types >= 0.3 && < 0.4, yaml >= 0.11 && < 0.12, zip-archive >= 0.2.3.4 && < 0.5, zlib >= 0.5 && < 0.7, + xml >= 1.3.12 && < 1.4 if !os(windows) build-depends: unix >= 2.4 && < 2.9 @@ -759,10 +771,6 @@ library Text.Pandoc.Lua.Writer, Text.Pandoc.Lua.Writer.Classic, Text.Pandoc.Lua.Reader, - Text.Pandoc.XML.Light, - Text.Pandoc.XML.Light.Types, - Text.Pandoc.XML.Light.Proc, - Text.Pandoc.XML.Light.Output, Text.Pandoc.Network.HTTP, Text.Pandoc.CSS, Text.Pandoc.CSV, diff --git a/src/Text/Pandoc/XML/Light.hs b/xml-light/Text/Pandoc/XML/Light.hs index 61025cb5c..61025cb5c 100644 --- a/src/Text/Pandoc/XML/Light.hs +++ b/xml-light/Text/Pandoc/XML/Light.hs diff --git a/src/Text/Pandoc/XML/Light/Output.hs b/xml-light/Text/Pandoc/XML/Light/Output.hs index 6a2a73924..6a2a73924 100644 --- a/src/Text/Pandoc/XML/Light/Output.hs +++ b/xml-light/Text/Pandoc/XML/Light/Output.hs diff --git a/src/Text/Pandoc/XML/Light/Proc.hs b/xml-light/Text/Pandoc/XML/Light/Proc.hs index 87104f3a4..87104f3a4 100644 --- a/src/Text/Pandoc/XML/Light/Proc.hs +++ b/xml-light/Text/Pandoc/XML/Light/Proc.hs diff --git a/src/Text/Pandoc/XML/Light/Types.hs b/xml-light/Text/Pandoc/XML/Light/Types.hs index 59edb8979..59edb8979 100644 --- a/src/Text/Pandoc/XML/Light/Types.hs +++ b/xml-light/Text/Pandoc/XML/Light/Types.hs |