--- a/fontsupport/fontutils/rom/fonts_variant.iby Fri Jun 11 18:07:50 2010 +0800
+++ b/fontsupport/fontutils/rom/fonts_variant.iby Tue Jun 22 19:20:47 2010 +0800
@@ -23,8 +23,8 @@
#include <iculayoutengine.iby>
#endif
-// Rasteriser always included
-ECOM_PLUGIN(ityperast.dll, ityperast.RSC)
+// include ityperast.iby
+#include <ityperast.iby>
// Include proper font set based on configuration
#ifdef __CHINESE
@@ -88,11 +88,32 @@
data=ABI_DIR\BUILD_DIR\Series60Korean.ttf resource\Fonts\Series60Korean.ttf
#else // Must be western
-
+#ifndef FF_LINKED_FONTS_CHINESE
data=ABI_DIR\BUILD_DIR\s60snr.ttf resource\Fonts\s60snr.ttf
data=ABI_DIR\BUILD_DIR\s60ssb.ttf resource\Fonts\s60ssb.ttf
data=ABI_DIR\BUILD_DIR\s60tsb.ttf resource\Fonts\s60tsb.ttf
+#else
+ #ifdef FF_CHINESE_FONTS_HIRES
+ // HiRes fonts only used in high resolutions
+ #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) \
+ || defined(__LAYOUT_320_480) || defined(__LAYOUT_320_480_TOUCH) \
+ || defined(__LAYOUT_480_320) || defined(__LAYOUT_480_320_TOUCH) \
+ || defined(__LAYOUT_480_640) || defined(__LAYOUT_480_640_TOUCH) \
+ || defined(__LAYOUT_640_480) || defined(__LAYOUT_640_480_TOUCH) \
+ || defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+ // Reso OK, include HiRes font
+ data=ABI_DIR\BUILD_DIR\S60SC_C.ttf resource\Fonts\S60SC_C.ttf
+ #else
+ // Invalid configuration: HiRes fonts enabled in low or unknown resolution device
+ #error "Feature configuration error: Chinese HiRes fonts not supported in this resolution!"
+ #endif
+
+ #else // Not FF_CHINESE_FONTS_HIRES - use regular stroke
+ data=ABI_DIR\BUILD_DIR\S60SC.ccc resource\Fonts\S60SC.ccc
+ #endif
+#endif
#endif //__CHINESE
#ifdef FF_LINKED_FONTS_CHINESE
@@ -133,7 +154,7 @@
#else // Must be western
-data=ABI_DIR\BUILD_DIR\typefaces_s60_English.xml resource\Fonts\typefaces.xml
+data=ABI_DIR\BUILD_DIR\typefaces_s60_Simplified_Chinese.xml resource\Fonts\typefaces.xml
#endif //__CHINESE