wumpus-microprint 0.7.0 → 0.8.0
raw patch · 4 files changed
+27/−45 lines, 4 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
- CHANGES +14/−0
- src/Wumpus/MicroPrint/Render.hs +6/−12
- src/Wumpus/MicroPrint/VersionNumber.hs +2/−2
- wumpus-microprint.cabal +5/−31
CHANGES view
@@ -1,4 +1,18 @@ +0.6.0 to 0.7.0:++ * Again, internal changes to work with latest @Wumpus-Basic@.++0.5.0 to 0.6.0:++ * Updated internals to work with latest @wumpus-core@ and + @wumpus-basic@.+ +0.4.0 to 0.5.0:++ * Updated internals to work with latest @wumpus-core@ and + @wumpus-basic@.+ 0.3.0 to 0.4.0: * Implementation modules are now hidden. Added some documentation.
src/Wumpus/MicroPrint/Render.hs view
@@ -64,7 +64,7 @@ -- greekF :: DrawWordF greekF _ (w,h) rgb = - localDrawingContext (secondaryColour rgb) (filledRectangle w h) + localLG (secondaryColour rgb) (filledRectangle w h) -- | Draw the word as a coloured rectangle, with a border grid.@@ -73,7 +73,7 @@ borderedF (i,uw) (w,h) rgb = concatAt srect seps where srect :: DLocGraphic- srect = localDrawingContext (secondaryColour rgb) (borderedRectangle w h)+ srect = localLG (secondaryColour rgb) (borderedRectangle w h) seps :: [DLocGraphic] seps = unfoldr phi (1,uw) @@ -83,14 +83,11 @@ in Just (fn,(n+1,hshift+uw)) ---- Note - this needs attention due to Z-Order handling in --- Wumpus-Basic. There are better ways to accomplish what --- borderedF does...+-- At some point this needs a rethink... -- concatAt :: DLocGraphic -> [DLocGraphic] -> DLocGraphic concatAt x [] = x-concatAt x xs = foldr appendAt x xs+concatAt x xs = foldl' lgappend x xs vline :: (Num u, Ord u) => u -> LocGraphic u vline h = \pt -> openStroke $ path pt [lineTo $ pt .+^ vvec h]@@ -135,10 +132,7 @@ drawMicroPrint :: MicroPrintConfig -> ([Tile],Height) -> Maybe DPicture drawMicroPrint cfg (xs,h) = - let (_,hf) = runRender cfg (moveUpN h >> interpret xs) in post $ hf []- where- post [] = Nothing- post ps = Just $ frame ps+ let (_,hf) = runRender cfg (moveUpN h >> interpret xs) in liftToPictureMb hf runRender :: MicroPrintConfig -> RenderMonad a -> (a, HPrim Double) runRender cfg m = @@ -157,7 +151,7 @@ uw <- asks char_width pt <- scaleCurrentCoord dF <- asks drawWordF- drawAt pt (dF (i,uw) (w,h) rgb)+ draw $ (dF (i,uw) (w,h) rgb) `at` pt moveRightN i moveRightN :: Int -> RenderMonad ()
src/Wumpus/MicroPrint/VersionNumber.hs view
@@ -22,7 +22,7 @@ -- | Version number ----- > (0,7,0)+-- > (0,8,0) -- wumpus_microprint_version :: (Int,Int,Int)-wumpus_microprint_version = (0,7,0)+wumpus_microprint_version = (0,8,0)
wumpus-microprint.cabal view
@@ -1,5 +1,5 @@ name: wumpus-microprint-version: 0.7.0+version: 0.8.0 license: BSD3 license-file: LICENSE copyright: Stephen Tetley <stephen.tetley@gmail.com>@@ -25,35 +25,9 @@ . Changelog: .- 0.6.0 to 0.7.0:- .- * Again, internal changes to work with latest @Wumpus-Basic@.- .- 0.5.0 to 0.6.0:- .- * Updated internals to work with latest @wumpus-core@ and - @wumpus-basic@.- . - 0.4.0 to 0.5.0:- .- * Updated internals to work with latest @wumpus-core@ and - @wumpus-basic@.- .- 0.3.0 to 0.4.0:- .- * Implementation modules are now hidden. Added some documentation.- .- * DrawF renamed DrawWordF, MP_config renamed MicroPrintConfig.- . - 0.2.0 to 0.3.0:- .- * Updated to use ConsDrawing monad from Wumpus-Basic.- .- 0.1.1 to 0.2.0:- .- * Updated to use Basic.Graphic types from wumpus-basic-0.2.0+ 0.7.0 to 0.8.0: .- * Added bordered printing that marks the unit character width.+ * Internal changes to work with latest @Wumpus-Basic@. . . build-type: Simple@@ -69,8 +43,8 @@ hs-source-dirs: src build-depends: base < 5, vector-space >= 0.6,- wumpus-core == 0.32.0,- wumpus-basic == 0.7.0+ wumpus-core == 0.33.0,+ wumpus-basic == 0.8.0 exposed-modules: