mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

enabling the "Symbol" font support that was added by the MathML guys for 

Unix, by removing the #ifdef ...MATHML
This commit is contained in:
erik%netscape.com 2000-04-04 00:56:02 +00:00
Родитель d2b3a9b757
Коммит 5539fbc10c
1 изменённых файлов: 0 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
gfx/src/gtk/nsFontMetricsGTK.cpp
Просмотреть файл

@ -759,13 +759,9 @@ static nsFontPropertyName gStretchNames[] =
}; };
static PLHashTable* gCharSets = nsnull; static PLHashTable* gCharSets = nsnull;
#ifdef MOZ_MATHML
static PLHashTable* gSpecialCharSets = nsnull; static PLHashTable* gSpecialCharSets = nsnull;
#endif
#ifdef MOZ_MATHML
static nsFontCharSetInfo Special = { nsnull }; static nsFontCharSetInfo Special = { nsnull };
#endif
static nsFontCharSetInfo Ignore = { nsnull }; static nsFontCharSetInfo Ignore = { nsnull };
static gint static gint
@ -942,14 +938,12 @@ static nsFontCharSetInfo X11Johab =
static nsFontCharSetInfo ISO106461 = static nsFontCharSetInfo ISO106461 =
{ nsnull, ISO10646Convert, 1 }; { nsnull, ISO10646Convert, 1 };
#ifdef MOZ_MATHML
static nsFontCharSetInfo AdobeSymbol = static nsFontCharSetInfo AdobeSymbol =
{ "Adobe-Symbol-Encoding", SingleByteConvert, 0 }; { "Adobe-Symbol-Encoding", SingleByteConvert, 0 };
static nsFontCharSetInfo CMCMEX = static nsFontCharSetInfo CMCMEX =
{ "x-t1-cmex", SingleByteConvert, 0 }; { "x-t1-cmex", SingleByteConvert, 0 };
static nsFontCharSetInfo CMCMSY = static nsFontCharSetInfo CMCMSY =
{ "x-t1-cmsy", SingleByteConvert, 0 }; { "x-t1-cmsy", SingleByteConvert, 0 };
#endif
/* /*
* Normally, the charset of an X font can be determined simply by looking at * Normally, the charset of an X font can be determined simply by looking at
@ -981,9 +975,7 @@ static nsFontCharSetMap gCharSetMap[] =
{ {
{ "-ascii", &Ignore }, { "-ascii", &Ignore },
{ "-ibm pc", &Ignore }, { "-ibm pc", &Ignore },
#ifdef MOZ_MATHML
{ "adobe-fontspecific", &Special }, { "adobe-fontspecific", &Special },
#endif
{ "big5-0", &Big5 }, { "big5-0", &Big5 },
{ "big5-1", &Big5 }, { "big5-1", &Big5 },
{ "big5.et-0", &Big5 }, { "big5.et-0", &Big5 },
@ -1073,7 +1065,6 @@ static nsFontCharSetMap gCharSetMap[] =
{ nsnull, nsnull } { nsnull, nsnull }
}; };
#ifdef MOZ_MATHML
static nsFontCharSetMap gSpecialCharSetMap[] = static nsFontCharSetMap gSpecialCharSetMap[] =
{ {
{ "symbol-adobe-fontspecific", &AdobeSymbol }, { "symbol-adobe-fontspecific", &AdobeSymbol },
@ -1082,7 +1073,6 @@ static nsFontCharSetMap gSpecialCharSetMap[] =
{ nsnull, nsnull } { nsnull, nsnull }
}; };
#endif
#undef DEBUG_DUMP_TREE #undef DEBUG_DUMP_TREE
#ifdef DEBUG_DUMP_TREE #ifdef DEBUG_DUMP_TREE
@ -2168,7 +2158,6 @@ GetFontNames(char* aPattern)
} }
nsFontCharSetInfo* charSetInfo = nsFontCharSetInfo* charSetInfo =
(nsFontCharSetInfo*) PL_HashTableLookup(gCharSets, charSetName); (nsFontCharSetInfo*) PL_HashTableLookup(gCharSets, charSetName);
#ifdef MOZ_MATHML
// indirection for font specific charset encoding // indirection for font specific charset encoding
if (charSetInfo == &Special) { if (charSetInfo == &Special) {
char *familyCharSetName = PR_smprintf ("%s-%s", familyName, charSetName); char *familyCharSetName = PR_smprintf ("%s-%s", familyName, charSetName);
@ -2176,7 +2165,6 @@ GetFontNames(char* aPattern)
(gSpecialCharSets, familyCharSetName); (gSpecialCharSets, familyCharSetName);
PR_smprintf_free (familyCharSetName); PR_smprintf_free (familyCharSetName);
} }
#endif
if (!charSetInfo) { if (!charSetInfo) {
#ifdef NOISY_FONTS #ifdef NOISY_FONTS
printf("cannot find charset %s\n", charSetName); printf("cannot find charset %s\n", charSetName);
@ -2544,7 +2532,6 @@ nsFontMetricsGTK::FindFont(PRUnichar aChar)
PL_HashTableAdd(gCharSets, charSetMap->mName, (void*) charSetMap->mInfo); PL_HashTableAdd(gCharSets, charSetMap->mName, (void*) charSetMap->mInfo);
charSetMap++; charSetMap++;
} }
#ifdef MOZ_MATHML
gSpecialCharSets = PL_NewHashTable gSpecialCharSets = PL_NewHashTable
(0, PL_HashString, PL_CompareStrings, NULL, NULL, NULL); (0, PL_HashString, PL_CompareStrings, NULL, NULL, NULL);
nsFontCharSetMap* specialCharSetMap = gSpecialCharSetMap; nsFontCharSetMap* specialCharSetMap = gSpecialCharSetMap;
@ -2554,7 +2541,6 @@ nsFontMetricsGTK::FindFont(PRUnichar aChar)
(void*) specialCharSetMap->mInfo); (void*) specialCharSetMap->mInfo);
specialCharSetMap++; specialCharSetMap++;
} }
#endif
} }
nsFontSearch search = { this, aChar, nsnull }; nsFontSearch search = { this, aChar, nsnull };