Patch from Theppitak Karoonboonyanan that factors out common code from

Fri Jul 26 18:48:49 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in modules/thai/Makefile.am
          modules/thai/thai-shaper.[ch]
          modules/thai/thai-xft.c modules/thai/thai-x.c:
        Patch from Theppitak Karoonboonyanan that factors
        out common code from thai-x.c and adds a new
        Xft shaper for Thai. (#78346)

        * pango/pangoxft.h pango/pangoxft-font.c: Add
        pango_xft_font_has_char()
        to optimize for cases where we don't actually need
        to load the font.

        * pango/pangoxft.h: Document pango_xft_font_get_glyph().

        * modules/basic/basic-xft.c (basic_engine_shape): Clean
        up an unused variable warning.

4 files changed, 56 insertions, 729 deletions

diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index be3e63fc..a447ed21 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -99,7 +99,6 @@ basic_engine_shape (PangoFont        *font,
   int n_chars;
   int i;
   const char *p;
-  FT_Face face;
 
   g_return_if_fail (font != NULL);
   g_return_if_fail (text != NULL);
diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c
index be3e63fc..a447ed21 100644
--- a/modules/basic/basic-xft.c
+++ b/modules/basic/basic-xft.c
@@ -99,7 +99,6 @@ basic_engine_shape (PangoFont        *font,
   int n_chars;
   int i;
   const char *p;
-  FT_Face face;
 
   g_return_if_fail (font != NULL);
   g_return_if_fail (text != NULL);
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 261789ce..f26f9b3a 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -1,30 +1,66 @@
 ## Process this file with automake to create Makefile.in.
 
-sources = thai-x.c
+common_sources = thai-shaper.c thai-shaper.h
+thai_x_sources = $(common_sources) thai-x.c 
+thai_xft_sources = $(common_sources) thai-xft.c 
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
 pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
+if HAVE_XFT
+if INCLUDE_THAI_XFT
+XFT_MODULES=
+XFT_INCLUDED=libpango-thai-xft.la
+XFT_PREFIX=-DXFT_MODULE_PREFIX
+else
+XFT_MODULES=pango-thai-xft.la
+XFT_INCLUDED=
+XFT_PREFIX=
+thai_xft_libadd=$(pangoxftlibs)
+endif
+else
+XFT_MODULES=
+XFT_INCLUDED=
+XFT_PREFIX=
+endif
+
 if HAVE_X
 if INCLUDE_THAI_X
-noinst_LTLIBRARIES = libpango-thai-x.la
-moddefine = -DX_MODULE_PREFIX
+X_MODULES=
+X_INCLUDED=libpango-thai-x.la
+X_PREFIX=-DX_MODULE_PREFIX
 else
-moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-module_LTLIBRARIES = pango-thai-x.la
+X_MODULES=pango-thai-x.la
+X_INCLUDED=
+X_PREFIX=
 thai_x_libadd=$(pangoxlibs)
 endif
+else
+X_MODULES=
+X_INCLUDED=
+X_PREFIX=
 endif
 
-INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
+noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
+module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
+moddefine = $(X_PREFIX) $(XFT_PREFIX)
+moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
+
+INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
 pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_thai_x_la_LIBADD = $(thai_x_libadd)
-pango_thai_x_la_SOURCES = $(sources)
+pango_thai_x_la_SOURCES = $(thai_x_sources)
+
+libpango_thai_x_la_SOURCES = $(thai_x_sources)
+
+pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_thai_xft_la_LIBADD = $(thai_xft_libadd)
+pango_thai_xft_la_SOURCES = $(thai_xft_sources)
 
-libpango_thai_x_la_SOURCES = $(sources)
+libpango_thai_xft_la_SOURCES = $(thai_xft_sources)
 
 included-modules: $(noinst_LTLIBRARIES)
 
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index ffff2d36..b07c29b9 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -1,5 +1,5 @@
 /* Pango
- * thai.c:
+ * thai-x.c:
  *
  * Copyright (C) 1999 Red Hat Software
  * Author: Owen Taylor <otaylor@redhat.com>
@@ -30,61 +30,9 @@
 #include <string.h>
 
 #include <glib.h>
-#include <string.h>
-#include "pangox.h"
 #include "pango-engine.h"
+#include "thai-shaper.h"
 
-#define ucs2tis(wc)		(unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
-#define tis2uni(c)		((gunichar)(c) - 0xA0 + 0x0E00)
-
-#define MAX_CLUSTER_CHRS	256
-#define MAX_GLYPHS		256
-
-/* Define TACTIS character classes */
-#define CTRL			0
-#define NON			1
-#define CONS			2
-#define LV			3
-#define FV1			4
-#define FV2			5
-#define FV3			6
-#define BV1			7
-#define BV2			8
-#define BD			9
-#define TONE			10
-#define AD1			11
-#define AD2			12
-#define AD3			13
-#define AV1			14
-#define AV2			15
-#define AV3			16
-
-#define _ND			0
-#define _NC			1
-#define _UC			(1<<1)
-#define _BC			(1<<2)
-#define _SC			(1<<3)
-#define _AV			(1<<4)
-#define _BV			(1<<5)
-#define _TN			(1<<6)
-#define _AD			(1<<7)
-#define _BD			(1<<8)
-#define _AM			(1<<9)
-
-#define NoTailCons		_NC
-#define UpTailCons		_UC
-#define BotTailCons		_BC
-#define SpltTailCons		_SC
-#define Cons			(NoTailCons|UpTailCons|BotTailCons|SpltTailCons)
-#define AboveVowel		_AV
-#define BelowVowel		_BV
-#define Tone			_TN
-#define AboveDiac		_AD
-#define BelowDiac		_BD
-#define SaraAm			_AM
-
-#define char_class(wc)		TAC_char_class[(unsigned int)(wc)]
-#define is_char_type(wc, mask)	(char_type_table[ucs2tis ((wc))] & (mask))
 
 #define SCRIPT_ENGINE_NAME "ThaiScriptEngineX"
 
@@ -103,234 +51,10 @@ static PangoEngineInfo script_engines[] = {
   }
 };
 
-/*
- * X window system script engine portion
- */
-
-typedef struct _ThaiFontInfo ThaiFontInfo;
-
-/* The type of encoding that we will use
- */
-typedef enum {
-  THAI_FONT_NONE,
-  THAI_FONT_XTIS,
-  THAI_FONT_TIS,
-  THAI_FONT_TIS_MAC,
-  THAI_FONT_TIS_WIN,
-  THAI_FONT_ISO10646
-} ThaiFontType;
-
-struct _ThaiFontInfo
-{
-  PangoFont   *font;
-  ThaiFontType type;
-  PangoXSubfont subfont;
-};
-
-/* All combining marks for Thai fall in the range U+0E30-U+0E50,
- * so we confine our data tables to that range, and use
- * default values for characters outside those ranges.
- */
-
-/* Map from code point to group used for rendering with XTIS fonts
- * (0 == base character)
- */
-static const char groups[32] = {
-  0, 1, 0, 0, 1, 1, 1, 1,
-  1, 1, 1, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 2,
-  2, 2, 2, 2, 2, 2, 1, 0
-};
-
-/* Map from code point to index within group 1
- * (0 == no combining mark from group 1)
- */   
-static const char group1_map[32] = {
-  0, 1, 0, 0, 2, 3, 4, 5,
-  6, 7, 8, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* Map from code point to index within group 2
- * (0 == no combining mark from group 2)
- */   
-static const char group2_map[32] = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 1,
-  2, 3, 4, 5, 6, 7, 1, 0
-};
-
-static const gint char_type_table[256] = {
-  /*       0,   1,   2,   3,   4,   5,   6,   7,
-           8,   9,   A,   B,   C,   D,   E,   F  */
-
-  /*00*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*10*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*20*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*30*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*40*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*50*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*60*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*70*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*80*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-  /*90*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-		
-  /*A0*/ _ND, _NC, _NC, _NC, _NC, _NC, _NC, _NC,
-         _NC, _NC, _NC, _NC, _NC, _SC, _BC, _BC,
-  /*B0*/ _SC, _NC, _NC, _NC, _NC, _NC, _NC, _NC,
-         _NC, _NC, _NC, _UC, _NC, _UC, _NC, _UC,
-  /*C0*/ _NC, _NC, _NC, _NC, _ND, _NC, _ND, _NC,
-         _NC, _NC, _NC, _NC, _UC, _NC, _NC, _ND,
-  /*D0*/ _ND, _AV, _ND, _AM, _AV, _AV, _AV, _AV,
-         _BV, _BV, _BD, _ND, _ND, _ND, _ND, _ND,
-  /*E0*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _AD,
-         _TN, _TN, _TN, _TN, _AD, _AD, _AD, _ND,
-  /*F0*/ _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-         _ND, _ND, _ND, _ND, _ND, _ND, _ND, _ND,
-};
-
-static const gint TAC_char_class[256] = {
-  /*	   0,   1,   2,   3,   4,   5,   6,   7,
-           8,   9,   A,   B,   C,   D,   E,   F  */
-
-  /*00*/ CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-         CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-  /*10*/ CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-         CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-  /*20*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON, NON,
-  /*30*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON, NON,
-  /*40*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON, NON,
-  /*50*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON, NON,
-  /*60*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON, NON,
-  /*70*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON,CTRL,
-  /*80*/ CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-         CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-  /*90*/ CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-         CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,CTRL,
-  /*A0*/  NON,CONS,CONS,CONS,CONS,CONS,CONS,CONS,
-         CONS,CONS,CONS,CONS,CONS,CONS,CONS,CONS,
-  /*B0*/ CONS,CONS,CONS,CONS,CONS,CONS,CONS,CONS,
-         CONS,CONS,CONS,CONS,CONS,CONS,CONS,CONS,
-  /*C0*/ CONS,CONS,CONS,CONS, FV3,CONS, FV3,CONS,
-         CONS,CONS,CONS,CONS,CONS,CONS,CONS, NON,
-  /*D0*/  FV1, AV2, FV1, FV1, AV1, AV3, AV2, AV3,
-          BV1, BV2,  BD, NON, NON, NON, NON, NON,
-  /*E0*/   LV,  LV,  LV,  LV,  LV, FV2, NON, AD2,
-         TONE,TONE,TONE,TONE, AD1, AD1, AD3, NON,
-  /*F0*/  NON, NON, NON, NON, NON, NON, NON, NON,
-          NON, NON, NON, NON, NON, NON, NON,CTRL,
-};
-
-static const gchar TAC_compose_and_input_check_type_table[17][17] = {
-      /* Cn */ /* 0,   1,   2,   3,   4,   5,   6,   7,
-                  8,   9,   A,   B,   C,   D,   E,   F       */
-  /* Cn-1 00 */	{ 'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 10 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 20 */      { 'X', 'A', 'A', 'A', 'A', 'S', 'A', 'C',
-                'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C' },
-  /* 30 */      {'X', 'S', 'A', 'S', 'S', 'S', 'S', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 40 */      { 'X', 'S', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 50 */      { 'X', 'A', 'A', 'A', 'A', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 60 */      { 'X', 'A', 'A', 'A', 'S', 'A', 'S', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 70 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
-  /* 80 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* 90 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* A0 */      { 'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* B0 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* C0 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* D0 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
-  /* E0 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'C', 'C', 'R', 'R', 'R', 'R', 'R' },
-  /* F0 */      { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
-                'R', 'R', 'C', 'R', 'R', 'R', 'R', 'R', 'R' },
-                { 'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R',
- 	        'R', 'R', 'C', 'R', 'C', 'R', 'R', 'R', 'R' }
-};
-
-typedef struct {
-  gint ShiftDown_TONE_AD[8];
-  gint ShiftDownLeft_TONE_AD[8];
-  gint ShiftLeft_TONE_AD[8];
-  gint ShiftLeft_AV[7];
-  gint ShiftDown_BV_BD[3];
-  gint TailCutCons[4];
-} ThaiShapeTable;
-
-#define shiftdown_tone_ad(c,tbl)      ((tbl)->ShiftDown_TONE_AD[(c)-0xE7])
-#define shiftdownleft_tone_ad(c,tbl)  ((tbl)->ShiftDownLeft_TONE_AD[(c)-0xE7])
-#define shiftleft_tone_ad(c,tbl)      ((tbl)->ShiftLeft_TONE_AD[(c)-0xE7])
-#define shiftleft_av(c,tbl)           ((tbl)->ShiftLeft_AV[(c)-0xD1])
-#define shiftdown_bv_bd(c,tbl)        ((tbl)->ShiftDown_BV_BD[(c)-0xD8])
-#define tailcutcons(c,tbl)            ((tbl)->TailCutCons[(c)-0xAD])
-
-/* No adjusted vowel/tonemark glyphs (tis620-0)
- */
-static const ThaiShapeTable tis620_0_shape_table = {
-    { 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE },
-    { 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE },
-    { 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE },
-    { 0xD1, 0x00, 0x00, 0xD4, 0xD5, 0xD6, 0xD7 },
-    { 0xD8, 0xD9, 0xDA },
-    { 0xAD, 0x00, 0x00, 0xB0 }
-};
-
-/* Macintosh
- */
-static const ThaiShapeTable Mac_shape_table = {
-  { 0xE7, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0xED, 0xEE },
-  { 0x93, 0x83, 0x84, 0x85, 0x86, 0x87, 0x8F, 0xEE },
-  { 0x93, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x8F, 0xEE },
-  { 0x92, 0x00, 0x00, 0x94, 0x95, 0x96, 0x97 },
-  { 0xD8, 0xD9, 0xDA },
-  { 0xAD, 0x00, 0x00, 0xB0 }
-};
-
-/* Microsoft Window
- */
-static const ThaiShapeTable Win_shape_table = {
-    { 0xE7, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0xED, 0xEE },
-    { 0x9A, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x99, 0xEE },
-    { 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0x99, 0xEE },
-    { 0x98, 0x00, 0x00, 0x81, 0x82, 0x83, 0x84 },
-    { 0xFC, 0xFD, 0xFE },
-    { 0x90, 0x00, 0x00, 0x80 }
-};
-
 /* Returns a structure with information we will use to rendering given the
  * #PangoFont. This is computed once per font and cached for later retrieval.
  */
-static ThaiFontInfo *
+ThaiFontInfo *
 get_font_info (PangoFont *font)
 {
   static const char *charsets[] = {
@@ -373,7 +97,7 @@ get_font_info (PangoFont *font)
 
       font_info = g_new (ThaiFontInfo, 1);
       font_info->font = font;
-      font_info->type = THAI_FONT_NONE;
+      font_info->font_set = THAI_FONT_NONE;
       
       g_object_set_qdata_full (G_OBJECT (font), info_id, font_info, (GDestroyNotify)g_free);
       
@@ -382,14 +106,14 @@ get_font_info (PangoFont *font)
 
       for (i=0; i < n_subfonts; i++)
 	{
-	  ThaiFontType font_type = charset_types[subfont_charsets[i]];
+	  ThaiFontSet font_set = charset_types[subfont_charsets[i]];
 	  
-	  if (font_type != THAI_FONT_ISO10646 ||
+	  if (font_set != THAI_FONT_ISO10646 ||
 	      pango_x_has_glyph (font, PANGO_X_MAKE_GLYPH (subfont_ids[i], 0xe01)))
 	    {
-	      font_info->type = font_type;
+	      font_info->font_set = font_set;
 	      font_info->subfont = subfont_ids[i];
-	      
+
 	      break;
 	    }
 	}
@@ -401,441 +125,10 @@ get_font_info (PangoFont *font)
   return font_info;
 }
 
-static void
-add_glyph (ThaiFontInfo     *font_info, 
-	   PangoGlyphString *glyphs, 
-	   gint              cluster_start, 
-	   PangoGlyph        glyph,
-	   gboolean          combining)
+PangoGlyph
+make_glyph (ThaiFontInfo *font_info, unsigned char c)
 {
-  PangoRectangle ink_rect, logical_rect;
-  gint index = glyphs->num_glyphs;
-
-  pango_glyph_string_set_size (glyphs, index + 1);
-  
-  glyphs->glyphs[index].glyph = glyph;
-  glyphs->glyphs[index].attr.is_cluster_start = combining ? 0 : 1;
-  
-  glyphs->log_clusters[index] = cluster_start;
-
-  pango_font_get_glyph_extents (font_info->font,
-				glyphs->glyphs[index].glyph, &ink_rect, &logical_rect);
-
-  if (combining)
-    {
-      glyphs->glyphs[index].geometry.x_offset =
-	glyphs->glyphs[index - 1].geometry.width;
-      glyphs->glyphs[index].geometry.width =
-	logical_rect.width + glyphs->glyphs[index - 1].geometry.width;
-      glyphs->glyphs[index - 1].geometry.width = 0;
-    }
-  else
-    {
-      if (logical_rect.width > 0)
-        {
-	 glyphs->glyphs[index].geometry.x_offset = 0;
-	 glyphs->glyphs[index].geometry.width = logical_rect.width;
-	}
-      else
-        {
-	 glyphs->glyphs[index].geometry.x_offset = ink_rect.width;
-	 glyphs->glyphs[index].geometry.width = ink_rect.width;
-        }
-    }
-  glyphs->glyphs[index].geometry.y_offset = 0;
-}
-
-static gint
-get_adjusted_glyphs_list (ThaiFontInfo *font_info,
-			  gunichar *cluster,
-			  gint num_chrs,
-			  PangoGlyph *glyph_lists,
-			  const ThaiShapeTable *shaping_table)
-{
-  switch (num_chrs)
-    {
-      case 1:
-        if (is_char_type (cluster[0], BelowVowel|BelowDiac|AboveVowel|AboveDiac|Tone))
-	  {
-	    if (font_info->type == THAI_FONT_TIS)
-	      glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0x20);
-	    else
-	      glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0x7F);
-            glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    return 2;
-          }
-	else
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-            return 1;
-          }
-        break;
-        
-      case 2:
-        if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
-            is_char_type (cluster[1], SaraAm))
-	  {
-            glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-            glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xED);
-            glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xD2);
-            return 3;
-          }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-          	 is_char_type (cluster[1], SaraAm))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-            glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-					shiftleft_tone_ad (0xED, shaping_table));
-            glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xD2);
-            return 3;
-          }
-	else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
-          	 is_char_type (cluster[1], AboveVowel))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    return 2;
-          }
-	else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
-          	 is_char_type (cluster[1], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    	shiftdown_tone_ad (ucs2tis (cluster[1]), shaping_table));
-	    return 2;
-	  }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-          	 is_char_type (cluster[1], AboveVowel))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    	shiftleft_av (ucs2tis (cluster[1]), shaping_table));
-	    return 2;
-          }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-          	 is_char_type (cluster[1], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-			shiftdownleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
-	    return 2;
-	  }
-	else if (is_char_type (cluster[0], NoTailCons|UpTailCons) &&
-          	 is_char_type (cluster[1], BelowVowel|BelowDiac))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    return 2;
-          }
-	else if (is_char_type (cluster[0], BotTailCons) &&
-		 is_char_type (cluster[1], BelowVowel|BelowDiac))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont,
-			shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
-	    return 2;
-	  }
-	else if (is_char_type (cluster[0], SpltTailCons) &&
-          	 is_char_type (cluster[1], BelowVowel|BelowDiac))
-	  {
-	    glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		tailcutcons (ucs2tis (cluster[0]), shaping_table));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    return 2;
-	  }
-	else
-	  {
-	    if (font_info->type == THAI_FONT_TIS)
-	      glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0x20);
-	    else
-	      glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0x7F);
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[2] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    return 3;
-	  }
-        break;
-          
-      case 3:
-        if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
-            is_char_type (cluster[1], Tone) &&
-            is_char_type (cluster[2], SaraAm))
-	  {
-            glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-            glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xED);
-            glyph_lists[2] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-            glyph_lists[3] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xD2);
-            return 4;
-          }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-		 is_char_type (cluster[1], Tone) &&
-		 is_char_type (cluster[2], SaraAm))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-				shiftleft_tone_ad (0xED, shaping_table));
-	    glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		shiftleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[3] = PANGO_X_MAKE_GLYPH (font_info->subfont, 0xD2);
-	    return 4;
-	  }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-		 is_char_type (cluster[1], AboveVowel) &&
-		 is_char_type (cluster[2], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-				shiftleft_av (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		shiftleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
-	    return 3;
-	  }
-	else if (is_char_type (cluster[0], UpTailCons) &&
-		 is_char_type (cluster[1], BelowVowel) &&
-		 is_char_type (cluster[2], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-			shiftdownleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
-	    return 3;
-	  }
-	else if (is_char_type (cluster[0], NoTailCons) &&
-		 is_char_type (cluster[1], BelowVowel) &&
-		 is_char_type (cluster[2], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    glyph_lists[2] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont,
-			shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
-	    return 3;
-	  }
-	else if (is_char_type (cluster[0], SpltTailCons) &&
-		 is_char_type (cluster[1], BelowVowel) &&
-		 is_char_type (cluster[2], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		tailcutcons (ucs2tis (cluster[0]), shaping_table));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
-	    return 3;
-	  }
-	else if (is_char_type (cluster[0], BotTailCons) &&
-		 is_char_type (cluster[1], BelowVowel) &&
-		 is_char_type (cluster[2], AboveDiac|Tone))
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-		    		shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
-	    glyph_lists[2] = PANGO_X_MAKE_GLYPH (font_info->subfont,
-				shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
-	    return 3;
-	  }
-	else
-	  {
-	    glyph_lists[0] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[0]));
-	    glyph_lists[1] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[1]));
-	    glyph_lists[2] =
-		PANGO_X_MAKE_GLYPH (font_info->subfont, ucs2tis (cluster[2]));
-	    return 3;
-	  }
-      break;
-    }
-
-    return 0;
-}
-
-static gint
-get_glyphs_list (ThaiFontInfo	*font_info,
-		 gunichar	*cluster,
-		 gint		num_chrs,
-		 PangoGlyph	*glyph_lists)
-{
-  PangoGlyph glyph;
-  gint xtis_index;
-  gint i;
-
-  switch (font_info->type)
-    {
-      case THAI_FONT_NONE:
-        for (i=0; i < num_chrs; i++)
-	  glyph_lists[i] = pango_x_get_unknown_glyph (font_info->font);
-        return num_chrs;
-
-      case THAI_FONT_XTIS:
-        /* If we are rendering with an XTIS font, we try to find a precomposed
-         * glyph for the cluster.
-         */
-        xtis_index = 0x100 * (cluster[0] - 0xe00 + 0x20) + 0x30;
-        if (cluster[1])
-	    xtis_index +=8 * group1_map[cluster[1] - 0xe30];
-        if (cluster[2])
-	    xtis_index += group2_map[cluster[2] - 0xe30];
-        glyph = PANGO_X_MAKE_GLYPH (font_info->subfont, xtis_index);
-        if (pango_x_has_glyph (font_info->font, glyph)) {
-            glyph_lists[0] = glyph;
-            return 1;
-        }
-        for (i=0; i < num_chrs; i++)
-	  glyph_lists[i] =
-	      PANGO_X_MAKE_GLYPH (font_info->subfont,
-					0x100 * (cluster[i] - 0xe00 + 0x20) + 0x30);
-        return num_chrs;
-      
-      case THAI_FONT_TIS:
-	/* TIS620-0 + Wtt2.0 Extension
-	 */
-        return get_adjusted_glyphs_list (font_info, cluster,
-			num_chrs, glyph_lists, &tis620_0_shape_table);
-        return num_chrs;
-      
-      case THAI_FONT_TIS_MAC:
-	/* MacIntosh Extension
-	 */
-        return get_adjusted_glyphs_list (font_info, cluster,
-			num_chrs, glyph_lists, &Mac_shape_table);
-      
-      case THAI_FONT_TIS_WIN:
-	/* Microsoft Extension
-	 */
-        return get_adjusted_glyphs_list (font_info, cluster,
-			num_chrs, glyph_lists, &Win_shape_table);
-      
-      case THAI_FONT_ISO10646:
-        for (i=0; i < num_chrs; i++)
-          glyph_lists[i] = PANGO_X_MAKE_GLYPH (font_info->subfont, cluster[i]);
-        return num_chrs;
-    }
-
-  return 0;			/* Quiet GCC */
-}
-
-static void
-add_cluster (ThaiFontInfo	*font_info,
-	     PangoGlyphString	*glyphs,
-	     gint		cluster_start,
-	     gunichar		*cluster,
-	     gint		num_chrs)
-	     
-{
-  PangoGlyph glyphs_list[MAX_GLYPHS];
-  gint num_glyphs;
-  gint i;
-  
-  num_glyphs = get_glyphs_list(font_info, cluster, num_chrs, glyphs_list);
-  for (i=0; i<num_glyphs; i++)
-       add_glyph (font_info, glyphs, cluster_start, glyphs_list[i],
-	    		i == 0 ? FALSE : TRUE);
-}
-
-static gboolean
-is_wtt_composible (gunichar cur_wc, gunichar nxt_wc)
-{
-  switch (TAC_compose_and_input_check_type_table[char_class (ucs2tis (cur_wc))]
-						[char_class (ucs2tis (nxt_wc))])
-    {
-      case 'A':
-      case 'S':
-      case 'R':
-      case 'X':
-        return FALSE;
-
-      case 'C':
-        return TRUE;
-    }
-
-  g_assert_not_reached ();
-  return FALSE;
-}
-
-static const char *
-get_next_cluster(const char	*text,
-		 gint		length,
-		 gunichar       *cluster,
-		 gint		*num_chrs)
-{  
-  const char *p;
-  gint n_chars = 0;
-  
-  p = text;
-  while (p < text + length && n_chars < 3)  
-    {
-      gunichar current = g_utf8_get_char (p);
-      
-      if (n_chars == 0 ||
-	  is_wtt_composible ((gunichar)(cluster[n_chars - 1]), current) ||
-	  (n_chars == 1 &&
-	   is_char_type (cluster[0], Cons) && 
-	   is_char_type (current, SaraAm)) ||
-	  (n_chars == 2 &&
-	   is_char_type (cluster[0], Cons) &&
-	   is_char_type (cluster[1], Tone) &&
-	   is_char_type (current, SaraAm)))
-	{
-	  cluster[n_chars++] = current;
-	  p = g_utf8_next_char (p);
-	}
-      else
-	break;
-    }
-
-  *num_chrs = n_chars;
-  return p;
-}
-
-static void 
-thai_engine_shape (PangoFont        *font,
-		   const char       *text,
-		   gint              length,
-		   PangoAnalysis    *analysis,
-		   PangoGlyphString *glyphs)
-{
-  ThaiFontInfo *font_info;
-  const char *p;
-  const char *log_cluster;
-  gunichar cluster[MAX_CLUSTER_CHRS];
-  gint num_chrs;
-
-  pango_glyph_string_set_size (glyphs, 0);
-
-  font_info = get_font_info (font);
-
-  p = text;
-  while (p < text + length)
-    {
-	log_cluster = p;
-	p = get_next_cluster (p, text + length - p, cluster, &num_chrs);
-	add_cluster (font_info, glyphs, log_cluster - text, cluster, num_chrs);
-    }
+  return PANGO_X_MAKE_GLYPH (font_info->subfont, c);
 }
 
 static PangoCoverage *
@@ -846,7 +139,7 @@ thai_engine_get_coverage (PangoFont  *font,
   
   ThaiFontInfo *font_info = get_font_info (font);
   
-  if (font_info->type != THAI_FONT_NONE)
+  if (font_info->font_set != THAI_FONT_NONE)
     {
       gunichar wc;