pango 0.13.1.0 → 0.13.1.1
raw patch · 10 files changed
+91/−89 lines, 10 files
Files
- Graphics/Rendering/Pango/Attributes.chs +4/−4
- Graphics/Rendering/Pango/BasicTypes.chs +29/−29
- Graphics/Rendering/Pango/Cairo.chs +2/−2
- Graphics/Rendering/Pango/Description.chs +7/−7
- Graphics/Rendering/Pango/Enums.chs +10/−10
- Graphics/Rendering/Pango/Font.chs +3/−3
- Graphics/Rendering/Pango/Markup.chs +16/−16
- Graphics/Rendering/Pango/Structs.hsc +15/−15
- SetupWrapper.hs +1/−1
- pango.cabal +4/−2
Graphics/Rendering/Pango/Attributes.chs view
@@ -56,11 +56,11 @@ withAttrList (PangoString correct _ _) pas act = do alPtr <- {#call unsafe attr_list_new#} let pas' = sortBy (\pa1 pa2 -> case compare (paStart pa1) (paStart pa2) of- EQ -> compare (paEnd pa1) (paEnd pa2)- other -> other) pas+ EQ -> compare (paEnd pa1) (paEnd pa2)+ other -> other) pas mapM_ (\pa -> do- paPtr <- crAttr correct pa- {#call unsafe pango_attr_list_insert#} alPtr (castPtr paPtr)) pas'+ paPtr <- crAttr correct pa+ {#call unsafe pango_attr_list_insert#} alPtr (castPtr paPtr)) pas' res <- act alPtr pango_attr_list_unref alPtr return res
Graphics/Rendering/Pango/BasicTypes.chs view
@@ -119,27 +119,27 @@ {#enum Style as FontStyle {underscoreToCase} deriving (Eq)#} instance Show FontStyle where- showsPrec _ StyleNormal = shows "normal"- showsPrec _ StyleOblique = shows "oblique"- showsPrec _ StyleItalic = shows "italic"+ showsPrec _ StyleNormal = shows "normal"+ showsPrec _ StyleOblique = shows "oblique"+ showsPrec _ StyleItalic = shows "italic" -- | Define attributes for 'Weight'. -- {#enum Weight {underscoreToCase} deriving (Eq)#} instance Show Weight where- showsPrec _ WeightUltralight = shows "ultralight"- showsPrec _ WeightLight = shows "light"- showsPrec _ WeightNormal = shows "normal"- showsPrec _ WeightSemibold = shows "semibold"- showsPrec _ WeightBold = shows "bold"- showsPrec _ WeightUltrabold = shows "ultrabold"- showsPrec _ WeightHeavy = shows "heavy"+ showsPrec _ WeightUltralight = shows "ultralight"+ showsPrec _ WeightLight = shows "light"+ showsPrec _ WeightNormal = shows "normal"+ showsPrec _ WeightSemibold = shows "semibold"+ showsPrec _ WeightBold = shows "bold"+ showsPrec _ WeightUltrabold = shows "ultrabold"+ showsPrec _ WeightHeavy = shows "heavy" #if PANGO_VERSION_CHECK(1,24,0)- showsPrec _ WeightThin = shows "thin"- showsPrec _ WeightBook = shows "book"- showsPrec _ WeightMedium = shows "medium"- showsPrec _ WeightUltraheavy = shows "ultraheavy"+ showsPrec _ WeightThin = shows "thin"+ showsPrec _ WeightBook = shows "book"+ showsPrec _ WeightMedium = shows "medium"+ showsPrec _ WeightUltraheavy = shows "ultraheavy" #endif -- | The variant of a font.@@ -158,15 +158,15 @@ {#enum Stretch {underscoreToCase} deriving (Eq)#} instance Show Stretch where- showsPrec _ StretchUltraCondensed = shows "ultracondensed"- showsPrec _ StretchExtraCondensed = shows "extracondensed"- showsPrec _ StretchCondensed = shows "condensed"- showsPrec _ StretchSemiCondensed = shows "semicondensed"- showsPrec _ StretchNormal = shows "normal"- showsPrec _ StretchSemiExpanded = shows "semiexpanded"- showsPrec _ StretchExpanded = shows "expanded"- showsPrec _ StretchExtraExpanded = shows "extraexpanded"- showsPrec _ StretchUltraExpanded = shows "ultraexpanded"+ showsPrec _ StretchUltraCondensed = shows "ultracondensed"+ showsPrec _ StretchExtraCondensed = shows "extracondensed"+ showsPrec _ StretchCondensed = shows "condensed"+ showsPrec _ StretchSemiCondensed = shows "semicondensed"+ showsPrec _ StretchNormal = shows "normal"+ showsPrec _ StretchSemiExpanded = shows "semiexpanded"+ showsPrec _ StretchExpanded = shows "expanded"+ showsPrec _ StretchExtraExpanded = shows "extraexpanded"+ showsPrec _ StretchUltraExpanded = shows "ultraexpanded" -- | Define attributes for 'Underline'. --@@ -175,11 +175,11 @@ {#enum Underline {underscoreToCase} deriving (Eq)#} instance Show Underline where- showsPrec _ UnderlineNone = shows "none"- showsPrec _ UnderlineSingle = shows "single"- showsPrec _ UnderlineDouble = shows "double"- showsPrec _ UnderlineLow = shows "low"- showsPrec _ UnderlineError = shows "error"+ showsPrec _ UnderlineNone = shows "none"+ showsPrec _ UnderlineSingle = shows "single"+ showsPrec _ UnderlineDouble = shows "double"+ showsPrec _ UnderlineLow = shows "low"+ showsPrec _ UnderlineError = shows "error" #if PANGO_VERSION_CHECK(1,16,0) -- | The 'PangoGravity' type represents the orientation of glyphs in a@@ -243,7 +243,7 @@ liftM (PangoString correct cLen) $ newForeignPtr strPtr finalizerFree withPangoString :: PangoString ->- (UTFCorrection -> CInt -> Ptr CChar -> IO a) -> IO a+ (UTFCorrection -> CInt -> Ptr CChar -> IO a) -> IO a withPangoString (PangoString c l ptr) act = withForeignPtr ptr $ \strPtr -> act c l strPtr
Graphics/Rendering/Pango/Cairo.chs view
@@ -57,7 +57,7 @@ import System.Glib.FFI import System.Glib.UTFString-import System.Glib.GObject (wrapNewGObject, makeNewGObject,+import System.Glib.GObject (wrapNewGObject, makeNewGObject, objectRef, objectUnref) {#import Graphics.Rendering.Pango.Types#} {#import Graphics.Rendering.Pango.BasicTypes#}@@ -203,7 +203,7 @@ cr <- ask liftIO $ do layRaw <- wrapNewGObject mkPangoLayoutRaw $- {#call unsafe pango_cairo_create_layout#} cr+ {#call unsafe pango_cairo_create_layout#} cr textRef <- newIORef undefined let pl = (PangoLayout textRef layRaw) layoutSetText pl text
Graphics/Rendering/Pango/Description.chs view
@@ -59,7 +59,7 @@ import Control.Monad (liftM) import System.Glib.FFI-import System.Glib.Flags (Flags, fromFlags)+import System.Glib.Flags (Flags, fromFlags) import System.Glib.UTFString {#import Graphics.Rendering.Pango.Types#} {#import Graphics.Rendering.Pango.Enums#}@@ -121,7 +121,7 @@ fields <- {#call unsafe get_set_fields#} fd if (fromEnum PangoFontMaskStyle) .&. (fromIntegral fields) /=0 then liftM (Just . toEnum . fromIntegral) $- {#call unsafe get_style#} fd+ {#call unsafe get_style#} fd else return Nothing -- | Set the variant field.@@ -136,7 +136,7 @@ fields <- {#call unsafe get_set_fields#} fd if (fromEnum PangoFontMaskVariant) .&. (fromIntegral fields) /=0 then liftM (Just . toEnum . fromIntegral) $- {#call unsafe get_variant#} fd+ {#call unsafe get_variant#} fd else return Nothing -- | Set the weight field.@@ -151,7 +151,7 @@ fields <- {#call unsafe get_set_fields#} fd if (fromEnum PangoFontMaskWeight) .&. (fromIntegral fields) /=0 then liftM (Just . toEnum . fromIntegral) $- {#call unsafe get_weight#} fd+ {#call unsafe get_weight#} fd else return Nothing -- | Set the stretch field.@@ -166,7 +166,7 @@ fields <- {#call unsafe get_set_fields#} fd if (fromEnum PangoFontMaskStretch) .&. (fromIntegral fields) /=0 then liftM (Just . toEnum . fromIntegral) $- {#call unsafe get_stretch#} fd+ {#call unsafe get_stretch#} fd else return Nothing -- | Set the size field.@@ -183,7 +183,7 @@ fields <- {#call unsafe get_set_fields#} fd if (fromEnum PangoFontMaskSize) .&. (fromIntegral fields) /=0 then liftM (\x -> Just (intToPu x)) $- {#call unsafe get_size#} fd+ {#call unsafe get_size#} fd else return Nothing -- | Reset fields in a font description.@@ -219,7 +219,7 @@ -- attributes do not match, the function returns @False@. -- fontDescriptionBetterMatch :: FontDescription -> FontDescription ->- FontDescription -> Bool+ FontDescription -> Bool fontDescriptionBetterMatch fd fdA fdB = unsafePerformIO $ liftM toBool $ {#call unsafe better_match#} fd fdA fdB
Graphics/Rendering/Pango/Enums.chs view
@@ -75,16 +75,16 @@ | SizeLarger instance Show Size where- showsPrec _ (SizePoint v) = shows $ show (round (v*1000))- showsPrec _ (SizeUnreadable) = shows "xx-small"- showsPrec _ (SizeTiny) = shows "x-small"- showsPrec _ (SizeSmall) = shows "small"- showsPrec _ (SizeMedium) = shows "medium"- showsPrec _ (SizeLarge) = shows "large"- showsPrec _ (SizeHuge) = shows "x-large"- showsPrec _ (SizeGiant) = shows "xx-large"- showsPrec _ (SizeSmaller) = shows "smaller"- showsPrec _ (SizeLarger) = shows "larger"+ showsPrec _ (SizePoint v) = shows $ show (round (v*1000))+ showsPrec _ (SizeUnreadable) = shows "xx-small"+ showsPrec _ (SizeTiny) = shows "x-small"+ showsPrec _ (SizeSmall) = shows "small"+ showsPrec _ (SizeMedium) = shows "medium"+ showsPrec _ (SizeLarge) = shows "large"+ showsPrec _ (SizeHuge) = shows "x-large"+ showsPrec _ (SizeGiant) = shows "xx-large"+ showsPrec _ (SizeSmaller) = shows "smaller"+ showsPrec _ (SizeLarger) = shows "larger"
Graphics/Rendering/Pango/Font.chs view
@@ -78,7 +78,7 @@ import System.Glib.FFI import System.Glib.UTFString-import System.Glib.GObject (makeNewGObject)+import System.Glib.GObject (makeNewGObject) {#import Graphics.Rendering.Pango.BasicTypes#} {#import Graphics.Rendering.Pango.Types#} {#import Graphics.Rendering.Pango.Enums#} (FontMetrics)@@ -99,7 +99,7 @@ arrPtr <- peek arrPtrPtr size <- peek sizePtr ffsPtr <- peekArray (fromIntegral size)- (castPtr arrPtr::Ptr (Ptr FontFamily)) -- c2hs is wrong here+ (castPtr arrPtr::Ptr (Ptr FontFamily)) -- c2hs is wrong here {#call unsafe g_free#} (castPtr arrPtr) mapM (makeNewGObject mkFontFamily . return . castPtr) ffsPtr @@ -138,7 +138,7 @@ arrPtr <- peek arrPtrPtr size <- peek sizePtr ffsPtr <- peekArray (fromIntegral size)- (castPtr arrPtr::Ptr (Ptr FontFace)) -- c2hs is wrong here+ (castPtr arrPtr::Ptr (Ptr FontFace)) -- c2hs is wrong here {#call unsafe g_free#} (castPtr arrPtr) mapM (makeNewGObject mkFontFace . return . castPtr) ffsPtr
Graphics/Rendering/Pango/Markup.chs view
@@ -74,7 +74,7 @@ -- | Specify the family of font to use. -- -- * Example: @FontFamily@ \"Sans\"- | FontFamily String+ | FontFamily String -- | Change the size of the current font. --@@ -116,7 +116,7 @@ -- hex code of the form \"#RRGGBB\" or an X11 color name like -- \"dark olive green\". --- | FontForeground String -- FIXME: should be ColorName from GDK or so+ | FontForeground String -- FIXME: should be ColorName from GDK or so -- | Background color. | FontBackground String@@ -129,14 +129,14 @@ -- -- * Takes the vertical displacement in em (the width of the \'m\' character -- in the current font).- | FontRise Double+ | FontRise Double -- | Give a hint about the language to be displayed. -- -- * This hint might help the system rendering a particular piece of text -- with different fonts that are more suitable for the given language. --- | FontLang Pango.Language+ | FontLang Pango.Language #if PANGO_VERSION_CHECK(1,16,0) -- | Gravity of text, use for ratation.@@ -148,18 +148,18 @@ instance Show SpanAttribute where showsPrec _ (FontDescr str) = showString " font_desc=".shows str- showsPrec _ (FontFamily str) = showString " font_family=".shows str- showsPrec _ (FontSize size) = showString " size=".shows size+ showsPrec _ (FontFamily str) = showString " font_family=".shows str+ showsPrec _ (FontSize size) = showString " size=".shows size showsPrec _ (FontStyle style) = showString " style=".shows style- showsPrec _ (FontWeight w) = showString " weight=".shows w- showsPrec _ (FontVariant v) = showString " variant=".shows v- showsPrec _ (FontStretch s) = showString " stretch=".shows s+ showsPrec _ (FontWeight w) = showString " weight=".shows w+ showsPrec _ (FontVariant v) = showString " variant=".shows v+ showsPrec _ (FontStretch s) = showString " stretch=".shows s showsPrec _ (FontForeground c) = showString " foreground=".shows c showsPrec _ (FontBackground c) = showString " background=".shows c- showsPrec _ (FontUnderline u) = showString " underline=".shows u- showsPrec _ (FontRise r) = showString " rise=".shows- (show (round (r*10000)))- showsPrec _ (FontLang l) = showString " lang=".shows l+ showsPrec _ (FontUnderline u) = showString " underline=".shows u+ showsPrec _ (FontRise r) = showString " rise=".shows+ (show (round (r*10000)))+ showsPrec _ (FontLang l) = showString " lang=".shows l #if PANGO_VERSION_CHECK(1,16,0) showsPrec _ (FontGravity g) = showString " gravity=".shows g showsPrec _ (FontGravityHint h) = showString " gravity_hint".shows h@@ -169,7 +169,7 @@ -- markSpan :: [SpanAttribute] -> String -> String markSpan attrs text = showString "<span".- foldr (.) (showChar '>') (map shows attrs).- showString text.- showString "</span>" $ ""+ foldr (.) (showChar '>') (map shows attrs).+ showString text.+ showString "</span>" $ ""
Graphics/Rendering/Pango/Structs.hsc view
@@ -54,14 +54,14 @@ readAttr ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.IORef import Control.Exception import System.Glib.FFI import System.Glib.UTFString ( peekUTFString, UTFCorrection, ofsToUTF, ofsFromUTF, DefaultGlibString )-import System.Glib.GObject (makeNewGObject)+import System.Glib.GObject (makeNewGObject) import Graphics.Rendering.Pango.Types import Graphics.Rendering.Pango.BasicTypes @@ -84,7 +84,7 @@ peekPangoColor :: Ptr Color -> IO Color peekPangoColor ptr = do- red <- #{peek PangoColor, red} ptr+ red <- #{peek PangoColor, red} ptr green <- #{peek PangoColor, green} ptr blue <- #{peek PangoColor, blue} ptr return $ Color red green blue@@ -100,7 +100,7 @@ -- * Specifies x, y, width and height -- data PangoRectangle = PangoRectangle Double Double Double Double- deriving Show+ deriving Show instance Storable PangoRectangle where sizeOf _ = #{const sizeof(PangoRectangle)}@@ -117,10 +117,10 @@ peekIntPangoRectangle :: Ptr PangoRectangle -> IO Rectangle peekIntPangoRectangle ptr = do- (x_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, x} ptr- (y_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, y} ptr- (w_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, width} ptr- (h_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, height} ptr+ (x_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, x} ptr+ (y_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, y} ptr+ (w_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, width} ptr+ (h_ ::#gtk2hs_type gint) <- #{peek PangoRectangle, height} ptr return (Rectangle (fromIntegral x_) (fromIntegral y_) (fromIntegral w_) (fromIntegral h_)) @@ -287,7 +287,7 @@ -- of the description is made when this attributes is passed to or received -- from functions. | AttrFontDescription { paStart :: Int, paEnd :: Int,- paFontDescription :: FontDescription }+ paFontDescription :: FontDescription } -- | Specify the foreground color. | AttrForeground { paStart :: Int, paEnd :: Int, paColor :: Color } -- | Specify the background color.@@ -320,7 +320,7 @@ -- * Available in Pango 1.8.0 and higher. -- | AttrShape { paStart :: Int, paEnd :: Int, paInk :: PangoRectangle,- paLogical :: PangoRectangle }+ paLogical :: PangoRectangle } #endif -- | Scale the font up (values greater than one) or shrink the font. | AttrScale { paStart :: Int, paEnd :: Int, paScale :: Double }@@ -335,7 +335,7 @@ -- * Available in Pango 1.6.0 and higher. -- | AttrLetterSpacing { paStart :: Int, paEnd :: Int,- paLetterSpacing :: Double }+ paLetterSpacing :: Double } #endif #if PANGO_VERSION_CHECK(1,16,0) -- | Sets the gravity field of a font description. The gravity field specifies@@ -348,14 +348,14 @@ -- * Available in Pango 1.16.0 and higher. -- | AttrGravity { paStart :: Int, paEnd :: Int,- paGravity :: PangoGravity }+ paGravity :: PangoGravity } - -- | Set the way horizontal scripts behave in a vertical context.+ -- | Set the way horizontal scripts behave in a vertical context. -- -- * Available in Pango 1.16.0 and higher. --- | AttrGravityHint { paStart :: Int, paEnd :: Int,- paGravityHint :: PangoGravityHint }+ | AttrGravityHint { paStart :: Int, paEnd :: Int,+ paGravityHint :: PangoGravityHint } #endif deriving Show
SetupWrapper.hs view
@@ -20,7 +20,7 @@ import System.Process import System.Exit (ExitCode(..), exitWith) import System.FilePath-import System.Directory+import System.Directory (doesFileExist, getModificationTime) import qualified Control.Exception as Exception import System.IO.Error (isDoesNotExistError)
pango.cabal view
@@ -1,5 +1,5 @@ Name: pango-Version: 0.13.1.0+Version: 0.13.1.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team@@ -52,7 +52,7 @@ else build-depends: base < 4 - build-tools: gtk2hsC2hs >= 0.13.12, gtk2hsTypeGen+ build-tools: gtk2hsC2hs >= 0.13.13, gtk2hsTypeGen exposed-modules: Graphics.Rendering.Pango Graphics.Rendering.Pango.Font@@ -76,6 +76,8 @@ includes: hspango.h include-dirs: . cpp-options: -U__BLOCKS__ -D__attribute__(A)=+ if os(windows)+ cpp-options: -D__USE_MINGW_ANSI_STDIO=1 -- Pango 1.26 has a mysterious bug that makes it go into an infinite -- loop. Don't allow the user to build against this version. (Omit the -- >= 1.0 constraint in this case since Cabal 1.6 can't parse it.)