diff options
author | Theppitak Karoonboonyanan <thep@linux.thai.net> | 2004-10-16 17:10:51 +0000 |
---|---|---|
committer | Theppitak Karoonboonyanan <tkaroonb@src.gnome.org> | 2004-10-16 17:10:51 +0000 |
commit | 2c7859e70f161414803f21d2055f5c37a3f8033f (patch) | |
tree | 015770b34373783f178ba5b08a2d015e7649e8bd /modules/thai/thai-shaper.h | |
parent | 5b8260d5d2851de6cf823647fa52f126941d28b5 (diff) | |
download | pango-merged-HEAD-1.tar.gz |
Merge from HEAD.merged-HEAD-1pango-1-4
2004-10-16 Theppitak Karoonboonyanan <thep@linux.thai.net>
Merge from HEAD.
* modules/thai/thai-ot.[ch] (thai_ot_get_ruleset),
modules/thai/thai-fc.c (thai_get_font_info): Prefer OpenType to PUA
substitutions.
* modules/thai/thai-shaper.c (groups, group1_map, group2_map):
Remove unused data for XTIS.
* modules/thai/thai-shaper.[ch] (enum ThaiFontSet, get_glyphs_list),
modules/thai/thai-fc.c (thai_get_font_info, thai_make_glyph):
Remove THAI_FONT_ISO10646 font set.
* modules/thai/thai-fc.c (tis620_1): Fix the PUA glyph table.
* modules/thai/thai-shaper.h (thai_{get,make}_glyph_{tis,uni}),
modules/thai/thai-shaper.c (get_adjusted_glyphs_list),
modules/thai/thai-fc.c (thai_{get,make}_glyph_{tis,uni}, tis620_2):
Explicitly handle dangling upper/lower marks with dottedcircle and
fails gracefully if the glyph is not available.
* modules/thai/thai-shaper.[ch] (thai_get_glyph_tis,
thai_make_glyph_tis): Use guchar instead of gchar as argument type.
Make *_tis functions wrappers to *_uni functions.
Diffstat (limited to 'modules/thai/thai-shaper.h')
-rw-r--r-- | modules/thai/thai-shaper.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h index 8055ce85..f54814b8 100644 --- a/modules/thai/thai-shaper.h +++ b/modules/thai/thai-shaper.h @@ -13,8 +13,7 @@ typedef enum { THAI_FONT_NONE, THAI_FONT_TIS, THAI_FONT_TIS_MAC, - THAI_FONT_TIS_WIN, - THAI_FONT_ISO10646 + THAI_FONT_TIS_WIN } ThaiFontSet; typedef enum { @@ -35,10 +34,19 @@ ThaiFontInfo * thai_get_font_info (PangoFont *font); PangoGlyph -thai_make_glyph (ThaiFontInfo *font_info, unsigned int c); +thai_get_glyph_tis (ThaiFontInfo *font_info, guchar c); PangoGlyph -thai_make_unknown_glyph (ThaiFontInfo *font_info, unsigned int c); +thai_make_glyph_tis (ThaiFontInfo *font_info, guchar c); + +PangoGlyph +thai_get_glyph_uni (ThaiFontInfo *font_info, gunichar uc); + +PangoGlyph +thai_make_glyph_uni (ThaiFontInfo *font_info, gunichar uc); + +PangoGlyph +thai_make_unknown_glyph (ThaiFontInfo *font_info, gunichar uc); /* * Public functions |