From 2d283d659416ebf06a6c5397eca41cd91aaee68f Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Mon, 19 Nov 2001 00:54:43 +0000 Subject: Take both dpi_x and dpi_y as arguments. Doesn't currently handle dpi_x 2001-11-18 Alex Larsson * pango/pangoft2.[ch] (pango_ft2_get_context): Take both dpi_x and dpi_y as arguments. Doesn't currently handle dpi_x correctly, but at least the API is in. --- ChangeLog | 6 ++ ChangeLog.pre-1-0 | 6 ++ ChangeLog.pre-1-10 | 6 ++ ChangeLog.pre-1-2 | 6 ++ ChangeLog.pre-1-4 | 6 ++ ChangeLog.pre-1-6 | 6 ++ ChangeLog.pre-1-8 | 6 ++ docs/tmpl/fonts.sgml | 31 ++++----- docs/tmpl/freetype-fonts.sgml | 151 ++--------------------------------------- docs/tmpl/layout.sgml | 1 - docs/tmpl/main.sgml | 9 --- docs/tmpl/tab-stops.sgml | 3 +- docs/tmpl/text-attributes.sgml | 9 +-- docs/tmpl/xft-fonts.sgml | 16 ----- pango/pangoft2.c | 7 +- pango/pangoft2.h | 2 +- 16 files changed, 72 insertions(+), 199 deletions(-) diff --git a/ChangeLog b/ChangeLog index 129abe40..eefc6752 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 129abe40..eefc6752 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2001-11-18 Alex Larsson + + * pango/pangoft2.[ch] (pango_ft2_get_context): + Take both dpi_x and dpi_y as arguments. Doesn't currently handle + dpi_x correctly, but at least the API is in. + 2001-11-18 Alex Larsson * pango/pango-context.[ch]: diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml index 8d5f2f0e..b5f84da5 100644 --- a/docs/tmpl/fonts.sgml +++ b/docs/tmpl/fonts.sgml @@ -116,10 +116,10 @@ The bits in a #PangoFontMask correspond to fields in a @PANGO_FONT_MASK_FAMILY: the font family is specified. -@PANGO_FONT_MASK_STYLE: the font style is specified. +@PANGO_FONT_MASK_STYLE: the font style is specified. @PANGO_FONT_MASK_VARIANT: the font variant is specified. -@PANGO_FONT_MASK_WEIGHT: the font weight is specified. -@PANGO_FONT_MASK_STRETCH: the font stretch is specified. +@PANGO_FONT_MASK_WEIGHT: the font weight is specified. +@PANGO_FONT_MASK_STRETCH: the font stretch is specified. @PANGO_FONT_MASK_SIZE: the font size is specified. @@ -395,13 +395,13 @@ The GObject type for #PangoFontMask. @approximate_char_width: @approximate_digit_width: - The GObject type for #PangoFontMetrics. + @@ -455,7 +455,6 @@ The GObject type for #PangoFontMetrics. @Returns: - The #PangoFont structure is used to represent @@ -481,12 +480,13 @@ The GObject type for #PangoFont. + Casts a #GObject to a #PangoFont. -@object: a #GObject. +@object: a #GObject. @@ -548,7 +548,6 @@ Returns %TRUE if @object is a #PangoFont. @Returns: - @@ -576,7 +575,7 @@ Casts a #GObject to a #PangoFontFamily. Returns %TRUE if @object is a #PangoFontFamily. -@object: a #GObject. +@object: a #GObject. @@ -617,7 +616,7 @@ The GObject type for #PangoFontFace. Casts a #GObject to a #PangoFontFace. -@object: a #GObject. +@object: a #GObject. @@ -625,7 +624,7 @@ Casts a #GObject to a #PangoFontFace. Returns %TRUE if @object is a #PangoFontFace. -@object: a #GObject. +@object: a #GObject. @@ -663,7 +662,6 @@ The #PangoFont structure contains one member which the implementation fills in: @parent_instance: - The GObject type for #PangoFontMap. @@ -676,7 +674,7 @@ The GObject type for #PangoFontMap. Casts a #GObject to a #PangoFontMap. -@object: a #GObject. +@object: a #GObject. @@ -684,7 +682,7 @@ Casts a #GObject to a #PangoFontMap. Returns %TRUE if @object is a #PangoFontMap. -@object: a #GObject. +@object: a #GObject. @@ -698,14 +696,14 @@ a particular #PangoFontMap implementation. pango_font_map_load_font() @list_families: A function to list available font families. See pango_font_map_list_families(). - +@load_fontset: Casts a #GObject to a #PangoFontMapClass. -@klass: a #GObject. +@klass: a #GObject. @@ -723,12 +721,14 @@ Returns the type of a #PangoFontMap. @obj: a #PangoFontMap. + @fontmap: +@context: @desc: @Returns: @@ -743,4 +743,3 @@ Returns the type of a #PangoFontMap. @n_families: - diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml index ff855f71..6fdd5da6 100644 --- a/docs/tmpl/freetype-fonts.sgml +++ b/docs/tmpl/freetype-fonts.sgml @@ -27,20 +27,11 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map(). +@dpi_x: +@dpi_y: @Returns: - - - - - - - -@fontmap: -@open_args: -@face_indices: -@n_fonts: -@size: -@Returns: + +@dpi: @@ -77,48 +68,6 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map(). @y: - - -The #PangoFT2SubFont type is an integer ID that identifies one -particular FreeType font within the fonts referenced in a #PangoFont. - - - - - -Makes a glyph index from a #PangoFT2SubFont index and a index -of a character with the corresponding FreeType font. - - -@subfont: a #PangoFT2Subfont index. -@index: the index of a character within an FreeType font. - - - - -Extracts the subfont index from a glyph index. - - -@glyph: a #PangoGlyphIndex. - - - -Extracts the character index within the FreeType font from a -glyph index. - - -@glyph: a #PangoGlyphIndex. - - - - - - - -@font: -@Returns: - - @@ -139,69 +88,6 @@ glyph index. @Returns: - - - - - -@font: -@language: -@Returns: - - - - - - - -@font: -@subfont_index: -@Returns: - - - - - - - - - - - - - -@library: -@Returns: - - - - - - - -@cache: - - - - - - - -@cache: -@args: -@face_index: -@Returns: - - - - - - - -@cache: -@face: - - @@ -217,32 +103,3 @@ glyph index. - - - - - -@font_map: -@Returns: - - - - - - - -@font: -@subfont_id: -@open_args: -@face_index: - - - - - - - -@indent: -@fontmap: - - diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml index 41bae50c..b1ff736c 100644 --- a/docs/tmpl/layout.sgml +++ b/docs/tmpl/layout.sgml @@ -206,7 +206,6 @@ describes how to wrap the lines of a #PangoLayout to the desired width. @PANGO_WRAP_WORD: wrap lines at word boundaries. @PANGO_WRAP_CHAR: wrap lines at character boundaries. - The GObject type for #PangoWrapMode. diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml index 9db09c07..f6d30ab6 100644 --- a/docs/tmpl/main.sgml +++ b/docs/tmpl/main.sgml @@ -206,15 +206,6 @@ The GObject type for #PangoDirection. @Returns: - - - - - -@context: -@font_map: - - diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml index a6fd1b8b..fb7c29b8 100644 --- a/docs/tmpl/tab-stops.sgml +++ b/docs/tmpl/tab-stops.sgml @@ -33,8 +33,7 @@ The GObject type for #PangoTabArray. A #PangoTabAlign specifies where a tab stop appears relative to the text. -@PANGO_TAB_LEFT: the tab stop appears to the left of the text. - +@PANGO_TAB_LEFT: the tab stop appears to the left of the text. diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml index 3e1f4855..d05e9f46 100644 --- a/docs/tmpl/text-attributes.sgml +++ b/docs/tmpl/text-attributes.sgml @@ -28,21 +28,21 @@ attribute is listed in parentheses after the description. @PANGO_ATTR_INVALID: -@PANGO_ATTR_LANGUAGE: language (#PangoAttrLanguage) +@PANGO_ATTR_LANGUAGE: language (#PangoAttrLanguage) @PANGO_ATTR_FAMILY: font family name list (#PangoAttrString) @PANGO_ATTR_STYLE: font slant style (#PangoAttrInt) @PANGO_ATTR_WEIGHT: font weight (#PangoAttrInt) @PANGO_ATTR_VARIANT: font variant (normal or small caps) (#PangoAttrInt) @PANGO_ATTR_STRETCH: font stretch (#PangoAttrInt) @PANGO_ATTR_SIZE: font size in 1000th's of a point (#PangoAttrInt) -@PANGO_ATTR_FONT_DESC: font description (#PangoAttrFontDesc) +@PANGO_ATTR_FONT_DESC: font description (#PangoAttrFontDesc) @PANGO_ATTR_FOREGROUND: foreground color (#PangoAttrColor) @PANGO_ATTR_BACKGROUND: background color (#PangoAttrColor) @PANGO_ATTR_UNDERLINE: whether the text has an underline (#PangoAttrInt) @PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt) @PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt) @PANGO_ATTR_SHAPE: shape (#PangoAttrShape) -@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale) +@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale) @@ -139,7 +139,7 @@ impose shape restrictions. @attr: the common portion of the attribute -@ink_rect: the ink rectangle to restrict to +@ink_rect: the ink rectangle to restrict to @logical_rect: the logical rectangle to restrict to @@ -488,6 +488,7 @@ Returns a RFC-3066 format string representing the given language tag. @language: a language tag. @Returns: a string representing the language tag. + diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml index aee519a7..76f40355 100644 --- a/docs/tmpl/xft-fonts.sgml +++ b/docs/tmpl/xft-fonts.sgml @@ -22,22 +22,6 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map(). - - - - - -@parent_instance: -@xft_font: -@mini_font: -@fontmap: -@description: -@ot_info: -@mini_width: -@mini_height: -@mini_pad: -@in_cache: - diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 93f1b18b..e7616abb 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -169,7 +169,8 @@ pango_ft2_font_get_face (PangoFont *font) /** * pango_ft2_get_context: - * @dpi: the dpi of the target device + * @dpi_x: the horizontal dpi of the target device + * @dpi_y: the vertical dpi of the target device * * Retrieves a #PangoContext appropriate for rendering with the PangoFT2 * backend. @@ -177,7 +178,7 @@ pango_ft2_font_get_face (PangoFont *font) * Return value: the new #PangoContext **/ PangoContext * -pango_ft2_get_context (double dpi) +pango_ft2_get_context (double dpi_x, double dpi_y) { PangoContext *result; static gboolean registered_modules = FALSE; @@ -191,7 +192,7 @@ pango_ft2_get_context (double dpi) pango_module_register (&_pango_included_ft2_modules[i]); } - MiniXftSetDPI (dpi); + MiniXftSetDPI (dpi_y); result = pango_context_new (); pango_context_set_font_map (result, pango_ft2_font_map_for_display ()); diff --git a/pango/pangoft2.h b/pango/pangoft2.h index c792d797..dc467b74 100644 --- a/pango/pangoft2.h +++ b/pango/pangoft2.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2" /* Calls for applications */ -PangoContext *pango_ft2_get_context (double dpi); +PangoContext *pango_ft2_get_context (double dpi_x, double dpi_y); void pango_ft2_render (FT_Bitmap *bitmap, PangoFont *font, -- cgit v1.2.1