BlogLiterately-diagrams 0.1.1.2 → 0.1.2

raw patch · 4 files changed

+26/−23 lines, 4 filesdep ~BlogLiteratelydep ~diagrams-builderdep ~pandocPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: BlogLiterately, diagrams-builder, pandoc

API changes (from Hackage documentation)

Files

• BlogLiterately-diagrams.cabal +6/−7
• CHANGES +4/−0
• src/Text/BlogLiterately/Diagrams.hs +13/−13
• src/tools/BlogLiteratelyD.hs +3/−3

@@ -1,13 +1,12 @@ name:                BlogLiterately-diagrams-version:             0.1.1.2+version:             0.1.2 synopsis:            Include images in blog posts with inline diagrams code description:         A plugin for @BlogLiterately@ (<http://hackage.haskell.org/package/BlogLiterately>) which turns inline diagrams                      code into images.                      This library also provides an executable,                      @BlogLiteratelyD@, providing a standard instance                      of @BlogLiterately@ extended with support for-                     inline diagrams code (and also including a pass-                     to center block-level images).  For most users it+                     inline diagrams code.  For most users it                      should suffice to simply use @BlogLiteratelyD@ in                      place of @BlogLiterately@.                      .@@ -74,16 +73,16 @@                        filepath,                        directory,                        diagrams-cairo >= 0.6 && < 0.7,-                       diagrams-builder >= 0.2 && < 0.4,+                       diagrams-builder >= 0.2 && < 0.5,                        diagrams-lib >= 0.6 && < 0.7,-                       BlogLiterately ==0.5.*,-                       pandoc >= 1.9 && < 1.11,+                       BlogLiterately ==0.6.*,+                       pandoc >= 1.9 && < 1.12,                        safe ==0.3.*   hs-source-dirs:      src  executable BlogLiteratelyD   build-depends:       base,-                       BlogLiterately >= 0.5.2 && < 0.6,+                       BlogLiterately >= 0.6 && < 0.7,                        BlogLiterately-diagrams   main-is:             BlogLiteratelyD.hs   hs-source-dirs:      src/tools

@@ -1,3 +1,7 @@+* 0.1.2: 11 March 2013++  - update to work with BlogLiterately-0.6+ * 0.1.1.2: 4 February 2013    - allow diagrams-builder-0.3

@@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module      :  Text.BlogLiterately.Diagrams--- Copyright   :  (c) Brent Yorgey 2012+-- Copyright   :  (c) Brent Yorgey 2012-2013 -- License     :  BSD-style (see LICENSE) -- Maintainer  :  Brent Yorgey <byorgey@gmail.com> --@@ -12,9 +12,8 @@ -- images.  See "Text.BlogLiterately.Run" for more information. -- -- Note that this package provides an executable, @BlogLiteratelyD@,--- which uses the transformation pipeline------ > (diagramsInlineXF : diagramsXF : centerImagesXF : standardTransforms)+-- which compiles embedded diagrams code as well as all the standard+-- transforms provided by BlogLiterately. -----------------------------------------------------------------------------  module Text.BlogLiterately.Diagrams@@ -22,18 +21,18 @@     ) where  import           Control.Arrow-import           Data.List        (isPrefixOf)-import qualified Data.Map as M-import           Safe             (readMay, headDef)-import           System.Directory (createDirectoryIfMissing)+import           Data.List                       (isPrefixOf)+import qualified Data.Map                        as M+import           Safe                            (headDef, readMay)+import           System.Directory                (createDirectoryIfMissing) import           System.FilePath-import           System.IO        (stderr, hPutStrLn)+import           System.IO                       (hPutStrLn, stderr)  import           Diagrams.Backend.Cairo import           Diagrams.Backend.Cairo.Internal import           Diagrams.Builder-import           Diagrams.Prelude (R2, zeroV)-import           Diagrams.TwoD.Size ( SizeSpec2D(Dims), mkSizeSpec )+import           Diagrams.Prelude                (R2, zeroV)+import           Diagrams.TwoD.Size              (SizeSpec2D (Dims), mkSizeSpec) import           Text.BlogLiterately import           Text.Pandoc @@ -57,7 +56,7 @@ --   package provides an executable @BlogLiteratelyD@ which --   includes @diagramsInlineXF@, @diagramsXF@, and @centerImagesXF@. diagramsXF :: Transform-diagramsXF = Transform (\bl -> Kleisli $ renderBlockDiagrams bl) (const True)+diagramsXF = ioTransform renderBlockDiagrams (const True)  renderBlockDiagrams :: BlogLiterately -> Pandoc -> IO Pandoc renderBlockDiagrams _ p = bottomUpM (renderBlockDiagram defs) p@@ -76,7 +75,7 @@ --   @diagramsXF@ deletes them, @diagramsInlineXF@ must be placed --   before @diagramsXF@ in the pipeline. diagramsInlineXF :: Transform-diagramsInlineXF = Transform (\bl -> Kleisli $ renderInlineDiagrams bl) (const True)+diagramsInlineXF = ioTransform renderInlineDiagrams (const True)  renderInlineDiagrams :: BlogLiterately -> Pandoc -> IO Pandoc renderInlineDiagrams _ p = bottomUpM (renderInlineDiagram defs) p@@ -110,6 +109,7 @@            (expr ++ " {- " ++ show attr ++ " -}")              -- the above hack is to make sure that changing              -- attributes results in the diagram being recompiled.+             -- XXX can take this out once new diagrams-builder is released            []            ["Diagrams.Backend.Cairo"]            (hashedRegenerate

@@ -1,5 +1,5 @@-import Text.BlogLiterately-import Text.BlogLiterately.Diagrams+import           Text.BlogLiterately+import           Text.BlogLiterately.Diagrams  main = blogLiteratelyCustom-  (diagramsInlineXF : diagramsXF : centerImagesXF : standardTransforms)+  (diagramsInlineXF : diagramsXF : standardTransforms)