wumpus-tree 0.9.0 → 0.10.0

raw patch · 5 files changed

+20/−16 lines, 5 filesdep ~wumpus-basicdep ~wumpus-corePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: wumpus-basic, wumpus-core

API changes (from Hackage documentation)

Files

• src/Wumpus/Tree.hs +1/−1
• src/Wumpus/Tree/Base.hs +1/−1
• src/Wumpus/Tree/Draw.hs +9/−9
• src/Wumpus/Tree/VersionNumber.hs +2/−2
• wumpus-tree.cabal +7/−3

@@ -41,7 +41,7 @@ import Wumpus.Tree.Design import Wumpus.Tree.Draw -import Wumpus.Basic.Dots                        -- package: wumpus-basic+import Wumpus.Basic.Dots.AnchorDots             -- package: wumpus-basic import Wumpus.Basic.Graphic  import Wumpus.Core                              -- package: wumpus-core

@@ -26,7 +26,7 @@   import Wumpus.Core                              -- package: wumpus-core-import Wumpus.Basic.Dots                        -- package: wumpus-basic+import Wumpus.Basic.Dots.AnchorDots             -- package: wumpus-basic  import Data.Tree 

@@ -27,12 +27,12 @@ import Wumpus.Core                              -- package: wumpus-core  import Wumpus.Basic.Anchors                     -- package: wumpus-basic-import Wumpus.Basic.Dots+import Wumpus.Basic.Dots.AnchorDots import Wumpus.Basic.Graphic     import Data.VectorSpace                         -- package: vector-space -import Data.Monoid+import Control.Monad import Data.Tree hiding ( drawTree )  @@ -49,7 +49,7 @@  drawTop :: (a -> TreeNode) -> CoordTree Double a -> Drawing Double () drawTop fn (Node (pt,a) ns) = do -    ancr <- drawi $ fn a `ati` pt+    ancr <- drawi $ fn a `at` pt     mapM_ (draw1 fn ancr) ns  draw1 :: (a -> TreeNode) @@ -57,7 +57,7 @@       -> CoordTree Double a        -> Drawing Double () draw1 fn ancr_from (Node (pt,a) ns) = do-    ancr <- drawi $ fn a `ati` pt+    ancr <- drawi $ fn a `at` pt     draw $ connector ancr_from ancr     mapM_ (draw1 fn ancr) ns    @@ -96,15 +96,15 @@            -> CoordTree Double a             -> Drawing Double (DotAnchor Double) drawFamily fn (Node (pt,a) ns) = do-    ancr <- drawi $ fn a `ati` pt+    ancr <- drawi $ fn a `at` pt     xs   <- mapM (drawFamily fn) ns   -    draw $ famconn (south ancr) (map north xs)+    when (not $ null xs) $ draw $ famconn (south ancr) (map north xs)     return ancr  famconn :: (Fractional u, Ord u) => Point2 u -> [Point2 u] -> Graphic u-famconn _       []         = mempty+famconn _       []         = error "famconn - empty list" famconn pt_from [p1]       = famconn1 pt_from p1-famconn pt_from xs@(p1:_)  = mconcat $ downtick : horizontal : upticks+famconn pt_from xs@(p1:_)  = oconcat downtick (horizontal : upticks)    where      hh         = halfHeight pt_from p1      downtick   = straightLine (vvec (-hh)) pt_from@@ -112,7 +112,7 @@      upticks    = map (straightLine (vvec hh)) xs  midline :: (Fractional u, Ord u) => Point2 u -> [Point2 u] -> Graphic u-midline _        []          = mempty+midline _        []           = error "midline - empty list"  midline (P2 _ y) (P2 x0 _:zs) =      let (a,b) = foldr fn (x0,x0) zs in straightLineBetween (P2 a y) (P2 b y)   where   

@@ -22,7 +22,7 @@  -- | Version number ----- > (0,9,0)+-- > (0,10,0) -- wumpus_tree_version :: (Int,Int,Int)-wumpus_tree_version = (0,9,0)+wumpus_tree_version = (0,10,0)

@@ -1,5 +1,5 @@ name:             wumpus-tree-version:          0.9.0+version:          0.10.0 license:          BSD3 license-file:     LICENSE copyright:        Stephen Tetley <stephen.tetley@gmail.com>@@ -19,6 +19,10 @@   .   Changelog:   .+  0.9.0 to 0.10.0:+  .+  * Internal changes to track updates to Wumpus-Basic.+  .   0.8.0 to 0.9.0:   .   * Stopped re-exporting @DrawingContext@ from Wumpus-Basic in @@ -43,8 +47,8 @@   build-depends:      base              <  5,                        containers        >= 0.3.0     && < 0.4.0,                       vector-space      >= 0.6,-                      wumpus-core       == 0.35.0,-                      wumpus-basic      == 0.10.0+                      wumpus-core       == 0.36.0,+                      wumpus-basic      == 0.12.0       exposed-modules: