hoodle-core 0.7.0.0 → 0.7.1

raw patch · 3 files changed

+16/−8 lines, 3 files

Files

• CHANGES +5/−0
• hoodle-core.cabal +1/−1
• src/Hoodle/Coroutine/File.hs +10/−7

@@ -28,3 +28,8 @@  0.6.6: 28 Feb 2012     * scripting support, zoom in/out implemented. page functions are implemented++0.7: 29 Nov 2012+   * new hoodle format, load image, pdf export, simplify namespace to Hoodle++

@@ -1,5 +1,5 @@ Name:		hoodle-core-Version:	0.7.0.0+Version:	0.7.1 Synopsis:	Core library for hoodle Description: 	Hoodle is a pen notetaking program written in haskell.                  hoodle-core is the core library written in haskell and 

@@ -20,6 +20,7 @@ import           Control.Monad.State import           Data.ByteString.Char8 as B (pack) import qualified Data.ByteString.Lazy as L+import qualified Data.IntMap as IM import           Graphics.Rendering.Cairo import           Graphics.UI.Gtk hiding (get,set) import           System.Directory@@ -30,7 +31,8 @@ import           Data.Hoodle.Generic import           Data.Hoodle.Simple import           Data.Hoodle.Select-import           Graphics.Hoodle.Render+-- import           Graphics.Hoodle.Render+import           Graphics.Hoodle.Render.Generic import           Graphics.Hoodle.Render.Item import           Graphics.Hoodle.Render.Type import           Graphics.Hoodle.Render.Type.HitTest @@ -160,13 +162,14 @@ sequence1_ i (a:as) = a >> i >> sequence1_ i as   -- | -renderjob :: Hoodle -> FilePath -> IO () +renderjob :: RHoodle -> FilePath -> IO ()  renderjob h ofp = do -  let p = head (hoodle_pages h) -  let Dim width height = page_dim p  +  let p = maybe (error "renderjob") id $ IM.lookup 0 (view gpages h)  +  let Dim width height = view gdimension p  +  let rf = cairoRenderOption (InBBoxOption Nothing) :: InBBox RPage -> Render ()   withPDFSurface ofp width height $ \s -> renderWith s $  -    (sequence1_ showPage . map renderPage . hoodle_pages) h -+    -- (sequence1_ showPage . map renderPage . hoodle_pages) h +    (sequence1_ showPage . map (rf . InBBox) . IM.elems . view gpages ) h   -- |  fileExport :: MainCoroutine ()@@ -178,7 +181,7 @@       then fileExtensionInvalid (".pdf","export") >> fileExport        else do               xstate <- get -        let hdl = (rHoodle2Hoodle . getHoodle) xstate +        let hdl = getHoodle xstate -- (rHoodle2Hoodle . getHoodle) xstate          liftIO (renderjob hdl filename)