diff --git a/Graphics/Rendering/Cairo.hs b/Graphics/Rendering/Cairo.hs --- a/Graphics/Rendering/Cairo.hs +++ b/Graphics/Rendering/Cairo.hs @@ -49,7 +49,7 @@ -- PostScript and PDF. Operations in cairo including stroking and filling cubic -- Bezier splines, transforming and compositing translucent images, and -- antialiased text rendering. All drawing operations can be transformed by any --- affine transformation (scale, rotation, shear, etc.) +-- affine transformation (scale, rotation, shear, etc.) -- -- Cairo is free software and is available to be redistributed and\/or modified -- under the terms of either the GNU Lesser General Public License (LGPL) @@ -358,7 +358,7 @@ -- default values and with the given surface as a target surface. The target -- surface should be constructed with a backend-specific function such as -- 'withImageSurface' (or any other with\Surface variant). --- +-- renderWith :: (MonadIO m) => Surface -- ^ the target surface for the Render context -> Render a @@ -927,8 +927,8 @@ -- position (@x@, @y@) in user-space coordinates. -- rectangle :: - Double -- ^ @x@ - the X coordinate of the top left corner of the rectangle - -> Double -- ^ @y@ - the Y coordinate of the top left corner of the rectangle + Double -- ^ @x@ - the X coordinate of the top left corner of the rectangle + -> Double -- ^ @y@ - the Y coordinate of the top left corner of the rectangle -> Double -- ^ @width@ - the width of the rectangle -> Double -- ^ @height@ - the height of the rectangle -> Render () @@ -937,7 +937,7 @@ -- | Render text at the current path. -- -- * See 'showText' for why you should use Gtk functions. --- +-- textPath :: CairoString string => string -- ^ - @@ -1435,7 +1435,7 @@ -- | Allocates a new font options object copying the option values from @original@. -- fontOptionsCopy :: - MonadIO m => + MonadIO m => FontOptions -- ^ @original@ -> m FontOptions fontOptionsCopy a = liftIO $ Internal.fontOptionsCopy a @@ -1445,9 +1445,9 @@ -- @other@ onto @options@ with the operation of 'OperationOver'. -- fontOptionsMerge :: - MonadIO m => + MonadIO m => FontOptions -- ^ @options@ - -> FontOptions -- ^ @other@ + -> FontOptions -- ^ @other@ -> m () fontOptionsMerge a b = liftIO $ Internal.fontOptionsMerge a b @@ -1539,7 +1539,7 @@ -- Haskell memory manager rather than only being temporaily allocated. This -- is more flexible and allows you to create surfaces that persist, which -- can be very useful, for example to cache static elements in an animation. --- +-- -- However you should be careful because surfaces can be expensive resources -- and the Haskell memory manager cannot guarantee when it will release them. -- You can manually release the resources used by a surface with @@ -1641,7 +1641,7 @@ -- surface. -- surfaceMarkDirtyRectangle :: - MonadIO m => + MonadIO m => Surface -- ^ a 'Surface' -> Int -- ^ X coordinate of dirty rectangle -> Int -- ^ Y coordinate of dirty rectangle @@ -1662,7 +1662,7 @@ -- surface in a surface pattern. -- surfaceSetDeviceOffset :: - MonadIO m => + MonadIO m => Surface -- ^ a 'Surface' -> Double -- ^ the offset in the X direction, in device units -> Double -- ^ the offset in the Y direction, in device units @@ -1676,7 +1676,7 @@ formatStrideForWidth :: Format -- ^ format of pixels in the surface to create -> Int -- ^ width of the surface, in pixels - -> Int -- ^ the stride (number of bytes necessary to store one line) + -> Int -- ^ the stride (number of bytes necessary to store one line) -- or @-1@ if the format is invalid or the width is too large formatStrideForWidth = Internal.formatStrideForWidth #endif @@ -1842,7 +1842,7 @@ -- -- * The function will return an error if the surface is not an image -- surface or if 'surfaceFinish' has been called on the surface. --- +-- imageSurfaceGetPixels :: Storable e => Surface -> IO (SurfaceData Int e) imageSurfaceGetPixels pb = do pixPtr <- Internal.imageSurfaceGetData pb @@ -1969,7 +1969,7 @@ -> (Surface -> IO a) -- ^ an action that may use the surface. The surface is -- only valid within in this action. -> IO a -withPSSurface filename width height f = +withPSSurface filename width height f = bracket (Internal.psSurfaceCreate filename width height) (\surface -> do status <- Internal.surfaceStatus surface Internal.surfaceDestroy surface diff --git a/Graphics/Rendering/Cairo/Types.chs b/Graphics/Rendering/Cairo/Types.chs --- a/Graphics/Rendering/Cairo/Types.chs +++ b/Graphics/Rendering/Cairo/Types.chs @@ -262,7 +262,7 @@ -- with red at the top -- -- ['SubpixelOrderVbgr'] Subpixel elements are arranged vertically --- with blue at the top +-- with blue at the top -- {#enum subpixel_order_t as SubpixelOrder {underscoreToCase} deriving(Eq,Show)#} @@ -320,11 +320,11 @@ fontOptionsDestroy :: FinalizerPtr FontOptions -- XXX: pathToList :: Path -> [PathData] --- +-- -- http://cairographics.org/manual/bindings-path.html --- +-- -- {#enum path_data_type_t as PathDataType {underscoreToCase}#} --- +-- -- type Point = (Double, Double) -- data PathData = PathMoveTo Point -- | PathLineTo Point diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs --- a/Gtk2HsSetup.hs +++ b/Gtk2HsSetup.hs @@ -129,7 +129,7 @@ Just ('.':_) -> True Just ('-':n:_) | isNumber n -> True _ -> False - + -- The following code is a big copy-and-paste job from the sources of -- Cabal 1.8 just to be able to fix a field in the package file. Yuck. diff --git a/SetupMain.hs b/SetupMain.hs --- a/SetupMain.hs +++ b/SetupMain.hs @@ -10,4 +10,4 @@ main = do checkGtk2hsBuildtools [c2hsLocal] defaultMainWithHooks gtk2hsUserHooks - + diff --git a/cairo.cabal b/cairo.cabal --- a/cairo.cabal +++ b/cairo.cabal @@ -1,5 +1,5 @@ Name: cairo -Version: 0.13.0.4 +Version: 0.13.0.5 License: BSD3 License-file: COPYRIGHT Copyright: (c) 2001-2010 The Gtk2Hs Team, (c) Paolo Martini 2005, (c) Abraham Egnor 2003, 2004, (c) Aetion Technologies LLC 2004 @@ -49,7 +49,7 @@ utf8-string >= 0.2 && < 0.4, text >= 1.0.0.0 && < 1.3, bytestring, mtl, array - build-tools: gtk2hsC2hs >= 0.13.11 + build-tools: gtk2hsC2hs >= 0.13.12 exposed-modules: Graphics.Rendering.Cairo Graphics.Rendering.Cairo.Matrix Graphics.Rendering.Cairo.Types