From e4918058d8e5d3483a7e95902d830895cd324af1 Mon Sep 17 00:00:00 2001 From: "katakai%japan.sun.com" Date: Sun, 27 Apr 2003 02:40:56 +0000 Subject: [PATCH] bug 200084 gbk1988.1989-0 is defined as GBK, but us-ascii r=ftang,sr=rbs,a=asa for gtk part r=smontagu,sr=rbs,a=sspitzer for Xlib part --- gfx/src/gtk/nsFontMetricsGTK.cpp | 7 ++++++- gfx/src/xlib/nsFontMetricsXlib.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gfx/src/gtk/nsFontMetricsGTK.cpp b/gfx/src/gtk/nsFontMetricsGTK.cpp index 207654bae26..ef5957373f7 100644 --- a/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -219,6 +219,11 @@ static nsFontCharSetInfo Special = { nsnull }; static nsFontCharSetInfo CP1251 = { "windows-1251", SingleByteConvert, 0, TT_OS2_CPR1_CYRILLIC, TT_OS2_CPR2_RUSSIAN }; +static nsFontCharSetInfo USASCII = + { "us-ascii", SingleByteConvert, 0, + TT_OS2_CPR1_LATIN1 | TT_OS2_CPR1_MAC_ROMAN, + TT_OS2_CPR2_CA_FRENCH | TT_OS2_CPR2_PORTUGESE + | TT_OS2_CPR2_WE_LATIN1 | TT_OS2_CPR2_US }; static nsFontCharSetInfo ISO88591 = { "ISO-8859-1", SingleByteConvert, 0, TT_OS2_CPR1_LATIN1 | TT_OS2_CPR1_MAC_ROMAN, @@ -477,7 +482,7 @@ static nsFontCharSetMap gCharSetMap[] = { "gb18030.2000-0", &FLG_ZHCN, &GB18030_0 }, { "gb18030.2000-1", &FLG_ZHCN, &GB18030_1 }, { "gbk-0", &FLG_ZHCN, &GBK }, - { "gbk1988.1989-0", &FLG_ZHCN, &GBK }, + { "gbk1988.1989-0", &FLG_ZHCN, &USASCII }, { "hkscs-1", &FLG_ZHTW, &HKSCS }, { "hp-japanese15", &FLG_NONE, &Unknown }, { "hp-japaneseeuc", &FLG_NONE, &Unknown }, diff --git a/gfx/src/xlib/nsFontMetricsXlib.cpp b/gfx/src/xlib/nsFontMetricsXlib.cpp index 792d791a103..4c2a6ff03a8 100644 --- a/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -287,6 +287,11 @@ static nsFontCharSetInfoXlib Special = { nsnull }; static nsFontCharSetInfoXlib CP1251 = { "windows-1251", SingleByteConvert, 0, TT_OS2_CPR1_CYRILLIC, TT_OS2_CPR2_RUSSIAN }; +static nsFontCharSetInfoXlib USASCII = + { "us-ascii", SingleByteConvert, 0, + TT_OS2_CPR1_LATIN1 | TT_OS2_CPR1_MAC_ROMAN, + TT_OS2_CPR2_CA_FRENCH | TT_OS2_CPR2_PORTUGESE + | TT_OS2_CPR2_WE_LATIN1 | TT_OS2_CPR2_US }; static nsFontCharSetInfoXlib ISO88591 = { "ISO-8859-1", SingleByteConvert, 0, TT_OS2_CPR1_LATIN1 | TT_OS2_CPR1_MAC_ROMAN, @@ -545,7 +550,7 @@ static const nsFontCharSetMapXlib gConstCharSetMap[] = { "gb18030.2000-0", &FLG_ZHCN, &GB18030_0 }, { "gb18030.2000-1", &FLG_ZHCN, &GB18030_1 }, { "gbk-0", &FLG_ZHCN, &GBK }, - { "gbk1988.1989-0", &FLG_ZHCN, &GBK }, + { "gbk1988.1989-0", &FLG_ZHCN, &USASCII }, { "hkscs-1", &FLG_ZHTW, &HKSCS }, { "hp-japanese15", &FLG_NONE, &Unknown }, { "hp-japaneseeuc", &FLG_NONE, &Unknown },