summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
Diffstat (limited to 'pango')
-rw-r--r--pango/makefile.msc4
-rw-r--r--pango/pango.def25
-rw-r--r--pango/pangofc-decoder.c4
-rw-r--r--pango/pangoft2.def10
-rw-r--r--pango/pangowin32.c9
-rw-r--r--pango/testfonts.c2
6 files changed, 38 insertions, 16 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 136c38d4..8f52b053 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -83,6 +83,7 @@ OBJECTS = \
pango-enum-types.obj \
\
break.obj \
+ ellipsize.obj \
fonts.obj \
glyphstring.obj \
mapping.obj \
@@ -124,6 +125,7 @@ fribidi_get_type.obj : mini-fribidi\fribidi_get_type.c
$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_get_type.c
!IFDEF OBJS_pangowin32
+PKG_CFLAGS = $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_win32
OBJECTS = \
module-defs-win32.obj \
pangowin32.obj \
@@ -135,10 +137,12 @@ OBJECTS = \
!IFDEF OBJS_pangoft2
OBJECTS = \
module-defs-fc.obj \
+ pangofc-decoder.obj \
pangofc-font.obj \
pangofc-fontmap.obj \
pangoft2.obj \
pangoft2-fontmap.obj \
+ pangoft2-render.obj \
basic-fc.obj
PKG_CFLAGS = $(PKG_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS)
diff --git a/pango/pango.def b/pango/pango.def
index 759329fb..a6dc9a3d 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -1,8 +1,8 @@
EXPORTS
pango_alignment_get_type
pango_attr_background_new
- pango_attr_family_new
pango_attr_fallback_new
+ pango_attr_family_new
pango_attr_font_desc_new
pango_attr_foreground_new
pango_attr_iterator_copy
@@ -13,6 +13,7 @@ EXPORTS
pango_attr_iterator_next
pango_attr_iterator_range
pango_attr_language_new
+ pango_attr_letter_spacing_new
pango_attr_list_change
pango_attr_list_copy
pango_attr_list_filter
@@ -47,7 +48,9 @@ EXPORTS
pango_config_key_get
pango_context_get_base_dir
pango_context_get_font_description
+ pango_context_get_font_map
pango_context_get_language
+ pango_context_get_matrix
pango_context_get_metrics
pango_context_get_type
pango_context_list_families
@@ -58,6 +61,7 @@ EXPORTS
pango_context_set_font_description
pango_context_set_font_map
pango_context_set_language
+ pango_context_get_metrics
pango_coverage_copy
pango_coverage_from_bytes
pango_coverage_get
@@ -70,6 +74,7 @@ EXPORTS
pango_coverage_unref
pango_default_break
pango_direction_get_type
+ pango_ellipsize_mode_get_type
pango_engine_get_type
pango_engine_lang_get_type
pango_engine_shape_class_init
@@ -130,7 +135,11 @@ EXPORTS
pango_font_metrics_get_approximate_digit_width
pango_font_metrics_get_ascent
pango_font_metrics_get_descent
+ pango_font_metrics_get_strikethrough_position
+ pango_font_metrics_get_strikethrough_thickness
pango_font_metrics_get_type
+ pango_font_metrics_get_underline_position
+ pango_font_metrics_get_underline_thickness
pango_font_metrics_new
pango_font_metrics_ref
pango_font_metrics_unref
@@ -147,6 +156,8 @@ EXPORTS
pango_get_mirror_char
pango_get_sysconf_subdirectory
pango_glyph_item_apply_attrs
+ pango_glyph_item_free
+ pango_glyph_item_letter_space
pango_glyph_item_split
pango_glyph_string_copy
pango_glyph_string_extents
@@ -176,6 +187,7 @@ EXPORTS
pango_layout_get_auto_dir
pango_layout_get_context
pango_layout_get_cursor_pos
+ pango_layout_get_ellipsize
pango_layout_get_extents
pango_layout_get_indent
pango_layout_get_iter
@@ -208,6 +220,7 @@ EXPORTS
pango_layout_iter_get_line_yrange
pango_layout_iter_get_run
pango_layout_iter_get_run_extents
+ pango_layout_iter_get_type
pango_layout_iter_next_char
pango_layout_iter_next_cluster
pango_layout_iter_next_line
@@ -221,9 +234,10 @@ EXPORTS
pango_layout_line_x_to_index
pango_layout_move_cursor_visually
pango_layout_new
- pango_layout_set_auto_dir
pango_layout_set_alignment
pango_layout_set_attributes
+ pango_layout_set_auto_dir
+ pango_layout_set_ellipsize
pango_layout_set_font_description
pango_layout_set_indent
pango_layout_set_justify
@@ -240,6 +254,13 @@ EXPORTS
pango_lookup_aliases
pango_map_get_engine
pango_map_get_engines
+ pango_matrix_concat
+ pango_matrix_copy
+ pango_matrix_free
+ pango_matrix_get_type
+ pango_matrix_rotate
+ pango_matrix_scale
+ pango_matrix_translate
pango_module_register
pango_parse_markup
pango_parse_stretch
diff --git a/pango/pangofc-decoder.c b/pango/pangofc-decoder.c
index 118c17e8..766e09e7 100644
--- a/pango/pangofc-decoder.c
+++ b/pango/pangofc-decoder.c
@@ -29,12 +29,12 @@ pango_fc_decoder_init (PangoFcDecoder *decoder);
static void
pango_fc_decoder_class_init (PangoFcDecoderClass *klass);
-void
+static void
pango_fc_decoder_init (PangoFcDecoder *decoder)
{
}
-void
+static void
pango_fc_decoder_class_init (PangoFcDecoderClass *klass)
{
}
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index 20c5af97..65684c63 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -1,4 +1,6 @@
EXPORTS
+ pango_fc_decoder_get_charset
+ pango_fc_decoder_get_glyph
pango_fc_font_description_from_pattern
pango_fc_font_get_glyph
pango_fc_font_get_type
@@ -6,12 +8,12 @@ EXPORTS
pango_fc_font_has_char
pango_fc_font_kern_glyphs
pango_fc_font_lock_face
+ pango_fc_font_map_add_decoder_find_func
pango_fc_font_map_cache_clear
pango_fc_font_map_create_context
pango_fc_font_map_get_type
pango_fc_font_map_shutdown
pango_fc_font_unlock_face
- pango_ft2_font_get_cache_glyph_data
pango_ft2_font_get_coverage
pango_ft2_font_get_face
pango_ft2_font_get_kerning
@@ -22,13 +24,14 @@ EXPORTS
pango_ft2_font_map_set_default_substitute
pango_ft2_font_map_set_resolution
pango_ft2_font_map_substitute_changed
- pango_ft2_font_set_cache_glyph_data
- pango_ft2_font_set_glyph_cache_destroy
pango_ft2_get_context
pango_ft2_get_unknown_glyph
pango_ft2_render
pango_ft2_render_layout
pango_ft2_render_layout_line
+ pango_ft2_render_layout_line_subpixel
+ pango_ft2_render_layout_subpixel
+ pango_ft2_render_transformed
pango_ft2_shutdown_display
pango_ot_buffer_add_glyph
pango_ot_buffer_clear
@@ -37,7 +40,6 @@ EXPORTS
pango_ot_buffer_new
pango_ot_buffer_output
pango_ot_buffer_set_rtl
- pango_ot_buffer_set_zero_width_marks
pango_ot_info_find_feature
pango_ot_info_find_language
pango_ot_info_find_script
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 9ecadeb0..e3f62a10 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -213,11 +213,6 @@ pango_win32_font_class_init (PangoWin32FontClass *class)
pango_win32_get_dc ();
}
-static void
-pango_win32_font_init (PangoWin32Font *win32font)
-{
-}
-
PangoWin32Font *
pango_win32_font_new (PangoFontMap *fontmap,
const LOGFONT *lfp,
@@ -590,7 +585,7 @@ pango_win32_font_dispose (GObject *object)
if (!win32font->in_cache && win32font->fontmap)
pango_win32_fontmap_cache_add (win32font->fontmap, win32font);
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (pango_win32_font_parent_class)->dispose (object);
}
static void
@@ -609,7 +604,7 @@ pango_win32_font_finalize (GObject *object)
g_object_unref (win32font->fontmap);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (pango_win32_font_parent_class)->finalize (object);
}
static PangoFontDescription *
diff --git a/pango/testfonts.c b/pango/testfonts.c
index e387eee8..133b9181 100644
--- a/pango/testfonts.c
+++ b/pango/testfonts.c
@@ -91,7 +91,7 @@ int main (int argc, char **argv)
/* try to load some fonts often hardcoded */
for (i = 0; i < G_N_ELEMENTS (std_fonts); i++)
{
- PangoFontDescription *desc = pango_font_description_from_string("Sans 12");
+ PangoFontDescription *desc = pango_font_description_from_string(std_fonts[i]);
/* spits warnings if font cannot be loaded */
font = pango_font_map_load_font (fontmap, context, desc);