diff --git a/Graphics/UI/Gtk/Poppler/Page.chs b/Graphics/UI/Gtk/Poppler/Page.chs --- a/Graphics/UI/Gtk/Poppler/Page.chs +++ b/Graphics/UI/Gtk/Poppler/Page.chs @@ -42,7 +42,7 @@ -- * Methods pageRender, - pageRenderToPixbuf, + -- pageRenderToPixbuf, pageGetSize, pageGetIndex, pageGetThumbnail, @@ -57,7 +57,7 @@ pageGetFormFieldMapping, pageGetSelectionRegion, pageRenderSelection, - pageRenderSelectionToPixbuf, + -- pageRenderSelectionToPixbuf, ) where import Control.Monad @@ -91,7 +91,7 @@ -- the upper left corner at (@srcX@, @srcY@) and @srcWidth@ and @srcHeight@. This function is for rendering -- a page that will be displayed. If you want to render a page that will be printed use -- 'pageRenderToPixbufForPrinting' instead -pageRenderToPixbuf :: PageClass page => page +{- pageRenderToPixbuf :: PageClass page => page -> Rectangle -- ^ @rect@ rectangle to render -> Double -- ^ @scale@ scale specified as pixels per point -> Int -- ^ @rotation@ rotate the document by the specified degree @@ -107,6 +107,7 @@ (realToFrac scale) (fromIntegral rotation) pixbuf +-} -- | Gets the size of page at the current scale and rotation. pageGetSize :: PageClass page => page @@ -312,12 +313,13 @@ ((fromIntegral . fromEnum) style) (castPtr glyphColorPtr) (castPtr backgroundColorPtr) - + -- | Render the selection specified by selection for page into pixbuf. The selection will be rendered at -- scale, using @glyphColor@ for the glyphs and @backgroundColor@ for the selection background. -- -- If non-'Nothing', @oldSelection@ specifies the selection that is already rendered in pixbuf, in which case -- this function will (some day) only render the changed part of the selection. +{- pageRenderSelectionToPixbuf :: PageClass page => page -> Double -- ^ @scale@ scale specified as pixels per point -> Int -- ^ @rotation@ rotate the document by the specified degree @@ -343,3 +345,4 @@ ((fromIntegral . fromEnum) style) (castPtr glyphColorPtr) (castPtr backgroundColorPtr) +-} diff --git a/Graphics/UI/Gtk/Poppler/Types.chs b/Graphics/UI/Gtk/Poppler/Types.chs --- a/Graphics/UI/Gtk/Poppler/Types.chs +++ b/Graphics/UI/Gtk/Poppler/Types.chs @@ -1,4 +1,5 @@ {-# OPTIONS_HADDOCK hide #-} +{-# LANGUAGE CPP #-} -- -*-haskell-*- -- -------------------- automatically generated file - do not edit ---------- -- Object hierarchy for the GIMP Toolkit (GTK) Binding for Haskell @@ -34,34 +35,6 @@ -- module Graphics.UI.Gtk.Poppler.Types ( - PangoContext(PangoContext), PangoContextClass, - toPangoContext, - mkPangoContext, unPangoContext, - castToPangoContext, gTypePangoContext, - PangoLayoutRaw(PangoLayoutRaw), PangoLayoutRawClass, - toPangoLayoutRaw, - mkPangoLayoutRaw, unPangoLayoutRaw, - castToPangoLayoutRaw, gTypePangoLayoutRaw, - Font(Font), FontClass, - toFont, - mkFont, unFont, - castToFont, gTypeFont, - FontFamily(FontFamily), FontFamilyClass, - toFontFamily, - mkFontFamily, unFontFamily, - castToFontFamily, gTypeFontFamily, - FontFace(FontFace), FontFaceClass, - toFontFace, - mkFontFace, unFontFace, - castToFontFace, gTypeFontFace, - FontMap(FontMap), FontMapClass, - toFontMap, - mkFontMap, unFontMap, - castToFontMap, gTypeFontMap, - FontSet(FontSet), FontSetClass, - toFontSet, - mkFontSet, unFontSet, - castToFontSet, gTypeFontSet, Document(Document), DocumentClass, toDocument, mkDocument, unDocument, @@ -97,7 +70,11 @@ ) where import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr) +#if __GLASGOW_HASKELL__>=704 +import Foreign.C.Types (CULong(..), CUInt(..)) +#else import Foreign.C.Types (CULong, CUInt) +#endif import System.Glib.GType (GType, typeInstanceIsA) import System.Glib.GObject @@ -115,167 +92,6 @@ -> unsafeCastGObject gobj | otherwise -> error $ "Cannot cast object to " ++ objTypeName - --- *************************************************************** PangoContext - -{#pointer *PangoContext foreign newtype #} deriving (Eq,Ord) - -mkPangoContext = (PangoContext, objectUnref) -unPangoContext (PangoContext o) = o - -class GObjectClass o => PangoContextClass o -toPangoContext :: PangoContextClass o => o -> PangoContext -toPangoContext = unsafeCastGObject . toGObject - -instance PangoContextClass PangoContext -instance GObjectClass PangoContext where - toGObject = GObject . castForeignPtr . unPangoContext - unsafeCastGObject = PangoContext . castForeignPtr . unGObject - -castToPangoContext :: GObjectClass obj => obj -> PangoContext -castToPangoContext = castTo gTypePangoContext "PangoContext" - -gTypePangoContext :: GType -gTypePangoContext = - {# call fun unsafe pango_context_get_type #} - --- ************************************************************* PangoLayoutRaw - -{#pointer *PangoLayout as PangoLayoutRaw foreign newtype #} deriving (Eq,Ord) - -mkPangoLayoutRaw = (PangoLayoutRaw, objectUnref) -unPangoLayoutRaw (PangoLayoutRaw o) = o - -class GObjectClass o => PangoLayoutRawClass o -toPangoLayoutRaw :: PangoLayoutRawClass o => o -> PangoLayoutRaw -toPangoLayoutRaw = unsafeCastGObject . toGObject - -instance PangoLayoutRawClass PangoLayoutRaw -instance GObjectClass PangoLayoutRaw where - toGObject = GObject . castForeignPtr . unPangoLayoutRaw - unsafeCastGObject = PangoLayoutRaw . castForeignPtr . unGObject - -castToPangoLayoutRaw :: GObjectClass obj => obj -> PangoLayoutRaw -castToPangoLayoutRaw = castTo gTypePangoLayoutRaw "PangoLayoutRaw" - -gTypePangoLayoutRaw :: GType -gTypePangoLayoutRaw = - {# call fun unsafe pango_layout_get_type #} - --- *********************************************************************** Font - -{#pointer *PangoFont as Font foreign newtype #} deriving (Eq,Ord) - -mkFont = (Font, objectUnref) -unFont (Font o) = o - -class GObjectClass o => FontClass o -toFont :: FontClass o => o -> Font -toFont = unsafeCastGObject . toGObject - -instance FontClass Font -instance GObjectClass Font where - toGObject = GObject . castForeignPtr . unFont - unsafeCastGObject = Font . castForeignPtr . unGObject - -castToFont :: GObjectClass obj => obj -> Font -castToFont = castTo gTypeFont "Font" - -gTypeFont :: GType -gTypeFont = - {# call fun unsafe pango_font_get_type #} - --- ***************************************************************** FontFamily - -{#pointer *PangoFontFamily as FontFamily foreign newtype #} deriving (Eq,Ord) - -mkFontFamily = (FontFamily, objectUnref) -unFontFamily (FontFamily o) = o - -class GObjectClass o => FontFamilyClass o -toFontFamily :: FontFamilyClass o => o -> FontFamily -toFontFamily = unsafeCastGObject . toGObject - -instance FontFamilyClass FontFamily -instance GObjectClass FontFamily where - toGObject = GObject . castForeignPtr . unFontFamily - unsafeCastGObject = FontFamily . castForeignPtr . unGObject - -castToFontFamily :: GObjectClass obj => obj -> FontFamily -castToFontFamily = castTo gTypeFontFamily "FontFamily" - -gTypeFontFamily :: GType -gTypeFontFamily = - {# call fun unsafe pango_font_family_get_type #} - --- ******************************************************************* FontFace - -{#pointer *PangoFontFace as FontFace foreign newtype #} deriving (Eq,Ord) - -mkFontFace = (FontFace, objectUnref) -unFontFace (FontFace o) = o - -class GObjectClass o => FontFaceClass o -toFontFace :: FontFaceClass o => o -> FontFace -toFontFace = unsafeCastGObject . toGObject - -instance FontFaceClass FontFace -instance GObjectClass FontFace where - toGObject = GObject . castForeignPtr . unFontFace - unsafeCastGObject = FontFace . castForeignPtr . unGObject - -castToFontFace :: GObjectClass obj => obj -> FontFace -castToFontFace = castTo gTypeFontFace "FontFace" - -gTypeFontFace :: GType -gTypeFontFace = - {# call fun unsafe pango_font_face_get_type #} - --- ******************************************************************** FontMap - -{#pointer *PangoFontMap as FontMap foreign newtype #} deriving (Eq,Ord) - -mkFontMap = (FontMap, objectUnref) -unFontMap (FontMap o) = o - -class GObjectClass o => FontMapClass o -toFontMap :: FontMapClass o => o -> FontMap -toFontMap = unsafeCastGObject . toGObject - -instance FontMapClass FontMap -instance GObjectClass FontMap where - toGObject = GObject . castForeignPtr . unFontMap - unsafeCastGObject = FontMap . castForeignPtr . unGObject - -castToFontMap :: GObjectClass obj => obj -> FontMap -castToFontMap = castTo gTypeFontMap "FontMap" - -gTypeFontMap :: GType -gTypeFontMap = - {# call fun unsafe pango_font_face_get_type #} - --- ******************************************************************** FontSet - -{#pointer *PangoFontset as FontSet foreign newtype #} deriving (Eq,Ord) - -mkFontSet = (FontSet, objectUnref) -unFontSet (FontSet o) = o - -class GObjectClass o => FontSetClass o -toFontSet :: FontSetClass o => o -> FontSet -toFontSet = unsafeCastGObject . toGObject - -instance FontSetClass FontSet -instance GObjectClass FontSet where - toGObject = GObject . castForeignPtr . unFontSet - unsafeCastGObject = FontSet . castForeignPtr . unGObject - -castToFontSet :: GObjectClass obj => obj -> FontSet -castToFontSet = castTo gTypeFontSet "FontSet" - -gTypeFontSet :: GType -gTypeFontSet = - {# call fun unsafe pango_fontset_get_type #} -- ******************************************************************* Document diff --git a/hierarchy.list b/hierarchy.list --- a/hierarchy.list +++ b/hierarchy.list @@ -221,13 +221,13 @@ ## This now became a GObject in version 2: GdkGC as GC, gdk_gc_get_type ## These are Pango structures - PangoContext as PangoContext, pango_context_get_type if pango - PangoLayout as PangoLayoutRaw, pango_layout_get_type if pango - PangoFont as Font, pango_font_get_type if pango - PangoFontFamily as FontFamily, pango_font_family_get_type if pango - PangoFontFace as FontFace, pango_font_face_get_type if pango - PangoFontMap as FontMap, pango_font_face_get_type if pango - PangoFontset as FontSet, pango_fontset_get_type if pango +# PangoContext as PangoContext, pango_context_get_type if pango +# PangoLayout as PangoLayoutRaw, pango_layout_get_type if pango +# PangoFont as Font, pango_font_get_type if pango +# PangoFontFamily as FontFamily, pango_font_family_get_type if pango +# PangoFontFace as FontFace, pango_font_face_get_type if pango +# PangoFontMap as FontMap, pango_font_face_get_type if pango +# PangoFontset as FontSet, pango_fontset_get_type if pango ## This type is only available for PANGO_ENABLE_BACKEND compiled source ## PangoFontsetSimple as FontSetSimple, pango_fontset_simple_get_type diff --git a/poppler.cabal b/poppler.cabal --- a/poppler.cabal +++ b/poppler.cabal @@ -1,10 +1,10 @@ Name: poppler -Version: 0.12.2 +Version: 0.12.2.1 License: GPL-2 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team Author: Andy Stewart -Maintainer: gtk2hs-users@sourceforge.net +Maintainer: Ian-Woo Kim Build-Type: Custom Cabal-Version: >= 1.6 Stability: stable @@ -15,7 +15,7 @@ library, to centralize the maintenance effort. And move to forward in a number of areas that don't fit within the goals of xpdf. Category: Graphics -Tested-With: GHC == 6.12.3 +Tested-With: GHC == 7.4 Extra-Source-Files: Gtk2HsSetup.hs hierarchy.list template-hsc-gtk2hs.h @@ -37,11 +37,12 @@ location: http://patch-tag.com/r/AndyStewart/poppler Library - build-depends: base >= 4 && < 5, array, containers, haskell98, mtl, bytestring, + build-depends: base >= 4 && < 5, array, containers, + mtl, bytestring, glib >= 0.12 && < 0.13, cairo >= 0.12 && < 0.13, gtk >= 0.12 && < 0.13 - +-- haskell98, build-tools: gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen exposed-modules: