diff options
Diffstat (limited to 'modules')
29 files changed, 24 insertions, 29 deletions
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c index 8115e606..ebacdfbd 100644 --- a/modules/arabic/arabic-x.c +++ b/modules/arabic/arabic-x.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <glib.h> #include <string.h> -#include "pango.h" +#include "pango-engine.h" #include "pangox.h" #include "arconv.h" diff --git a/modules/arabic/arabic.c b/modules/arabic/arabic.c index 8115e606..ebacdfbd 100644 --- a/modules/arabic/arabic.c +++ b/modules/arabic/arabic.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <glib.h> #include <string.h> -#include "pango.h" +#include "pango-engine.h" #include "pangox.h" #include "arconv.h" diff --git a/modules/arabic/arconv.h b/modules/arabic/arconv.h index a0180e4c..57ee7d57 100644 --- a/modules/arabic/arconv.h +++ b/modules/arabic/arconv.h @@ -9,7 +9,6 @@ #define __arconv_h_ #include <glib.h> -#include "pango.h" #include "pangox.h" /* diff --git a/modules/arabic/langboxfont.c b/modules/arabic/langboxfont.c index 2cf84f57..831b76e3 100644 --- a/modules/arabic/langboxfont.c +++ b/modules/arabic/langboxfont.c @@ -8,7 +8,6 @@ #include <stdio.h> #include <glib.h> -#include "pango.h" #include "pangox.h" /* #define DEBUG */ diff --git a/modules/arabic/langboxfont.h b/modules/arabic/langboxfont.h index 59be6e8c..75381e37 100644 --- a/modules/arabic/langboxfont.h +++ b/modules/arabic/langboxfont.h @@ -6,7 +6,6 @@ */ #ifndef __lboxfont_h_ #define __lboxfont_h_ -#include "pango.h" #include "pangox.h" #include "arconv.h" diff --git a/modules/arabic/mulefont.c b/modules/arabic/mulefont.c index 084f19ac..2843e73c 100644 --- a/modules/arabic/mulefont.c +++ b/modules/arabic/mulefont.c @@ -8,7 +8,6 @@ #include <stdio.h> #include <glib.h> -#include "pango.h" #include "pangox.h" diff --git a/modules/arabic/mulefont.h b/modules/arabic/mulefont.h index 6851ae7d..34c6507b 100644 --- a/modules/arabic/mulefont.h +++ b/modules/arabic/mulefont.h @@ -6,7 +6,7 @@ */ #ifndef __mulefont_h_ #define __mulefont_h_ -#include "pango.h" +#include "pango-layout.h" #include "pangox.h" #include "arconv.h" diff --git a/modules/arabic/naqshfont.c b/modules/arabic/naqshfont.c index d4885245..3b1f70d6 100644 --- a/modules/arabic/naqshfont.c +++ b/modules/arabic/naqshfont.c @@ -9,7 +9,6 @@ #include <stdio.h> #include <glib.h> -#include "pango.h" #include "pangox.h" /* #define DEBUG */ diff --git a/modules/arabic/naqshfont.h b/modules/arabic/naqshfont.h index 4abde1e3..4d45d57b 100644 --- a/modules/arabic/naqshfont.h +++ b/modules/arabic/naqshfont.h @@ -6,7 +6,6 @@ */ #ifndef __nqfont_h_ #define __nqfont_h_ -#include "pango.h" #include "pangox.h" #include "arconv.h" diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c index b252eed0..d09c4c41 100644 --- a/modules/basic/basic-ft2.c +++ b/modules/basic/basic-ft2.c @@ -21,7 +21,7 @@ #include <glib.h> -#include "pango.h" +#include "pango-layout.h" #include "pangoft2.h" #include "pango-utils.h" diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index b4599e61..b5ae67d2 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -20,7 +20,6 @@ */ #include <glib.h> -#include "pango.h" #include "pangowin32.h" #include "pango-utils.h" diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c index 4169fe6c..627bc531 100644 --- a/modules/basic/basic-x.c +++ b/modules/basic/basic-x.c @@ -21,8 +21,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #include "pango-utils.h" typedef struct _CharRange CharRange; diff --git a/modules/basic/basic.c b/modules/basic/basic.c index 4169fe6c..627bc531 100644 --- a/modules/basic/basic.c +++ b/modules/basic/basic.c @@ -21,8 +21,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #include "pango-utils.h" typedef struct _CharRange CharRange; diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c index 5309b05d..7583981c 100644 --- a/modules/hangul/hangul-x.c +++ b/modules/hangul/hangul-x.c @@ -22,8 +22,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" static PangoEngineRange hangul_ranges[] = { diff --git a/modules/hangul/hangul.c b/modules/hangul/hangul.c index 5309b05d..7583981c 100644 --- a/modules/hangul/hangul.c +++ b/modules/hangul/hangul.c @@ -22,8 +22,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" static PangoEngineRange hangul_ranges[] = { diff --git a/modules/indic/bengali-x.c b/modules/indic/bengali-x.c index 0b9a93f6..823c895d 100644 --- a/modules/indic/bengali-x.c +++ b/modules/indic/bengali-x.c @@ -41,9 +41,9 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define SCRIPT_STRING "Bengali" #define ISCII_BASED diff --git a/modules/indic/bengali.c b/modules/indic/bengali.c index 0b9a93f6..823c895d 100644 --- a/modules/indic/bengali.c +++ b/modules/indic/bengali.c @@ -41,9 +41,9 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define SCRIPT_STRING "Bengali" #define ISCII_BASED diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c index 8bddb184..34348255 100644 --- a/modules/indic/devanagari-x.c +++ b/modules/indic/devanagari-x.c @@ -38,8 +38,8 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #define RANGE_START 0x900 #define RANGE_SIZE 0x80 diff --git a/modules/indic/devanagari.c b/modules/indic/devanagari.c index 8bddb184..34348255 100644 --- a/modules/indic/devanagari.c +++ b/modules/indic/devanagari.c @@ -38,8 +38,8 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #define RANGE_START 0x900 #define RANGE_SIZE 0x80 diff --git a/modules/indic/gujarati-x.c b/modules/indic/gujarati-x.c index 082640da..c8e53170 100644 --- a/modules/indic/gujarati-x.c +++ b/modules/indic/gujarati-x.c @@ -26,7 +26,6 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" #define RANGE_START 0xA80 @@ -37,6 +36,7 @@ #include "pango-indic.h" #include "pango-indic-script.h" +#include "pango-engine.h" static gboolean is_prefixing_vowel (gunichar i); static gboolean is_vowel_sign (gunichar i); diff --git a/modules/indic/gujarati.c b/modules/indic/gujarati.c index 082640da..c8e53170 100644 --- a/modules/indic/gujarati.c +++ b/modules/indic/gujarati.c @@ -26,7 +26,6 @@ #include <glib.h> #include <stdio.h> -#include "pango.h" #include "pangox.h" #define RANGE_START 0xA80 @@ -37,6 +36,7 @@ #include "pango-indic.h" #include "pango-indic-script.h" +#include "pango-engine.h" static gboolean is_prefixing_vowel (gunichar i); static gboolean is_vowel_sign (gunichar i); diff --git a/modules/indic/gurmukhi-x.c b/modules/indic/gurmukhi-x.c index e20c9e0a..179a3d11 100644 --- a/modules/indic/gurmukhi-x.c +++ b/modules/indic/gurmukhi-x.c @@ -30,9 +30,9 @@ #include <stdio.h> #include <string.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define RANGE_START 0xa00 #define RANGE_SIZE 0x80 diff --git a/modules/indic/gurmukhi.c b/modules/indic/gurmukhi.c index e20c9e0a..179a3d11 100644 --- a/modules/indic/gurmukhi.c +++ b/modules/indic/gurmukhi.c @@ -30,9 +30,9 @@ #include <stdio.h> #include <string.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define RANGE_START 0xa00 #define RANGE_SIZE 0x80 diff --git a/modules/indic/myanmar-x.c b/modules/indic/myanmar-x.c index 4e6bf4f3..214ebac5 100644 --- a/modules/indic/myanmar-x.c +++ b/modules/indic/myanmar-x.c @@ -36,9 +36,9 @@ #include <stdio.h> #include <string.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define RANGE_START 0x1000 #define RANGE_SIZE 0x80 diff --git a/modules/indic/myanmar.c b/modules/indic/myanmar.c index 4e6bf4f3..214ebac5 100644 --- a/modules/indic/myanmar.c +++ b/modules/indic/myanmar.c @@ -36,9 +36,9 @@ #include <stdio.h> #include <string.h> -#include "pango.h" #include "pangox.h" #include "pango-indic.h" +#include "pango-engine.h" #define RANGE_START 0x1000 #define RANGE_SIZE 0x80 diff --git a/modules/tamil/tamil-x.c b/modules/tamil/tamil-x.c index a8f098d9..f6ee22d0 100644 --- a/modules/tamil/tamil-x.c +++ b/modules/tamil/tamil-x.c @@ -7,9 +7,10 @@ #include <stdio.h> #include <glib.h> -#include "pango.h" #include "pangox.h" #include "taconv.h" +#include "pango-engine.h" +#include <string.h> static PangoEngineRange tamil_range[] = { { 0x0b80, 0x0bff, "*" }, diff --git a/modules/tamil/tamil.c b/modules/tamil/tamil.c index a8f098d9..f6ee22d0 100644 --- a/modules/tamil/tamil.c +++ b/modules/tamil/tamil.c @@ -7,9 +7,10 @@ #include <stdio.h> #include <glib.h> -#include "pango.h" #include "pangox.h" #include "taconv.h" +#include "pango-engine.h" +#include <string.h> static PangoEngineRange tamil_range[] = { { 0x0b80, 0x0bff, "*" }, diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c index b32721b4..40dcd78f 100644 --- a/modules/thai/thai-x.c +++ b/modules/thai/thai-x.c @@ -31,8 +31,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0) #define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00) diff --git a/modules/thai/thai.c b/modules/thai/thai.c index b32721b4..40dcd78f 100644 --- a/modules/thai/thai.c +++ b/modules/thai/thai.c @@ -31,8 +31,8 @@ #include <glib.h> #include <string.h> -#include "pango.h" #include "pangox.h" +#include "pango-engine.h" #define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0) #define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00) |