Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Commit 0f1a3e0

Browse files
TherzokTherzok
committed
Merge pull request #142 from nacho/wip/pango-1-36-8
Update pango API to version 1.36.8
2 parents 632a4ba + 876bb56 commit 0f1a3e0

File tree

4 files changed

+137
-54
lines changed

4 files changed

+137
-54
lines changed

‎pango/Pango.metadata

+4-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@
4949
<attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ScanWord']" name="hidden">1</attr>
5050
<attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='SkipSpace']/*/*[@name='pos']" name="pass_as">ref</attr>
5151
<attr path="/api/namespace/class[@name='Version']" name="hidden">1</attr>
52-
<attr path="/api/namespace/object[@cname='PangoCairoFont']" name="hidden">1</attr>
53-
<attr path="/api/namespace/object[@cname='PangoCairoFontMap']" name="hidden">1</attr>
52+
<attr path="/api/namespace/interface[@cname='PangoCairoFont']" name="hidden">1</attr>
53+
<attr path="/api/namespace/interface[@cname='PangoCairoFontMap']" name="hidden">1</attr>
54+
<attr path="/api/namespace/object[@cname='PangoCairoCoreTextFont']" name="hidden">1</attr>
55+
<attr path="/api/namespace/object[@cname='PangoCairoCoreTextFontMap']" name="hidden">1</attr>
5456
<attr path="/api/namespace/object[@cname='PangoContext']/method[@name='ListFamilies']" name="hidden">1</attr>
5557
<attr path="/api/namespace/object[@cname='PangoFont']/method[@name='Describe']/return-type" name="owned">true</attr>
5658
<attr path="/api/namespace/object[@cname='PangoFont']/method[@name='DescriptionsFree']" name="hidden">1</attr>

‎pango/pango-api.raw

+131-50
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,16 @@
186186
<member cname="PANGO_SCRIPT_CARIAN" name="Carian" />
187187
<member cname="PANGO_SCRIPT_LYCIAN" name="Lycian" />
188188
<member cname="PANGO_SCRIPT_LYDIAN" name="Lydian" />
189+
<member cname="PANGO_SCRIPT_BATAK" name="Batak" />
190+
<member cname="PANGO_SCRIPT_BRAHMI" name="Brahmi" />
191+
<member cname="PANGO_SCRIPT_MANDAIC" name="Mandaic" />
192+
<member cname="PANGO_SCRIPT_CHAKMA" name="Chakma" />
193+
<member cname="PANGO_SCRIPT_MEROITIC_CURSIVE" name="MeroiticCursive" />
194+
<member cname="PANGO_SCRIPT_MEROITIC_HIEROGLYPHS" name="MeroiticHieroglyphs" />
195+
<member cname="PANGO_SCRIPT_MIAO" name="Miao" />
196+
<member cname="PANGO_SCRIPT_SHARADA" name="Sharada" />
197+
<member cname="PANGO_SCRIPT_SORA_SOMPENG" name="SoraSompeng" />
198+
<member cname="PANGO_SCRIPT_TAKRI" name="Takri" />
189199
</enum>
190200
<enum name="Stretch" cname="PangoStretch" gtype="pango_stretch_get_type" type="enum">
191201
<member cname="PANGO_STRETCH_ULTRA_CONDENSED" name="UltraCondensed" />
@@ -221,6 +231,7 @@
221231
<member cname="PANGO_WEIGHT_THIN" name="Thin" value="100" />
222232
<member cname="PANGO_WEIGHT_ULTRALIGHT" name="Ultralight" value="200" />
223233
<member cname="PANGO_WEIGHT_LIGHT" name="Light" value="300" />
234+
<member cname="PANGO_WEIGHT_SEMILIGHT" name="Semilight" value="350" />
224235
<member cname="PANGO_WEIGHT_BOOK" name="Book" value="380" />
225236
<member cname="PANGO_WEIGHT_NORMAL" name="Normal" value="400" />
226237
<member cname="PANGO_WEIGHT_MEDIUM" name="Medium" value="500" />
@@ -238,14 +249,14 @@
238249
<callback name="AttrDataCopyFunc" cname="PangoAttrDataCopyFunc">
239250
<return-type type="gpointer" />
240251
<parameters>
241-
<parameter type="gconstpointer" name="data" />
252+
<parameter type="gconstpointer" name="user_data" />
242253
</parameters>
243254
</callback>
244255
<callback name="AttrFilterFunc" cname="PangoAttrFilterFunc">
245256
<return-type type="gboolean" />
246257
<parameters>
247258
<parameter type="PangoAttribute*" name="attribute" />
248-
<parameter type="gpointer" name="data" />
259+
<parameter type="gpointer" name="user_data" />
249260
</parameters>
250261
</callback>
251262
<callback name="CairoShapeRendererFunc" cname="PangoCairoShapeRendererFunc">
@@ -269,21 +280,18 @@
269280
<parameters>
270281
<parameter type="PangoFontset*" name="fontset" />
271282
<parameter type="PangoFont*" name="font" />
272-
<parameter type="gpointer" name="data" />
283+
<parameter type="gpointer" name="user_data" />
273284
</parameters>
274285
</callback>
275-
<object name="CairoFont" cname="PangoCairoFont">
286+
<interface name="CairoFont" cname="PangoCairoFont" consume_only="1">
276287
<method name="GetScaledFont" cname="pango_cairo_font_get_scaled_font">
277288
<return-type type="cairo_scaled_font_t*" />
278289
</method>
279290
<method name="GetType" cname="pango_cairo_font_get_type" shared="true">
280291
<return-type type="GType" />
281292
</method>
282-
</object>
283-
<object name="CairoFontMap" cname="PangoCairoFontMap">
284-
<method name="CreateContext" cname="pango_cairo_font_map_create_context" deprecated="1">
285-
<return-type type="PangoContext*" />
286-
</method>
293+
</interface>
294+
<interface name="CairoFontMap" cname="PangoCairoFontMap" consume_only="1">
287295
<method name="GetDefault" cname="pango_cairo_font_map_get_default" shared="true">
288296
<return-type type="PangoFontMap*" />
289297
</method>
@@ -311,11 +319,38 @@
311319
<parameter type="double" name="dpi" />
312320
</parameters>
313321
</method>
322+
</interface>
323+
<object name="CairoCoreTextFont" cname="PangoCairoCoreTextFont" parent="PangoCoreTextFont">
324+
<class_struct cname="PangoCairoCoreTextFontClass">
325+
<field name="ParentClass" cname="parent_class" type="PangoCoreTextFontClass" />
326+
</class_struct>
327+
<implements>
328+
<interface cname="PangoCairoFont" />
329+
</implements>
330+
<method name="GetType" cname="pango_cairo_core_text_font_get_type" shared="true">
331+
<return-type type="GType" />
332+
</method>
333+
</object>
334+
<object name="CairoCoreTextFontMap" cname="PangoCairoCoreTextFontMap" parent="PangoCoreTextFontMap">
335+
<class_struct cname="PangoCairoCoreTextFontMapClass">
336+
<field name="ParentClass" cname="parent_class" type="PangoCoreTextFontMapClass" />
337+
</class_struct>
338+
<field name="Serial" cname="serial" type="guint" />
339+
<field name="Dpi" cname="dpi" type="gdouble" />
340+
<implements>
341+
<interface cname="PangoCairoFontMap" />
342+
</implements>
343+
<method name="GetType" cname="pango_cairo_core_text_font_map_get_type" shared="true">
344+
<return-type type="GType" />
345+
</method>
314346
</object>
315347
<object name="Context" cname="PangoContext" parent="GObject">
316348
<class_struct cname="PangoContextClass">
317349
<field name="ParentClass" cname="parent_class" type="GObjectClass" />
318350
</class_struct>
351+
<method name="Changed" cname="pango_context_changed">
352+
<return-type type="void" />
353+
</method>
319354
<method name="GetBaseDir" cname="pango_context_get_base_dir">
320355
<return-type type="PangoDirection" />
321356
</method>
@@ -347,6 +382,9 @@
347382
<parameter type="PangoLanguage*" name="language" />
348383
</parameters>
349384
</method>
385+
<method name="GetSerial" cname="pango_context_get_serial">
386+
<return-type type="guint" />
387+
</method>
350388
<method name="GetType" cname="pango_context_get_type" shared="true">
351389
<return-type type="GType" />
352390
</method>
@@ -414,6 +452,30 @@
414452
</parameters>
415453
</method>
416454
</object>
455+
<object name="CoreTextFont" cname="PangoCoreTextFont" parent="PangoFont">
456+
<class_struct cname="PangoCoreTextFontClass">
457+
<field name="ParentClass" cname="parent_class" type="PangoFontClass" />
458+
<method vm="_pango_reserved1" />
459+
<method vm="_pango_reserved2" />
460+
<method vm="_pango_reserved3" />
461+
<method vm="_pango_reserved4" />
462+
</class_struct>
463+
<virtual_method name="PangoReserved1" cname="_pango_reserved1" shared="true" padding="true">
464+
<return-type type="void" />
465+
</virtual_method>
466+
<virtual_method name="PangoReserved2" cname="_pango_reserved2" shared="true" padding="true">
467+
<return-type type="void" />
468+
</virtual_method>
469+
<virtual_method name="PangoReserved3" cname="_pango_reserved3" shared="true" padding="true">
470+
<return-type type="void" />
471+
</virtual_method>
472+
<virtual_method name="PangoReserved4" cname="_pango_reserved4" shared="true" padding="true">
473+
<return-type type="void" />
474+
</virtual_method>
475+
<method name="GetType" cname="pango_core_text_font_get_type" shared="true">
476+
<return-type type="GType" />
477+
</method>
478+
</object>
417479
<object name="Font" cname="PangoFont" parent="GObject">
418480
<method name="Describe" cname="pango_font_describe">
419481
<return-type type="PangoFontDescription*" />
@@ -523,9 +585,15 @@
523585
</method>
524586
</object>
525587
<object name="FontMap" cname="PangoFontMap" parent="GObject">
588+
<method name="Changed" cname="pango_font_map_changed">
589+
<return-type type="void" />
590+
</method>
526591
<method name="CreateContext" cname="pango_font_map_create_context">
527592
<return-type type="PangoContext*" />
528593
</method>
594+
<method name="GetSerial" cname="pango_font_map_get_serial">
595+
<return-type type="guint" />
596+
</method>
529597
<method name="GetType" cname="pango_font_map_get_type" shared="true">
530598
<return-type type="GType" />
531599
</method>
@@ -556,12 +624,6 @@
556624
<class_struct cname="PangoFT2FontMapClass">
557625
<field name="ParentClass" cname="parent_class" type="PangoFcFontMapClass" />
558626
</class_struct>
559-
<method name="CreateContext" cname="pango_ft2_font_map_create_context" deprecated="1">
560-
<return-type type="PangoContext*" />
561-
</method>
562-
<method name="ForDisplay" cname="pango_ft2_font_map_for_display" deprecated="1" shared="true">
563-
<return-type type="PangoFontMap*" />
564-
</method>
565627
<method name="GetType" cname="pango_ft2_font_map_get_type" shared="true">
566628
<return-type type="GType" />
567629
</method>
@@ -607,6 +669,9 @@
607669
<method name="GetBaseline" cname="pango_layout_get_baseline">
608670
<return-type type="int" />
609671
</method>
672+
<method name="GetCharacterCount" cname="pango_layout_get_character_count">
673+
<return-type type="gint" />
674+
</method>
610675
<method name="GetContext" cname="pango_layout_get_context">
611676
<return-type type="PangoContext*" />
612677
</method>
@@ -671,6 +736,12 @@
671736
<parameter type="gint*" name="n_attrs" />
672737
</parameters>
673738
</method>
739+
<method name="GetLogAttrsReadonly" cname="pango_layout_get_log_attrs_readonly">
740+
<return-type type="const-PangoLogAttr*" />
741+
<parameters>
742+
<parameter type="gint*" name="n_attrs" />
743+
</parameters>
744+
</method>
674745
<method name="GetPixelExtents" cname="pango_layout_get_pixel_extents">
675746
<return-type type="void" />
676747
<parameters>
@@ -685,6 +756,9 @@
685756
<parameter type="int*" name="height" />
686757
</parameters>
687758
</method>
759+
<method name="GetSerial" cname="pango_layout_get_serial">
760+
<return-type type="guint" />
761+
</method>
688762
<method name="GetSingleParagraphMode" cname="pango_layout_get_single_paragraph_mode">
689763
<return-type type="gboolean" />
690764
</method>
@@ -1105,7 +1179,6 @@
11051179
<struct name="EllipsizeState" cname="EllipsizeState" opaque="true" />
11061180
<struct name="Extents" cname="Extents" opaque="true" />
11071181
<struct name="FontHashKey" cname="FontHashKey" opaque="true" />
1108-
<struct name="GlyphInfo" cname="GlyphInfo" opaque="true" />
11091182
<struct name="ItemProperties" cname="ItemProperties" opaque="true" />
11101183
<struct name="ItemizeState" cname="ItemizeState" opaque="true" />
11111184
<struct name="LineIter" cname="LineIter" opaque="true" />
@@ -1326,7 +1399,6 @@
13261399
</method>
13271400
</struct>
13281401
<struct name="BlockInfo" cname="PangoBlockInfo" opaque="true" />
1329-
<struct name="CairoATSUIFontMapClass" cname="PangoCairoATSUIFontMapClass" opaque="true" />
13301402
<struct name="CairoContextInfo" cname="PangoCairoContextInfo" opaque="true" />
13311403
<struct name="CairoFcFont" cname="PangoCairoFcFont" opaque="true" />
13321404
<struct name="CairoFcFontClass" cname="PangoCairoFcFontClass" opaque="true" />
@@ -1358,6 +1430,16 @@
13581430
<return-type type="gchar*" />
13591431
</method>
13601432
</boxed>
1433+
<struct name="CoreTextFace" cname="PangoCoreTextFace" opaque="true" />
1434+
<struct name="CoreTextFaceClass" cname="PangoCoreTextFaceClass" opaque="true" />
1435+
<struct name="CoreTextFamily" cname="PangoCoreTextFamily" opaque="true" />
1436+
<struct name="CoreTextFamilyClass" cname="PangoCoreTextFamilyClass" opaque="true" />
1437+
<struct name="CoreTextFontKey" cname="PangoCoreTextFontKey" opaque="true" />
1438+
<struct name="CoreTextFontMap" cname="PangoCoreTextFontMap" opaque="true" />
1439+
<struct name="CoreTextFontMapClass" cname="PangoCoreTextFontMapClass" opaque="true" />
1440+
<struct name="CoreTextFontset" cname="PangoCoreTextFontset" opaque="true" />
1441+
<struct name="CoreTextFontsetClass" cname="PangoCoreTextFontsetClass" opaque="true" />
1442+
<struct name="CoreTextFontsetKey" cname="PangoCoreTextFontsetKey" opaque="true" />
13611443
<struct name="Coverage" cname="PangoCoverage" opaque="true">
13621444
<method name="Copy" cname="pango_coverage_copy">
13631445
<return-type type="PangoCoverage*" owned="true" />
@@ -1407,29 +1489,7 @@
14071489
<struct name="EnginePair" cname="PangoEnginePair" opaque="true" />
14081490
<struct name="EngineShape" cname="PangoEngineShape" opaque="true" />
14091491
<struct name="FT2Family" cname="PangoFT2Family" opaque="true" />
1410-
<struct name="FT2Font" cname="PangoFT2Font" opaque="true">
1411-
<method name="GetCoverage" cname="pango_ft2_font_get_coverage" deprecated="1" shared="true">
1412-
<return-type type="PangoCoverage*" />
1413-
<parameters>
1414-
<parameter type="PangoFont*" name="font" />
1415-
<parameter type="PangoLanguage*" name="language" />
1416-
</parameters>
1417-
</method>
1418-
<method name="GetFace" cname="pango_ft2_font_get_face" deprecated="1" shared="true">
1419-
<return-type type="FT_Face" />
1420-
<parameters>
1421-
<parameter type="PangoFont*" name="font" />
1422-
</parameters>
1423-
</method>
1424-
<method name="GetKerning" cname="pango_ft2_font_get_kerning" deprecated="1" shared="true">
1425-
<return-type type="int" />
1426-
<parameters>
1427-
<parameter type="PangoFont*" name="font" />
1428-
<parameter type="PangoGlyph" name="left" />
1429-
<parameter type="PangoGlyph" name="right" />
1430-
</parameters>
1431-
</method>
1432-
</struct>
1492+
<struct name="FT2Font" cname="PangoFT2Font" opaque="true" />
14331493
<struct name="FT2FontClass" cname="PangoFT2FontClass" opaque="true" />
14341494
<struct name="FT2GlyphInfo" cname="PangoFT2GlyphInfo" opaque="true" />
14351495
<struct name="FT2Renderer" cname="PangoFT2Renderer" opaque="true" />
@@ -2083,7 +2143,6 @@
20832143
<struct name="Module" cname="PangoModule" opaque="true" />
20842144
<struct name="ModuleClass" cname="PangoModuleClass" opaque="true" />
20852145
<struct name="OTInfoClass" cname="PangoOTInfoClass" opaque="true" />
2086-
<struct name="OTRule" cname="PangoOTRule" opaque="true" />
20872146
<struct name="OTRulesetClass" cname="PangoOTRulesetClass" opaque="true" />
20882147
<struct name="Rectangle" cname="PangoRectangle">
20892148
<field name="X" cname="x" type="int" />
@@ -2098,8 +2157,8 @@
20982157
<method name="GetRange" cname="pango_script_iter_get_range">
20992158
<return-type type="void" />
21002159
<parameters>
2101-
<parameter type="const-char**" pass_as="out" name="start" />
2102-
<parameter type="const-char**" pass_as="out" name="end" />
2160+
<parameter type="const-char**" name="start" />
2161+
<parameter type="const-char**" name="end" />
21032162
<parameter type="PangoScript*" name="script" />
21042163
</parameters>
21052164
</method>
@@ -2413,13 +2472,6 @@
24132472
<parameter type="int" name="attrs_len" />
24142473
</parameters>
24152474
</method>
2416-
<method name="GetMirrorChar" cname="pango_get_mirror_char" deprecated="1" shared="true">
2417-
<return-type type="gboolean" />
2418-
<parameters>
2419-
<parameter type="gunichar" name="ch" />
2420-
<parameter type="gunichar*" name="mirrored_ch" />
2421-
</parameters>
2422-
</method>
24232475
<method name="GravityGetForMatrix" cname="pango_gravity_get_for_matrix" shared="true">
24242476
<return-type type="PangoGravity" />
24252477
<parameters>
@@ -2574,6 +2626,17 @@
25742626
<parameter type="PangoScript" name="script" />
25752627
</parameters>
25762628
</method>
2629+
<method name="ShapeFull" cname="pango_shape_full" shared="true">
2630+
<return-type type="void" />
2631+
<parameters>
2632+
<parameter type="const-gchar*" name="item_text" />
2633+
<parameter type="gint" name="item_length" />
2634+
<parameter type="const-gchar*" name="paragraph_text" />
2635+
<parameter type="gint" name="paragraph_length" />
2636+
<parameter type="const-PangoAnalysis*" name="analysis" />
2637+
<parameter type="PangoGlyphString*" name="glyphs" />
2638+
</parameters>
2639+
</method>
25772640
<method name="SkipSpace" cname="pango_skip_space" shared="true">
25782641
<return-type type="gboolean" />
25792642
<parameters>
@@ -2741,6 +2804,24 @@
27412804
</parameters>
27422805
</method>
27432806
</class>
2807+
<class name="Markup" cname="PangoMarkup_">
2808+
<method name="ParserFinish" cname="pango_markup_parser_finish" shared="true">
2809+
<return-type type="gboolean" />
2810+
<parameters>
2811+
<parameter type="GMarkupParseContext*" name="context" />
2812+
<parameter type="PangoAttrList**" name="attr_list" />
2813+
<parameter type="char**" name="text" />
2814+
<parameter type="gunichar*" name="accel_char" />
2815+
<parameter type="GError**" name="error" />
2816+
</parameters>
2817+
</method>
2818+
<method name="ParserNew" cname="pango_markup_parser_new" shared="true">
2819+
<return-type type="GMarkupParseContext*" />
2820+
<parameters>
2821+
<parameter type="gunichar" name="accel_marker" />
2822+
</parameters>
2823+
</method>
2824+
</class>
27442825
<class name="Units" cname="PangoUnits_">
27452826
<method name="FromDouble" cname="pango_units_from_double" shared="true">
27462827
<return-type type="int" />

‎sources/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TARGET_GTK_VERSION=3.0.0
77

88
GTK_DOWNLOADS = \
99
http://ftp.gnome.org/pub/GNOME/sources/glib/2.42/glib-2.42.2.tar.xz \
10-
http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.3.tar.bz2 \
10+
http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz \
1111
http://ftp.gnome.org/pub/GNOME/sources/atk/2.14/atk-2.14.0.tar.xz \
1212
http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz \
1313
http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.0/gtk+-$(TARGET_GTK_VERSION).tar.bz2

‎sources/sources.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<api filename="../pango/pango-api.raw">
102102
<library name="libpango-1.0-0.dll">
103103
<namespace name="Pango">
104-
<directory path="pango-1.28.3/pango">
104+
<directory path="pango-1.36.8/pango">
105105
<exclude>pangoatsui.c</exclude>
106106
<exclude>pangoatsui.h</exclude>
107107
<exclude>pangoatsui-fontmap.h</exclude>

0 commit comments

Comments
 (0)