Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 4760. We were drawing smart quotes really large, because they

Browse Source 
were being taken from a large Asian font. Disabled those characters for
now. The CP1252 problem will be addressed by bug 454.


git-svn-id: svn://10.0.0.236/trunk@38239 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
erik%netscape.com
1999-07-03 04:35:17 +00:00
parent 88f52c11f8
commit 4e2fdfd4c4
1 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
View File

@@ -860,28 +860,6 @@ static PLHashTable* gCharSets = nsnull;
static nsFontCharSetInfo Ignore = { nsnull };
static void
SetUpFontCharSetInfo(nsFontCharSetInfo* aSelf)
{
nsresult result;
NS_WITH_SERVICE(nsICharsetConverterManager, manager,
NS_CHARSETCONVERTERMANAGER_PROGID, &result);
if (manager && NS_SUCCEEDED(result)) {
nsAutoString charset(aSelf->mCharSet);
nsIUnicodeEncoder* converter = nsnull;
result = manager->GetUnicodeEncoder(&charset, &converter);
if (converter && NS_SUCCEEDED(result)) {
aSelf->mConverter = converter;
result = converter->SetOutputErrorBehavior(converter->kOnError_Replace,
nsnull, '?');
nsCOMPtr<nsICharRepresentable> mapper = do_QueryInterface(converter);
if (mapper) {
result = mapper->FillInfo(aSelf->mMap);
}
}
}
}
static gint
SingleByteConvert(nsFontCharSetInfo* aSelf, const PRUnichar* aSrcBuf,
PRInt32 aSrcLen, char* aDestBuf, PRInt32 aDestLen)
@@ -909,6 +887,42 @@ DoubleByteConvert(nsFontCharSetInfo* aSelf, const PRUnichar* aSrcBuf,
return count;
}
static void
SetUpFontCharSetInfo(nsFontCharSetInfo* aSelf)
{
nsresult result;
NS_WITH_SERVICE(nsICharsetConverterManager, manager,
NS_CHARSETCONVERTERMANAGER_PROGID, &result);
if (manager && NS_SUCCEEDED(result)) {
nsAutoString charset(aSelf->mCharSet);
nsIUnicodeEncoder* converter = nsnull;
result = manager->GetUnicodeEncoder(&charset, &converter);
if (converter && NS_SUCCEEDED(result)) {
aSelf->mConverter = converter;
result = converter->SetOutputErrorBehavior(converter->kOnError_Replace,
nsnull, '?');
nsCOMPtr<nsICharRepresentable> mapper = do_QueryInterface(converter);
if (mapper) {
result = mapper->FillInfo(aSelf->mMap);
/*
* XXX This is a bit of a hack. Documents containing the CP1252
* extensions of Latin-1 (e.g. smart quotes) will display with those
* special characters way too large. This is because they happen to
* be in these large double byte fonts. So, we disable those
* characters here. Revisit this decision later.
*/
if (aSelf->Convert == DoubleByteConvert) {
PRUint32* map = aSelf->mMap;
for (PRUint16 i = 0; i < (0x3000 >> 5); i++) {
map[i] = 0;
}
}
}
}
}
}
static nsFontCharSetInfo CP1251 =
{ "windows-1251", SingleByteConvert, 0 };
static nsFontCharSetInfo ISO88591 =