Graphalyze 0.14.1.1 → 0.15.0.0

raw patch · 3 files changed

+20/−23 lines, 3 filesdep ~arraydep ~containersdep ~directoryPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: array, containers, directory, fgl, filepath, graphviz, old-locale, pandoc, process, random, text, time

API changes (from Hackage documentation)

Files

• Data/Graph/Analysis/Reporting.hs +4/−4
• Data/Graph/Analysis/Reporting/Pandoc.hs +10/−12
• Graphalyze.cabal +6/−7

@@ -37,7 +37,7 @@ import           Data.GraphViz.Commands.IO         (writeDotFile) import           Data.GraphViz.Exception -import Control.Exception     (SomeException (..), tryJust)+import Control.Exception     (SomeException(..), tryJust) import Control.Monad         (liftM, when) import Data.Time             (formatTime, getZonedTime, zonedTimeToLocalTime) import System.Directory      (createDirectoryIfMissing)@@ -142,7 +142,7 @@                deriving (Eq, Ord, Show, Read)  -- | A specification on how to visualise a 'DocGraph'.-data VisProperties = VProps { size   :: GraphSize+data VisProperties = VProps { grSize :: GraphSize                             , format :: GraphvizOutput                             }                    deriving (Eq, Ord, Show, Read)@@ -182,7 +182,7 @@ legToDef fp gfp vp (Left dg) def = liftM ((,) def)                                    $ graphImage' fp gfp vp' dg   where-    vp' = vp { size = DefaultSize }+    vp' = vp { grSize = DefaultSize } legToDef _ _ _ (Right di) def = return (def,di)  -- | Return today's date as a string, e.g. \"Monday 1 January, 2000\".@@ -273,7 +273,7 @@  -- | Add a 'GlobalAttribute' to the 'DotGraph' specifying the given size. setSize      :: VisProperties -> DotGraph a -> DotGraph a-setSize vp g = case size vp of+setSize vp g = case grSize vp of                  DefaultSize   -> g                  (GivenSize s) -> g { graphStatements = setS s}   where

@@ -29,7 +29,7 @@  import Data.Graph.Analysis.Reporting -import           Data.GraphViz.Commands (GraphvizOutput (Png, Svg))+import           Data.GraphViz.Commands (GraphvizOutput(Png, Svg)) import           Text.Pandoc import qualified Text.Pandoc.Shared     as P @@ -50,7 +50,7 @@ pandocHtml = pd { writer        = writeHtmlString                 , extension     = "html"                 , templateName  = "html"-                , extGraphProps = Just VProps { size   = DefaultSize+                , extGraphProps = Just VProps { grSize = DefaultSize                                               , format = Svg                                               }                 }@@ -60,7 +60,7 @@                  , extension  = "tex"                  , templateName = "latex"                  -- 4.5" should be less than \textwidth in LaTeX.-                 , graphProps = defaultProps { size = createSize 4.5 }+                 , graphProps = defaultProps { grSize = createSize 4.5 }                  }  pandocRtf :: PandocDocument@@ -116,7 +116,7 @@ defaultWidth = 10  defaultProps :: VisProperties-defaultProps = VProps { size   = createSize defaultWidth+defaultProps = VProps { grSize = createSize defaultWidth                       , format = Png                       } @@ -126,8 +126,7 @@  -- | Define the 'WriterOptions' used. writerOptions :: WriterOptions-writerOptions = def { writerStandalone = True-                    , writerTableOfContents = True+writerOptions = def { writerTableOfContents = True                     , writerNumberSections = True                     } @@ -145,8 +144,7 @@  -- | Create the document. createPandoc     :: PandocDocument -> Document -> IO (Maybe FilePath)-createPandoc p d = do Right template <- getDefaultTemplate Nothing (templateName p)-                      created <- tryCreateDirectory dir+createPandoc p d = do created <- tryCreateDirectory dir                       -- If the first one fails, so will this one.                       _ <- tryCreateDirectory $ dir </> gdir                       if not created@@ -156,7 +154,7 @@                                  case elems of                                    Just es -> do let es' = htmlAuthDt : es                                                      pnd = Pandoc meta es'-                                                     doc = convert template pnd+                                                     doc = convert pnd                                                  wr <- tryWrite doc                                                  case wr of                                                    (Right _) -> success@@ -177,7 +175,7 @@                    , largeImage   = extGraphProps p                    , saveDot      = keepDot p                    }-      convert t = writer p (writerOptions {writerTemplate = t})+      convert = writer p writerOptions       file = dir </> fileFront d <.> extension p       tryWrite :: String -> IO (Either SomeException ())       tryWrite = try . writeFile file@@ -214,8 +212,8 @@ inlines (Grouping grp)     = concat . intersperse [Space] $ map inlines grp inlines (Bold inl)         = [Strong (inlines inl)] inlines (Emphasis inl)     = [Emph (inlines inl)]-inlines (DocLink inl loc)  = [Link (inlines inl) (loc2target loc)]-inlines (DocImage inl loc) = [Image (inlines inl) (loc2target loc)]+inlines (DocLink inl loc)  = [Link nullAttr (inlines inl) (loc2target loc)]+inlines (DocImage inl loc) = [Image nullAttr (inlines inl) (loc2target loc)]  {- |    Conversion of complex elements.  The only reason it's in the IO monad is

@@ -1,5 +1,5 @@ Name:                Graphalyze-Version:             0.14.1.1+Version:             0.15.0.0 Synopsis:            Graph-Theoretic Analysis library. Description:         A library to use graph theory to analyse the relationships                         inherent in discrete data.@@ -18,12 +18,12 @@  Source-Repository head     Type:         git-    Location:     git://github.com/ivan-m/Graphalyze.git+    Location:     https://github.com/ivan-m/Graphalyze.git  Flag old-locale {      Description: Use old-locale and time < 1.5      Manual:      False-     Default:     True+     Default:     False }  Library {@@ -36,15 +36,15 @@                          random,                          bktrees >= 0.2 && <0.4,                          fgl == 5.5.*,-                         graphviz >= 2999.15 && < 2999.19,-                         pandoc >= 1.12 && < 1.16,+                         graphviz >= 2999.15 && < 2999.20,+                         pandoc == 1.19.*,                          text          if flag(old-locale) {            Build-Depends: time < 1.5,                           old-locale         } else {-           Build-Depends: time == 1.5.*+           Build-Depends: time >= 1.5 && < 1.9         }          Exposed-Modules:     Data.Graph.Analysis@@ -62,5 +62,4 @@                              Paths_Graphalyze          Ghc-Options:         -Wall-        Ghc-Prof-Options:    -prof }