1 --- pango-1.2.5/modules/indic/indic-ot.h Fri Aug 8 12:05:01 2003
2 +++ pango-1.2.5-new/modules/indic/indic-ot.h Thu Dec 18 14:38:44 2003
7 -#include <freetype/freetype.h>
9 +#include FT_FREETYPE_H
10 #include <pango/pango-glyph.h>
11 #include <pango/pango-types.h>
12 #include "mprefixups.h"
13 --- pango-1.2.5/pango/opentype/ftxopen.h Fri Aug 8 12:05:10 2003
14 +++ pango-1.2.5-new/pango/opentype/ftxopen.h Thu Dec 18 14:38:41 2003
19 -#include <freetype/freetype.h>
20 +#include <ft2build.h>
21 +#include FT_FREETYPE_H
25 --- pango-1.2.5/pango/opentype/pango-ot-info.c Wed Apr 16 16:48:20 2003
26 +++ pango-1.2.5-new/pango/opentype/pango-ot-info.c Thu Dec 18 13:48:40 2003
29 #include "pango-ot-private.h"
30 #include "fterrcompat.h"
32 #include <freetype/internal/ftobjs.h>
33 -#include <freetype/ftmodule.h>
34 +//#include <freetype/config/ftmodule.h>
36 static void pango_ot_info_class_init (GObjectClass *object_class);
37 static void pango_ot_info_finalize (GObject *object);
38 --- pango-1.2.5/pango/opentype/pango-ot-private.h Tue Dec 19 22:41:36 2000
39 +++ pango-1.2.5-new/pango/opentype/pango-ot-private.h Wed Dec 17 20:53:02 2003
41 #ifndef __PANGO_OT_PRIVATE_H__
42 #define __PANGO_OT_PRIVATE_H__
44 -#include <freetype/freetype.h>
45 +#include <ft2build.h>
46 +#include FT_FREETYPE_H
48 #include <glib-object.h>
50 --- pango-1.2.5/pango/pango-enum-types.c Thu Jul 24 14:12:13 2003
51 +++ pango-1.2.5-new/pango/pango-enum-types.c Wed Dec 31 18:00:00 1969
54 -/* Generated data (by glib-mkenums) */
58 -/* enumerations from "pango-attributes.h" */
60 -pango_attr_type_get_type (void)
62 - static GType etype = 0;
64 - static const GEnumValue values[] = {
65 - { PANGO_ATTR_INVALID, "PANGO_ATTR_INVALID", "invalid" },
66 - { PANGO_ATTR_LANGUAGE, "PANGO_ATTR_LANGUAGE", "language" },
67 - { PANGO_ATTR_FAMILY, "PANGO_ATTR_FAMILY", "family" },
68 - { PANGO_ATTR_STYLE, "PANGO_ATTR_STYLE", "style" },
69 - { PANGO_ATTR_WEIGHT, "PANGO_ATTR_WEIGHT", "weight" },
70 - { PANGO_ATTR_VARIANT, "PANGO_ATTR_VARIANT", "variant" },
71 - { PANGO_ATTR_STRETCH, "PANGO_ATTR_STRETCH", "stretch" },
72 - { PANGO_ATTR_SIZE, "PANGO_ATTR_SIZE", "size" },
73 - { PANGO_ATTR_FONT_DESC, "PANGO_ATTR_FONT_DESC", "font-desc" },
74 - { PANGO_ATTR_FOREGROUND, "PANGO_ATTR_FOREGROUND", "foreground" },
75 - { PANGO_ATTR_BACKGROUND, "PANGO_ATTR_BACKGROUND", "background" },
76 - { PANGO_ATTR_UNDERLINE, "PANGO_ATTR_UNDERLINE", "underline" },
77 - { PANGO_ATTR_STRIKETHROUGH, "PANGO_ATTR_STRIKETHROUGH", "strikethrough" },
78 - { PANGO_ATTR_RISE, "PANGO_ATTR_RISE", "rise" },
79 - { PANGO_ATTR_SHAPE, "PANGO_ATTR_SHAPE", "shape" },
80 - { PANGO_ATTR_SCALE, "PANGO_ATTR_SCALE", "scale" },
83 - etype = g_enum_register_static ("PangoAttrType", values);
89 -pango_underline_get_type (void)
91 - static GType etype = 0;
93 - static const GEnumValue values[] = {
94 - { PANGO_UNDERLINE_NONE, "PANGO_UNDERLINE_NONE", "none" },
95 - { PANGO_UNDERLINE_SINGLE, "PANGO_UNDERLINE_SINGLE", "single" },
96 - { PANGO_UNDERLINE_DOUBLE, "PANGO_UNDERLINE_DOUBLE", "double" },
97 - { PANGO_UNDERLINE_LOW, "PANGO_UNDERLINE_LOW", "low" },
100 - etype = g_enum_register_static ("PangoUnderline", values);
106 -/* enumerations from "pango-coverage.h" */
108 -pango_coverage_level_get_type (void)
110 - static GType etype = 0;
112 - static const GEnumValue values[] = {
113 - { PANGO_COVERAGE_NONE, "PANGO_COVERAGE_NONE", "none" },
114 - { PANGO_COVERAGE_FALLBACK, "PANGO_COVERAGE_FALLBACK", "fallback" },
115 - { PANGO_COVERAGE_APPROXIMATE, "PANGO_COVERAGE_APPROXIMATE", "approximate" },
116 - { PANGO_COVERAGE_EXACT, "PANGO_COVERAGE_EXACT", "exact" },
119 - etype = g_enum_register_static ("PangoCoverageLevel", values);
125 -/* enumerations from "pango-font.h" */
127 -pango_style_get_type (void)
129 - static GType etype = 0;
131 - static const GEnumValue values[] = {
132 - { PANGO_STYLE_NORMAL, "PANGO_STYLE_NORMAL", "normal" },
133 - { PANGO_STYLE_OBLIQUE, "PANGO_STYLE_OBLIQUE", "oblique" },
134 - { PANGO_STYLE_ITALIC, "PANGO_STYLE_ITALIC", "italic" },
137 - etype = g_enum_register_static ("PangoStyle", values);
143 -pango_variant_get_type (void)
145 - static GType etype = 0;
147 - static const GEnumValue values[] = {
148 - { PANGO_VARIANT_NORMAL, "PANGO_VARIANT_NORMAL", "normal" },
149 - { PANGO_VARIANT_SMALL_CAPS, "PANGO_VARIANT_SMALL_CAPS", "small-caps" },
152 - etype = g_enum_register_static ("PangoVariant", values);
158 -pango_weight_get_type (void)
160 - static GType etype = 0;
162 - static const GEnumValue values[] = {
163 - { PANGO_WEIGHT_ULTRALIGHT, "PANGO_WEIGHT_ULTRALIGHT", "ultralight" },
164 - { PANGO_WEIGHT_LIGHT, "PANGO_WEIGHT_LIGHT", "light" },
165 - { PANGO_WEIGHT_NORMAL, "PANGO_WEIGHT_NORMAL", "normal" },
166 - { PANGO_WEIGHT_BOLD, "PANGO_WEIGHT_BOLD", "bold" },
167 - { PANGO_WEIGHT_ULTRABOLD, "PANGO_WEIGHT_ULTRABOLD", "ultrabold" },
168 - { PANGO_WEIGHT_HEAVY, "PANGO_WEIGHT_HEAVY", "heavy" },
171 - etype = g_enum_register_static ("PangoWeight", values);
177 -pango_stretch_get_type (void)
179 - static GType etype = 0;
181 - static const GEnumValue values[] = {
182 - { PANGO_STRETCH_ULTRA_CONDENSED, "PANGO_STRETCH_ULTRA_CONDENSED", "ultra-condensed" },
183 - { PANGO_STRETCH_EXTRA_CONDENSED, "PANGO_STRETCH_EXTRA_CONDENSED", "extra-condensed" },
184 - { PANGO_STRETCH_CONDENSED, "PANGO_STRETCH_CONDENSED", "condensed" },
185 - { PANGO_STRETCH_SEMI_CONDENSED, "PANGO_STRETCH_SEMI_CONDENSED", "semi-condensed" },
186 - { PANGO_STRETCH_NORMAL, "PANGO_STRETCH_NORMAL", "normal" },
187 - { PANGO_STRETCH_SEMI_EXPANDED, "PANGO_STRETCH_SEMI_EXPANDED", "semi-expanded" },
188 - { PANGO_STRETCH_EXPANDED, "PANGO_STRETCH_EXPANDED", "expanded" },
189 - { PANGO_STRETCH_EXTRA_EXPANDED, "PANGO_STRETCH_EXTRA_EXPANDED", "extra-expanded" },
190 - { PANGO_STRETCH_ULTRA_EXPANDED, "PANGO_STRETCH_ULTRA_EXPANDED", "ultra-expanded" },
193 - etype = g_enum_register_static ("PangoStretch", values);
199 -pango_font_mask_get_type (void)
201 - static GType etype = 0;
203 - static const GFlagsValue values[] = {
204 - { PANGO_FONT_MASK_FAMILY, "PANGO_FONT_MASK_FAMILY", "family" },
205 - { PANGO_FONT_MASK_STYLE, "PANGO_FONT_MASK_STYLE", "style" },
206 - { PANGO_FONT_MASK_VARIANT, "PANGO_FONT_MASK_VARIANT", "variant" },
207 - { PANGO_FONT_MASK_WEIGHT, "PANGO_FONT_MASK_WEIGHT", "weight" },
208 - { PANGO_FONT_MASK_STRETCH, "PANGO_FONT_MASK_STRETCH", "stretch" },
209 - { PANGO_FONT_MASK_SIZE, "PANGO_FONT_MASK_SIZE", "size" },
212 - etype = g_flags_register_static ("PangoFontMask", values);
218 -/* enumerations from "pango-layout.h" */
220 -pango_alignment_get_type (void)
222 - static GType etype = 0;
224 - static const GEnumValue values[] = {
225 - { PANGO_ALIGN_LEFT, "PANGO_ALIGN_LEFT", "left" },
226 - { PANGO_ALIGN_CENTER, "PANGO_ALIGN_CENTER", "center" },
227 - { PANGO_ALIGN_RIGHT, "PANGO_ALIGN_RIGHT", "right" },
230 - etype = g_enum_register_static ("PangoAlignment", values);
236 -pango_wrap_mode_get_type (void)
238 - static GType etype = 0;
240 - static const GEnumValue values[] = {
241 - { PANGO_WRAP_WORD, "PANGO_WRAP_WORD", "word" },
242 - { PANGO_WRAP_CHAR, "PANGO_WRAP_CHAR", "char" },
243 - { PANGO_WRAP_WORD_CHAR, "PANGO_WRAP_WORD_CHAR", "word-char" },
246 - etype = g_enum_register_static ("PangoWrapMode", values);
252 -/* enumerations from "pango-tabs.h" */
254 -pango_tab_align_get_type (void)
256 - static GType etype = 0;
258 - static const GEnumValue values[] = {
259 - { PANGO_TAB_LEFT, "PANGO_TAB_LEFT", "left" },
262 - etype = g_enum_register_static ("PangoTabAlign", values);
268 -/* enumerations from "pango-types.h" */
270 -pango_direction_get_type (void)
272 - static GType etype = 0;
274 - static const GEnumValue values[] = {
275 - { PANGO_DIRECTION_LTR, "PANGO_DIRECTION_LTR", "ltr" },
276 - { PANGO_DIRECTION_RTL, "PANGO_DIRECTION_RTL", "rtl" },
277 - { PANGO_DIRECTION_TTB_LTR, "PANGO_DIRECTION_TTB_LTR", "ttb-ltr" },
278 - { PANGO_DIRECTION_TTB_RTL, "PANGO_DIRECTION_TTB_RTL", "ttb-rtl" },
281 - etype = g_enum_register_static ("PangoDirection", values);
287 -/* Generated data ends here */
289 --- pango-1.2.5/pango/pango-enum-types.h Thu Jul 24 14:11:58 2003
290 +++ pango-1.2.5-new/pango/pango-enum-types.h Wed Dec 31 18:00:00 1969
293 -/* Generated data (by glib-mkenums) */
295 -#ifndef __PANGO_ENUM_TYPES_H__
296 -#define __PANGO_ENUM_TYPES_H__
298 -#include <glib-object.h>
302 -/* enumerations from "pango-attributes.h" */
304 -GType pango_attr_type_get_type (void);
305 -#define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
307 -GType pango_underline_get_type (void);
308 -#define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
310 -/* enumerations from "pango-coverage.h" */
312 -GType pango_coverage_level_get_type (void);
313 -#define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
315 -/* enumerations from "pango-font.h" */
317 -GType pango_style_get_type (void);
318 -#define PANGO_TYPE_STYLE (pango_style_get_type())
320 -GType pango_variant_get_type (void);
321 -#define PANGO_TYPE_VARIANT (pango_variant_get_type())
323 -GType pango_weight_get_type (void);
324 -#define PANGO_TYPE_WEIGHT (pango_weight_get_type())
326 -GType pango_stretch_get_type (void);
327 -#define PANGO_TYPE_STRETCH (pango_stretch_get_type())
329 -GType pango_font_mask_get_type (void);
330 -#define PANGO_TYPE_FONT_MASK (pango_font_mask_get_type())
332 -/* enumerations from "pango-layout.h" */
334 -GType pango_alignment_get_type (void);
335 -#define PANGO_TYPE_ALIGNMENT (pango_alignment_get_type())
337 -GType pango_wrap_mode_get_type (void);
338 -#define PANGO_TYPE_WRAP_MODE (pango_wrap_mode_get_type())
340 -/* enumerations from "pango-tabs.h" */
342 -GType pango_tab_align_get_type (void);
343 -#define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
345 -/* enumerations from "pango-types.h" */
347 -GType pango_direction_get_type (void);
348 -#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
352 -#endif /* __PANGO_ENUM_TYPES_H__ */
354 -/* Generated data ends here */
356 --- pango-1.2.5/pango/pango-ot.h Mon Jun 3 19:20:47 2002
357 +++ pango-1.2.5-new/pango/pango-ot.h Thu Dec 18 14:37:56 2003
359 #ifndef __PANGO_OT_H__
360 #define __PANGO_OT_H__
362 -#include <freetype/freetype.h>
363 +#include <ft2build.h>
364 +#include FT_FREETYPE_H
365 #include <pango/pango-glyph.h>
368 --- pango-1.2.5/pango/pangoft2.c Fri Aug 8 12:05:05 2003
369 +++ pango-1.2.5-new/pango/pangoft2.c Thu Dec 18 14:34:50 2003
372 #include <glib/gprintf.h>
374 -#include <freetype/freetype.h>
375 +#include <ft2build.h>
376 +#include FT_FREETYPE_H
378 #include "pango-utils.h"
379 #include "pangoft2.h"
380 --- pango-1.2.5/pango/pangoft2.h Wed Jul 3 17:30:36 2002
381 +++ pango-1.2.5-new/pango/pangoft2.h Thu Dec 18 14:36:12 2003
383 #ifndef __PANGOFT2_H__
384 #define __PANGOFT2_H__
386 -#include <freetype/freetype.h>
387 +#include <ft2build.h>
388 +#include FT_FREETYPE_H
390 #include <fontconfig/fontconfig.h>