diff --git a/icu4c/source/layout/IndicClassTables.cpp b/icu4c/source/layout/IndicClassTables.cpp index ab470ebac0..dab88591cc 100644 --- a/icu4c/source/layout/IndicClassTables.cpp +++ b/icu4c/source/layout/IndicClassTables.cpp @@ -280,7 +280,15 @@ static const IndicClassTable *indicClassTables[] = { NULL, /* 'tglg' (TAGALOG) */ NULL, /* 'hano' (HANUNOO) */ NULL, /* 'buhd' (BUHID) */ - NULL /* 'tagb' (TAGBANWA) */ + NULL, /* 'tagb' (TAGBANWA) */ + NULL, /* 'brai' (BRAILLE) */ + NULL, /* 'cprt' (CYPRIOT) */ + NULL, /* 'limb' (LIMBU) */ + NULL, /* 'linb' (LINEAR_B) */ + NULL, /* 'osma' (OSMANYA) */ + NULL, /* 'shaw' (SHAVIAN) */ + NULL, /* 'tale' (TAI_LE) */ + NULL /* 'ugar' (UGARITIC) */ }; IndicClassTable::CharClass IndicClassTable::getCharClass(LEUnicode ch) const diff --git a/icu4c/source/layout/LELanguages.h b/icu4c/source/layout/LELanguages.h index ab4ba30c5b..152a2ae31d 100644 --- a/icu4c/source/layout/LELanguages.h +++ b/icu4c/source/layout/LELanguages.h @@ -5,7 +5,9 @@ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. * - * $Source: /xsrl/Nsvn/icu/icu/source/layout/LELanguages.h,v $ $Date: 2003/04/12 00:37:12 $ $Revision: 1.1 $ + * $Source: /xsrl/Nsvn/icu/icu/source/layout/LELanguages.h,v $ + * $Date: 2003/04/15 20:43:27 $ + * $Revision: 1.2 $ */ #ifndef __LELANGUAGES_H @@ -22,37 +24,38 @@ U_NAMESPACE_BEGIN */ enum LanguageCodes { - araLanguageCode = 0, - asmLanguageCode = 1, - benLanguageCode = 2, - farLanguageCode = 3, - gujLanguageCode = 4, - hinLanguageCode = 5, - iwrLanguageCode = 6, - jiiLanguageCode = 7, - janLanguageCode = 8, - kanLanguageCode = 9, - kokLanguageCode = 10, - korLanguageCode = 11, - kshLanguageCode = 12, - malLanguageCode = 13, - marLanguageCode = 14, - mlrLanguageCode = 15, - mniLanguageCode = 16, - oriLanguageCode = 17, - sanLanguageCode = 18, - sndLanguageCode = 19, - snhLanguageCode = 20, - syrLanguageCode = 21, - tamLanguageCode = 22, - telLanguageCode = 23, - thaLanguageCode = 24, - urdLanguageCode = 25, - zhpLanguageCode = 26, - zhsLanguageCode = 27, - zhtLanguageCode = 28, + nullLanguageCode = 0, + araLanguageCode = 1, + asmLanguageCode = 2, + benLanguageCode = 3, + farLanguageCode = 4, + gujLanguageCode = 5, + hinLanguageCode = 6, + iwrLanguageCode = 7, + jiiLanguageCode = 8, + janLanguageCode = 9, + kanLanguageCode = 10, + kokLanguageCode = 11, + korLanguageCode = 12, + kshLanguageCode = 13, + malLanguageCode = 14, + marLanguageCode = 15, + mlrLanguageCode = 16, + mniLanguageCode = 17, + oriLanguageCode = 18, + sanLanguageCode = 19, + sndLanguageCode = 20, + snhLanguageCode = 21, + syrLanguageCode = 22, + tamLanguageCode = 23, + telLanguageCode = 24, + thaLanguageCode = 25, + urdLanguageCode = 26, + zhpLanguageCode = 27, + zhsLanguageCode = 28, + zhtLanguageCode = 29, - languageCodeCount = 29 + languageCodeCount = 30 }; U_NAMESPACE_END diff --git a/icu4c/source/layout/LEScripts.h b/icu4c/source/layout/LEScripts.h index fb12024ae1..f9afcc91fe 100644 --- a/icu4c/source/layout/LEScripts.h +++ b/icu4c/source/layout/LEScripts.h @@ -5,7 +5,9 @@ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. * - * $Source: /xsrl/Nsvn/icu/icu/source/layout/LEScripts.h,v $ $Date: 2003/04/12 00:37:12 $ $Revision: 1.6 $ + * $Source: /xsrl/Nsvn/icu/icu/source/layout/LEScripts.h,v $ + * $Date: 2003/04/15 20:43:27 $ + * $Revision: 1.7 $ */ #ifndef __LESCRIPTS_H diff --git a/icu4c/source/layout/ScriptAndLanguageTags.cpp b/icu4c/source/layout/ScriptAndLanguageTags.cpp index d246c53851..698f483cd5 100644 --- a/icu4c/source/layout/ScriptAndLanguageTags.cpp +++ b/icu4c/source/layout/ScriptAndLanguageTags.cpp @@ -5,7 +5,9 @@ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. * - * $Source: /xsrl/Nsvn/icu/icu/source/layout/ScriptAndLanguageTags.cpp,v $ $Date: 2003/04/12 00:37:12 $ $Revision: 1.5 $ + * $Source: /xsrl/Nsvn/icu/icu/source/layout/ScriptAndLanguageTags.cpp,v $ + * $Date: 2003/04/15 20:43:27 $ + * $Revision: 1.6 $ */ #include "LETypes.h" @@ -72,6 +74,7 @@ const LETag OpenTypeLayoutEngine::scriptTags[] = { }; const LETag OpenTypeLayoutEngine::languageTags[] = { + nullLanguageTag, /* '' (null) */ araLanguageTag, /* 'ARA' (Arabic) */ asmLanguageTag, /* 'ASM' (Assamese) */ benLanguageTag, /* 'BEN' (Bengali) */ diff --git a/icu4c/source/layout/ScriptAndLanguageTags.h b/icu4c/source/layout/ScriptAndLanguageTags.h index 654a6c2d7f..61e3a13c74 100644 --- a/icu4c/source/layout/ScriptAndLanguageTags.h +++ b/icu4c/source/layout/ScriptAndLanguageTags.h @@ -5,7 +5,9 @@ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. * - * $Source: /xsrl/Nsvn/icu/icu/source/layout/ScriptAndLanguageTags.h,v $ $Date: 2003/04/12 00:37:12 $ $Revision: 1.7 $ + * $Source: /xsrl/Nsvn/icu/icu/source/layout/ScriptAndLanguageTags.h,v $ + * $Date: 2003/04/15 20:43:27 $ + * $Revision: 1.8 $ */ #ifndef __SCRIPTANDLANGUAGES_H @@ -78,6 +80,7 @@ const LETag ugarScriptTag = LE_MAKE_TAG('u', 'g', 'a', 'r'); /* UGARITIC */ const LETag nullScriptTag = 0x00000000; /* '' (NULL) */ +const LETag nullLanguageTag = 0x00000000; /* null */ const LETag araLanguageTag = LE_MAKE_TAG('A', 'R', 'A', ' '); /* Arabic */ const LETag asmLanguageTag = LE_MAKE_TAG('A', 'S', 'M', ' '); /* Assamese */ const LETag benLanguageTag = LE_MAKE_TAG('B', 'E', 'N', ' '); /* Bengali */ @@ -108,7 +111,6 @@ const LETag zhpLanguageTag = LE_MAKE_TAG('Z', 'H', 'P', ' '); /* Chinese (Phonet const LETag zhsLanguageTag = LE_MAKE_TAG('Z', 'H', 'S', ' '); /* Chinese (Simplified) */ const LETag zhtLanguageTag = LE_MAKE_TAG('Z', 'H', 'T', ' '); /* Chinese (Traditional) */ -const LETag noLanguageTag = 0x00000000; /* '' (NONE) */ U_NAMESPACE_END #endif diff --git a/icu4c/source/samples/layout/GDIFontInstance.cpp b/icu4c/source/samples/layout/GDIFontInstance.cpp index 026f601f94..70a435e83c 100644 --- a/icu4c/source/samples/layout/GDIFontInstance.cpp +++ b/icu4c/source/samples/layout/GDIFontInstance.cpp @@ -287,7 +287,7 @@ GDIFontInstance::~GDIFontInstance() LEErrorCode GDIFontInstance::initMapper() { - LETag cmapTag = 0x636D6170; // 'cmap' + LETag cmapTag = LE_MAKE_TAG('c', 'm', 'a', 'p'); const CMAPTable *cmap = (const CMAPTable *) readFontTable(cmapTag); if (cmap == NULL) { diff --git a/icu4c/source/samples/layout/GnomeFontInstance.cpp b/icu4c/source/samples/layout/GnomeFontInstance.cpp index 0204cc09eb..12a67b95f6 100644 --- a/icu4c/source/samples/layout/GnomeFontInstance.cpp +++ b/icu4c/source/samples/layout/GnomeFontInstance.cpp @@ -136,7 +136,7 @@ GnomeFontInstance::~GnomeFontInstance() LEErrorCode GnomeFontInstance::initMapper() { - LETag cmapTag = 0x636D6170; // 'cmap' + LETag cmapTag = LE_MAKE_TAG('c', 'm', 'a', 'p'); const CMAPTable *cmap = (const CMAPTable *) readFontTable(cmapTag); if (cmap == NULL) { diff --git a/icu4c/source/samples/layout/ParagraphLayout.cpp b/icu4c/source/samples/layout/ParagraphLayout.cpp index 06d03c88aa..6d8b90b6d4 100644 --- a/icu4c/source/samples/layout/ParagraphLayout.cpp +++ b/icu4c/source/samples/layout/ParagraphLayout.cpp @@ -6,6 +6,7 @@ */ #include "layout/LETypes.h" +#include "layout/LELanguages.h" #include "layout/LayoutEngine.h" #include "layout/LEFontInstance.h" @@ -180,7 +181,15 @@ le_bool ParagraphLayout::fComplexTable[] = { false, /* Tglg */ false, /* Hano */ false, /* Buhd */ - false /* Tagb */ + false, /* Tagb */ + false, /* Brai */ + false, /* Cprt */ + false, /* Limb */ + false, /* Linb */ + false, /* Osma */ + false, /* Shaw */ + false, /* Tale */ + false /* Ugar */ }; @@ -259,7 +268,7 @@ ParagraphLayout::ParagraphLayout(const LEUnicode chars[], le_int32 count, fStyleRunInfo[run].glyphBase = fGlyphCount; fStyleRunInfo[run].engine = LayoutEngine::layoutEngineFactory(fStyleRunInfo[run].font, - fStyleRunInfo[run].script, 0, layoutStatus); + fStyleRunInfo[run].script, nullLanguageCode, layoutStatus); fStyleRunInfo[run].glyphCount = fStyleRunInfo[run].engine->layoutChars(fChars, runStart, fStyleRunLimits[run] - runStart, fCharCount, fStyleRunInfo[run].level & 1, 0, 0, layoutStatus);