[pangomm/pangomm-2-42] Regenerate .defs and docs.xml files



commit 185506d35b476be6341c093275bfb26b31e94014
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Nov 5 16:29:43 2018 +0100

    Regenerate .defs and docs.xml files

 pango/src/pango_docs.xml     |  90 +++++++++-
 pango/src/pango_enums.defs   |  32 +---
 pango/src/pango_methods.defs | 419 ++++++++++++++-----------------------------
 3 files changed, 226 insertions(+), 315 deletions(-)
---
diff --git a/pango/src/pango_docs.xml b/pango/src/pango_docs.xml
index d50b838..614d97e 100644
--- a/pango/src/pango_docs.xml
+++ b/pango/src/pango_docs.xml
@@ -377,6 +377,10 @@ The bits in a #PangoFontMask correspond to fields in a
 <parameter_description> the font gravity is specified (Since: 1.16.)
 </parameter_description>
 </parameter>
+<parameter name="PANGO_FONT_MASK_VARIATIONS">
+<parameter_description> OpenType font variations are specified (Since: 1.42)
+</parameter_description>
+</parameter>
 </parameters>
 </enum>
 
@@ -4343,7 +4347,7 @@ Since: 1.38
 </parameter_description>
 </parameter>
 <parameter name="fcconfig">
-<parameter_description> (nullable) a #FcConfig, or %NULL
+<parameter_description> a #FcConfig, or %NULL
 </parameter_description>
 </parameter>
 </parameters>
@@ -4921,6 +4925,28 @@ the field was explicitly set or not.
 </return>
 </function>
 
+<function name="pango_font_description_get_variations">
+<description>
+Gets the variations field of a font description. See
+pango_font_description_set_variations().
+
+Since: 1.42
+
+</description>
+<parameters>
+<parameter name="desc">
+<parameter_description> a #PangoFontDescription
+</parameter_description>
+</parameter>
+</parameters>
+<return> the varitions field for the font
+description, or %NULL if not previously set.  This
+has the same life-time as the font description itself
+and should not be freed.
+
+</return>
+</function>
+
 <function name="pango_font_description_get_weight">
 <description>
 Gets the weight field of a font description. See
@@ -5210,6 +5236,61 @@ can either be %PANGO_VARIANT_NORMAL or %PANGO_VARIANT_SMALL_CAPS.
 <return></return>
 </function>
 
+<function name="pango_font_description_set_variations">
+<description>
+Sets the variations field of a font description. OpenType
+font variations allow to select a font instance by specifying
+values for a number of axes, such as width or weight.
+
+The format of the variations string is AXIS1=VALUE,AXIS2=VALUE...,
+with each AXIS a 4 character tag that identifies a font axis,
+and each VALUE a floating point number. Unknown axes are ignored,
+and values are clamped to their allowed range.
+
+Pango does not currently have a way to find supported axes of
+a font. Both harfbuzz or freetype have API for this.
+
+Since: 1.42
+
+</description>
+<parameters>
+<parameter name="desc">
+<parameter_description> a #PangoFontDescription.
+</parameter_description>
+</parameter>
+<parameter name="variations">
+<parameter_description> a string representing the variations
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="pango_font_description_set_variations_static">
+<description>
+Like pango_font_description_set_variations(), except that no
+copy of @variations is made. The caller must make sure that the
+string passed in stays around until @desc has been freed
+or the name is set again. This function can be used if
+@variations is a static string such as a C string literal, or
+if @desc is only needed temporarily.
+
+Since: 1.42
+
+</description>
+<parameters>
+<parameter name="desc">
+<parameter_description> a #PangoFontDescription
+</parameter_description>
+</parameter>
+<parameter name="variations">
+<parameter_description> a string representing the variations
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 <function name="pango_font_description_set_weight">
 <description>
 Sets the weight field of a font description. The weight field
@@ -6193,7 +6274,8 @@ Deprecated: 1.22: Use pango_font_map_create_context() instead.
 </parameter_description>
 </parameter>
 </parameters>
-<return> the newly created context; free with g_object_unref().
+<return> the newly created context; free with
+g_object_unref().
 
 </return>
 </function>
@@ -13264,7 +13346,7 @@ Render a #PangoLayoutLine onto an X drawable
 </description>
 <parameters>
 <parameter name="hdc">
-<parameter_description>       HDC to use for uncolored drawing
+<parameter_description>       HDC to use for drawing
 </parameter_description>
 </parameter>
 <parameter name="layout">
@@ -13292,7 +13374,7 @@ and TA_LEFT.
 </description>
 <parameters>
 <parameter name="hdc">
-<parameter_description>       DC to use for uncolored drawing
+<parameter_description>       DC to use for drawing
 </parameter_description>
 </parameter>
 <parameter name="line">
diff --git a/pango/src/pango_enums.defs b/pango/src/pango_enums.defs
index 0836097..61b9654 100644
--- a/pango/src/pango_enums.defs
+++ b/pango/src/pango_enums.defs
@@ -293,7 +293,8 @@
 ;;   PANGO_FONT_MASK_WEIGHT  = 1 << 3,
 ;;   PANGO_FONT_MASK_STRETCH = 1 << 4,
 ;;   PANGO_FONT_MASK_SIZE    = 1 << 5,
-;;   PANGO_FONT_MASK_GRAVITY = 1 << 6
+;;   PANGO_FONT_MASK_GRAVITY = 1 << 6,
+;;   PANGO_FONT_MASK_VARIATIONS = 1 << 7,
 ;; } PangoFontMask;
 
 (define-flags-extended FontMask
@@ -307,6 +308,7 @@
     '("stretch" "PANGO_FONT_MASK_STRETCH" "1 << 4")
     '("size" "PANGO_FONT_MASK_SIZE" "1 << 5")
     '("gravity" "PANGO_FONT_MASK_GRAVITY" "1 << 6")
+    '("variations" "PANGO_FONT_MASK_VARIATIONS" "1 << 7")
   )
 )
 
@@ -734,31 +736,3 @@
   )
 )
 
-;; From pangowin32-private.h
-
-;; Original typedef:
-;; typedef enum
-;;   {
-;;     PANGO_WIN32_COVERAGE_UNSPEC,
-;;     PANGO_WIN32_COVERAGE_ZH_TW,
-;;     PANGO_WIN32_COVERAGE_ZH_CN,
-;;     PANGO_WIN32_COVERAGE_JA,
-;;     PANGO_WIN32_COVERAGE_KO,
-;;     PANGO_WIN32_COVERAGE_VI,
-;;     PANGO_WIN32_N_COVERAGES
-;;   } PangoWin32CoverageLanguageClass;
-
-(define-enum-extended Win32CoverageLanguageClass
-  (in-module "Pango")
-  (c-name "PangoWin32CoverageLanguageClass")
-  (values
-    '("coverage-unspec" "PANGO_WIN32_COVERAGE_UNSPEC" "0")
-    '("coverage-zh-tw" "PANGO_WIN32_COVERAGE_ZH_TW" "1")
-    '("coverage-zh-cn" "PANGO_WIN32_COVERAGE_ZH_CN" "2")
-    '("coverage-ja" "PANGO_WIN32_COVERAGE_JA" "3")
-    '("coverage-ko" "PANGO_WIN32_COVERAGE_KO" "4")
-    '("coverage-vi" "PANGO_WIN32_COVERAGE_VI" "5")
-    '("n-coverages" "PANGO_WIN32_N_COVERAGES" "6")
-  )
-)
-
diff --git a/pango/src/pango_methods.defs b/pango/src/pango_methods.defs
index 1cdd6b7..61d3d27 100644
--- a/pango/src/pango_methods.defs
+++ b/pango/src/pango_methods.defs
@@ -1,17 +1,5 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object CairoFont
-  (in-module "Pango")
-  (c-name "PangoCairoFont")
-  (gtype-id "PANGO_TYPE_CAIRO_FONT")
-)
-
-(define-object CairoFontMap
-  (in-module "Pango")
-  (c-name "PangoCairoFontMap")
-  (gtype-id "PANGO_TYPE_CAIRO_FONT_MAP")
-)
-
 (define-object Engine
   (in-module "Pango")
   (parent "GObject")
@@ -89,13 +77,6 @@
   (gtype-id "PANGO_TYPE_FC_FONT_MAP")
 )
 
-(define-object CoreTextFontMap
-  (in-module "Pango")
-  (parent "PangoFontMap")
-  (c-name "PangoCoreTextFontMap")
-  (gtype-id "PANGO_TYPE_CORE_TEXT_FONT_MAP")
-)
-
 (define-object Fontset
   (in-module "Pango")
   (parent "GObject")
@@ -103,20 +84,6 @@
   (gtype-id "PANGO_TYPE_FONTSET")
 )
 
-(define-object OTInfo
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoOTInfo")
-  (gtype-id "PANGO_TYPE_OT_INFO")
-)
-
-(define-object OTRuleset
-  (in-module "Pango")
-  (parent "GObject")
-  (c-name "PangoOTRuleset")
-  (gtype-id "PANGO_TYPE_OT_RULESET")
-)
-
 (define-object Renderer
   (in-module "Pango")
   (parent "GObject")
@@ -124,20 +91,6 @@
   (gtype-id "PANGO_TYPE_RENDERER")
 )
 
-(define-object Win32Font
-  (in-module "Pango")
-  (parent "PangoFont")
-  (c-name "PangoWin32Font")
-  (gtype-id "PANGO_TYPE_WIN32_FONT")
-)
-
-(define-object Win32FontMap
-  (in-module "Pango")
-  (parent "PangoFontMap")
-  (c-name "PangoWin32FontMap")
-  (gtype-id "PANGO_TYPE_WIN32_FONT_MAP")
-)
-
 (define-object XftRenderer
   (in-module "Pango")
   (parent "PangoRenderer")
@@ -318,6 +271,7 @@
     '("stretch" "PANGO_FONT_MASK_STRETCH")
     '("size" "PANGO_FONT_MASK_SIZE")
     '("gravity" "PANGO_FONT_MASK_GRAVITY")
+    '("variations" "PANGO_FONT_MASK_VARIATIONS")
   )
 )
 
@@ -537,10 +491,6 @@
 )
 
 
-;; From module-defs.h
-
-
-
 ;; From pango-attributes.h
 
 (define-function pango_color_get_type
@@ -1130,20 +1080,10 @@
 
 ;; From pangocairo-coretextfont.h
 
-(define-function pango_cairo_core_text_font_get_type
-  (c-name "pango_cairo_core_text_font_get_type")
-  (return-type "GType")
-)
-
 
 
 ;; From pangocairo-coretext.h
 
-(define-function pango_cairo_core_text_font_map_get_type
-  (c-name "pango_cairo_core_text_font_map_get_type")
-  (return-type "GType")
-)
-
 
 
 ;; From pangocairo-fc.h
@@ -1405,15 +1345,6 @@
 
 
 
-;; From pangocairo-private.h
-
-(define-function pango_cairo_renderer_get_type
-  (c-name "pango_cairo_renderer_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From pangocairo-win32.h
 
 (define-function pango_cairo_win32_font_map_get_type
@@ -1646,57 +1577,6 @@
 
 
 
-;; From pangocoretext-private.h
-
-(define-function pango_core_text_font_map_get_type
-  (c-name "pango_core_text_font_map_get_type")
-  (return-type "GType")
-)
-
-(define-method get_absolute_size
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_absolute_size")
-  (return-type "int")
-)
-
-(define-method get_resolution
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_resolution")
-  (return-type "double")
-)
-
-(define-method get_synthetic_italic
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_synthetic_italic")
-  (return-type "gboolean")
-)
-
-(define-method get_context_key
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_context_key")
-  (return-type "gpointer")
-)
-
-(define-method get_matrix
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_matrix")
-  (return-type "const-PangoMatrix*")
-)
-
-(define-method get_gravity
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_gravity")
-  (return-type "PangoGravity")
-)
-
-(define-method get_ctfontdescriptor
-  (of-object "PangoCoreTextFontKey")
-  (c-name "pango_core_text_font_key_get_ctfontdescriptor")
-  (return-type "CTFontDescriptorRef")
-)
-
-
-
 ;; From pango-coverage.h
 
 (define-function pango_coverage_new
@@ -1772,6 +1652,10 @@
 
 
 
+;; From pango-emoji-table.h
+
+
+
 ;; From pango-engine.h
 
 (define-function pango_engine_get_type
@@ -1821,104 +1705,6 @@
 
 
 
-;; From pango-engine-private.h
-
-
-
-;; From pango-enum-types.h
-
-(define-function pango_attr_type_get_type
-  (c-name "pango_attr_type_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_underline_get_type
-  (c-name "pango_underline_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_bidi_type_get_type
-  (c-name "pango_bidi_type_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_direction_get_type
-  (c-name "pango_direction_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_coverage_level_get_type
-  (c-name "pango_coverage_level_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_style_get_type
-  (c-name "pango_style_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_variant_get_type
-  (c-name "pango_variant_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_weight_get_type
-  (c-name "pango_weight_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_stretch_get_type
-  (c-name "pango_stretch_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_font_mask_get_type
-  (c-name "pango_font_mask_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_gravity_get_type
-  (c-name "pango_gravity_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_gravity_hint_get_type
-  (c-name "pango_gravity_hint_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_alignment_get_type
-  (c-name "pango_alignment_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_wrap_mode_get_type
-  (c-name "pango_wrap_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_ellipsize_mode_get_type
-  (c-name "pango_ellipsize_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_render_part_get_type
-  (c-name "pango_render_part_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_script_get_type
-  (c-name "pango_script_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_tab_align_get_type
-  (c-name "pango_tab_align_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From pangofc-decoder.h
 
 (define-function pango_fc_decoder_get_type
@@ -2060,6 +1846,12 @@
   (return-type "gpointer")
 )
 
+(define-method get_variations
+  (of-object "PangoFcFontKey")
+  (c-name "pango_fc_font_key_get_variations")
+  (return-type "const-char*")
+)
+
 (define-method create_context
   (of-object "PangoFcFontMap")
   (c-name "pango_fc_font_map_create_context")
@@ -2135,35 +1927,6 @@
 
 
 
-;; From pangofc-private.h
-
-(define-method get_raw_extents
-  (of-object "PangoFcFont")
-  (c-name "pango_fc_font_get_raw_extents")
-  (return-type "none")
-  (parameters
-    '("FT_Int32" "load_flags")
-    '("PangoGlyph" "glyph")
-    '("PangoRectangle*" "ink_rect")
-    '("PangoRectangle*" "logical_rect")
-  )
-)
-
-(define-method create_base_metrics_for_context
-  (of-object "PangoFcFont")
-  (c-name "pango_fc_font_create_base_metrics_for_context")
-  (return-type "PangoFontMetrics*")
-  (parameters
-    '("PangoContext*" "context")
-  )
-)
-
-
-
-;; From pango-features.h
-
-
-
 ;; From pango-font.h
 
 (define-function pango_font_description_get_type
@@ -2348,6 +2111,30 @@
   (return-type "PangoGravity")
 )
 
+(define-method set_variations_static
+  (of-object "PangoFontDescription")
+  (c-name "pango_font_description_set_variations_static")
+  (return-type "none")
+  (parameters
+    '("const-char*" "settings")
+  )
+)
+
+(define-method set_variations
+  (of-object "PangoFontDescription")
+  (c-name "pango_font_description_set_variations")
+  (return-type "none")
+  (parameters
+    '("const-char*" "settings")
+  )
+)
+
+(define-method get_variations
+  (of-object "PangoFontDescription")
+  (c-name "pango_font_description_get_variations")
+  (return-type "const-char*")
+)
+
 (define-method get_set_fields
   (of-object "PangoFontDescription")
   (c-name "pango_font_description_get_set_fields")
@@ -2906,20 +2693,6 @@
 
 
 
-;; From pangoft2-private.h
-
-(define-function pango_ft2_font_get_type
-  (c-name "pango_ft2_font_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_ft2_renderer_get_type
-  (c-name "pango_ft2_renderer_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From pango-glyph.h
 
 (define-function pango_glyph_string_new
@@ -4002,10 +3775,6 @@
 
 
 
-;; From pango-layout-private.h
-
-
-
 ;; From pango-matrix.h
 
 (define-function pango_matrix_get_type
@@ -4474,10 +4243,6 @@
 
 
 
-;; From pango-ot-private.h
-
-
-
 ;; From pango-renderer.h
 
 (define-function pango_renderer_get_type
@@ -4726,10 +4491,6 @@
 
 
 
-;; From pango-script-private.h
-
-
-
 ;; From pango-tabs.h
 
 (define-function pango_tab_array_new
@@ -5054,6 +4815,10 @@
 
 
 
+;; From pango-version-macros.h
+
+
+
 ;; From pangowin32.h
 
 (define-function pango_win32_get_context
@@ -5252,10 +5017,6 @@
 
 
 
-;; From pangowin32-private.h
-
-
-
 ;; From pangoxft.h
 
 (define-function pango_xft_get_font_map
@@ -5377,10 +5138,6 @@
 
 
 
-;; From pangoxft-private.h
-
-
-
 ;; From pangoxft-render.h
 
 (define-function pango_xft_renderer_get_type
@@ -5482,3 +5239,101 @@
 )
 
 
+
+;; From pango-enum-types.h
+
+(define-function pango_attr_type_get_type
+  (c-name "pango_attr_type_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_underline_get_type
+  (c-name "pango_underline_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_bidi_type_get_type
+  (c-name "pango_bidi_type_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_direction_get_type
+  (c-name "pango_direction_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_coverage_level_get_type
+  (c-name "pango_coverage_level_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_style_get_type
+  (c-name "pango_style_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_variant_get_type
+  (c-name "pango_variant_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_weight_get_type
+  (c-name "pango_weight_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_stretch_get_type
+  (c-name "pango_stretch_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_font_mask_get_type
+  (c-name "pango_font_mask_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_gravity_get_type
+  (c-name "pango_gravity_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_gravity_hint_get_type
+  (c-name "pango_gravity_hint_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_alignment_get_type
+  (c-name "pango_alignment_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_wrap_mode_get_type
+  (c-name "pango_wrap_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_ellipsize_mode_get_type
+  (c-name "pango_ellipsize_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_render_part_get_type
+  (c-name "pango_render_part_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_script_get_type
+  (c-name "pango_script_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_tab_align_get_type
+  (c-name "pango_tab_align_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From pango-features.h
+
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]