diagrams-haddock 0.2.2.14 → 0.3
raw patch · 4 files changed
+26/−14 lines, 4 filesdep +lineardep +lucid-svgdep −blaze-svgdep −vector-spacedep ~basedep ~diagrams-builderdep ~diagrams-lib
Dependencies added: linear, lucid-svg
Dependencies removed: blaze-svg, vector-space
Dependency ranges changed: base, diagrams-builder, diagrams-lib, diagrams-svg
Files
- CHANGES.md +5/−0
- LICENSE +3/−1
- diagrams-haddock.cabal +9/−8
- src/Diagrams/Haddock.hs +9/−5
CHANGES.md view
@@ -1,3 +1,8 @@+0.3 (19 April 2015)+-------------------++- Allow `diagrams-builder-0.7`, `diagrams-lib-1.3`, and `diagrams-svg-1.3`+ 0.2.2.14 (2 April 2015) -----------------------
LICENSE view
@@ -1,5 +1,7 @@-Copyright (c) 2013, diagrams-haddock team:+Copyright (c) 2013-2015, diagrams-haddock team: + Daniel Bergey <bergey@alum.mit.edu>+ Jeffrey Rosenbluth <Jeffrey.Rosenbluth@gmail.com> Tillmann Vogt <tillk.vogt@googlemail.com> Ryan Yates <fryguybob@gmail.com> Brent Yorgey <byorgey@gmail.com>
diagrams-haddock.cabal view
@@ -1,5 +1,5 @@ name: diagrams-haddock-version: 0.2.2.14+version: 0.3 synopsis: Preprocessor for embedding diagrams in Haddock documentation description: diagrams-haddock is a tool for compiling embedded inline diagrams code in Haddock documentation, for an@@ -26,6 +26,7 @@ cabal-version: >=1.10 extra-source-files: README.md, CHANGES.md, diagrams/*.svg extra-doc-files: diagrams/*.svg+tested-with: GHC == 7.8.4, GHC == 7.10.1 Source-repository head type: git@@ -33,7 +34,7 @@ library exposed-modules: Diagrams.Haddock- build-depends: base >= 4.4 && < 4.8,+ build-depends: base >= 4.4 && < 4.9, filepath, directory, mtl >= 2.0 && < 2.3,@@ -43,12 +44,12 @@ strict >= 0.3 && < 0.4, parsec >= 3, haskell-src-exts >= 1.16 && < 1.17,- blaze-svg >= 0.3 && < 0.4,- diagrams-builder >= 0.5 && < 0.7,- diagrams-lib >= 0.6 && < 1.3,- diagrams-svg >= 0.8.0.1 && < 1.2,- vector-space >= 0.8 && < 0.11,+ lucid-svg >= 0.4.0.3 && < 0.5,+ diagrams-builder >= 0.5 && < 0.8,+ diagrams-lib >= 0.6 && < 1.4,+ diagrams-svg >= 0.8.0.1 && < 1.4, lens >= 3.8 && < 4.10,+ linear >= 1.10 && < 1.19, cpphs >= 1.15, cautious-file >= 1.0 && < 1.1, uniplate >= 1.6 && < 1.7,@@ -80,8 +81,8 @@ tasty >= 0.8 && < 0.11, tasty-quickcheck >= 0.8 && < 0.9, parsec >= 3,- haskell-src-exts >= 1.16 && < 1.17, lens >= 3.8 && < 4.10,+ haskell-src-exts >= 1.16 && < 1.17, diagrams-haddock hs-source-dirs: test default-language: Haskell2010
src/Diagrams/Haddock.hs view
@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TemplateHaskell #-} -----------------------------------------------------------------------------@@ -93,10 +94,10 @@ import qualified Data.Set as S import qualified Data.Text.Lazy as T import qualified Data.Text.Lazy.Encoding as T-import Data.VectorSpace (zeroV) import Language.Haskell.Exts.Annotated hiding (loc) import qualified Language.Haskell.Exts.Annotated as HSE import Language.Preprocessor.Cpphs+import qualified Lucid.Svg as L import System.Console.ANSI (setCursorColumn) import System.Directory (copyFile, createDirectoryIfMissing,@@ -107,14 +108,14 @@ import qualified System.IO as IO import qualified System.IO.Cautious as Cautiously import qualified System.IO.Strict as Strict-import Text.Blaze.Svg.Renderer.Utf8 (renderSvg) import Text.Parsec import qualified Text.Parsec as P import Text.Parsec.String import Diagrams.Backend.SVG (Options (..), SVG (..)) import qualified Diagrams.Builder as DB-import Diagrams.TwoD.Size (mkSizeSpec)+import Diagrams.Prelude (V2, zero)+import Diagrams.TwoD.Size (mkSizeSpec2D) ------------------------------------------------------------ -- Utilities@@ -433,6 +434,7 @@ munge = intercalate "_" . splitDirectories . normalise . dropExtension + w, h :: Maybe Double w = read <$> M.lookup "width" (url ^. diagramOpts) h = read <$> M.lookup "height" (url ^. diagramOpts) @@ -450,7 +452,9 @@ logStr $ "[ ] " ++ (url ^. diagramName) IO.hFlush IO.stdout - let bopts = DB.mkBuildOpts SVG zeroV (SVGOptions (mkSizeSpec w h) Nothing)+ let+ bopts :: DB.BuildOpts SVG V2 Double+ bopts = DB.mkBuildOpts SVG zero (SVGOptions (mkSizeSpec2D w h) [] "") & DB.snippets .~ map (view codeBlockCode) neededCode & DB.imports .~ [ "Diagrams.Backend.SVG" ] & DB.diaExpr .~ (url ^. diagramName)@@ -478,7 +482,7 @@ else return (newURL outFile) DB.OK hash svg -> do let cached = mkCached (DB.hashToHexStr hash)- svgBS = renderSvg svg+ svgBS = L.renderBS svg liftIO $ BS.writeFile cached svgBS url' <- if dataURIs then return (newURL (mkDataURI svgBS))