From 157cd6529205999f023c9da240efc85d7793a075 Mon Sep 17 00:00:00 2001 From: "smontagu%netscape.com" Date: Tue, 22 Apr 2003 18:58:59 +0000 Subject: [PATCH] Bug 202009 (AIX) Some Japanese characters in UTF-8 document display as ? Authors=hhoetzel@us.ibm.com, Roland.Mainz@informatik.med.uni-giessen.de, r=smontagu, sr=roc+moz --- gfx/src/gtk/nsFontMetricsGTK.cpp | 9 ++++-- gfx/src/xlib/nsFontMetricsXlib.cpp | 9 ++++-- modules/libpref/src/unix/aix.js | 51 ------------------------------ 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/gfx/src/gtk/nsFontMetricsGTK.cpp b/gfx/src/gtk/nsFontMetricsGTK.cpp index b274593378d..f5ec3261130 100644 --- a/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -541,9 +541,12 @@ static nsFontCharSetMap gCharSetMap[] = { "tis620.2533-1", &FLG_THAI, &TIS620 }, { "tis620-0", &FLG_THAI, &TIS620 }, { "iso8859-11", &FLG_THAI, &TIS620 }, - { "ucs2.cjk-0", &FLG_NONE, &Unknown }, - { "ucs2.cjk_japan-0", &FLG_NONE, &Unknown }, - { "ucs2.cjk_taiwan-0", &FLG_NONE, &Unknown }, + { "ucs2.cjk-0", &FLG_NONE, &ISO106461 }, + { "ucs2.cjk_china-0", &FLG_ZHCN, &ISO106461 }, + { "ucs2.cjk_japan-0", &FLG_JA, &ISO106461 }, + { "ucs2.cjk_korea-0", &FLG_KO, &ISO106461 }, + { "ucs2.cjk_taiwan-0", &FLG_ZHTW, &ISO106461 }, + { "ucs2.thai-0", &FLG_THAI, &ISO106461 }, #ifdef SUNCTL { "sun.unicode.india-0",&FLG_INDIC, &SunIndic }, #endif /* SUNCTL */ diff --git a/gfx/src/xlib/nsFontMetricsXlib.cpp b/gfx/src/xlib/nsFontMetricsXlib.cpp index 50733766d16..b18954bad6e 100644 --- a/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -609,9 +609,12 @@ static const nsFontCharSetMapXlib gConstCharSetMap[] = { "tis620.2533-1", &FLG_THAI, &TIS620 }, { "tis620-0", &FLG_THAI, &TIS620 }, { "iso8859-11", &FLG_THAI, &TIS620 }, - { "ucs2.cjk-0", &FLG_NONE, &Unknown }, - { "ucs2.cjk_japan-0", &FLG_NONE, &Unknown }, - { "ucs2.cjk_taiwan-0", &FLG_NONE, &Unknown }, + { "ucs2.cjk-0", &FLG_NONE, &ISO106461 }, + { "ucs2.cjk_china-0", &FLG_ZHCN, &ISO106461 }, + { "ucs2.cjk_japan-0", &FLG_JA, &ISO106461 }, + { "ucs2.cjk_korea-0", &FLG_KO, &ISO106461 }, + { "ucs2.cjk_taiwan-0", &FLG_ZHTW, &ISO106461 }, + { "ucs2.thai-0", &FLG_THAI, &ISO106461 }, #ifdef SUNCTL { "sun.unicode.india-0",&FLG_INDIC, &SunIndic }, #endif /* SUNCTL */ diff --git a/modules/libpref/src/unix/aix.js b/modules/libpref/src/unix/aix.js index 9ff2c6e55f6..e69de29bb2d 100644 --- a/modules/libpref/src/unix/aix.js +++ b/modules/libpref/src/unix/aix.js @@ -1,51 +0,0 @@ -/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * IBM Corporation - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -// This is processed after unix.js and anything here supercedes unix.js -// and all the other pref files. - -// Override default Japanese fonts -pref("font.name.serif.ja", "dt-interface system-jisx0208.1983-0"); -pref("font.name.sans-serif.ja", "dt-interface system-jisx0208.1983-0"); -pref("font.name.monospace.ja", "dt-interface user-jisx0208.1983-0"); - -// Override default Cyrillic fonts -pref("font.name.serif.x-cyrillic", "dt-interface system-iso8859-5"); -pref("font.name.sans-serif.x-cyrillic", "dt-interface system-iso8859-5"); -pref("font.name.monospace.x-cyrillic", "dt-interface user-iso8859-5"); -