Backing out fix to bug 158129 because of Mac bustage

2002-10-07 22:50:54 +00:00 · 2002-10-07 22:50:54 +00:00 · e8a0658560
--- a/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/gfx/src/gtk/nsFontMetricsGTK.cpp
@ -350,9 +350,6 @@ static nsFontCharSetInfo ISO106461 =
 static nsFontCharSetInfo AdobeSymbol =
   { "Adobe-Symbol-Encoding", SingleByteConvert, 0,
    TT_OS2_CPR1_SYMBOL, 0 };
-static nsFontCharSetInfo AdobeEuro =
-  { "x-adobe-euro", SingleByteConvert, 0,
-    0, 0 };

 #ifdef MOZ_MATHML
 static nsFontCharSetInfo CMCMEX =
@ -556,9 +553,6 @@ static nsFontCharSetMap gNoneCharSetMap[] = { { nsnull }, };
 static nsFontCharSetMap gSpecialCharSetMap[] =
 {
  { "symbol-adobe-fontspecific", &FLG_NONE, &AdobeSymbol  },
-  { "euromono-adobe-fontspecific",  &FLG_NONE, &AdobeEuro },
-  { "eurosans-adobe-fontspecific",  &FLG_NONE, &AdobeEuro },
-  { "euroserif-adobe-fontspecific", &FLG_NONE, &AdobeEuro },

 #ifdef MOZ_MATHML
  { "cmex10-adobe-fontspecific", &FLG_NONE, &CMCMEX  },
@ -627,34 +621,11 @@ static PRUint16* gDoubleByteSpecialCharsCCMap = nsnull;
 // fonts are too large to use is western fonts.
 // Here we define those characters.
 //
-static const PRUnichar gDoubleByteSpecialChars[] = {
-  0x0152, /* LATIN CAPITAL LIGATURE OE */
-  0x0153, /* LATIN SMALL LIGATURE OE */
-  0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
-  0x0161, /* LATIN SMALL LETTER S WITH CARON */
-  0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
-  0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
-  0x017E, /* LATIN SMALL LETTER Z WITH CARON */
-  0x0192, /* LATIN SMALL LETTER F WITH HOOK */
-  0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
-  0x02DC, /* SMALL TILDE */
-  0x2013, /* EN DASH */
-  0x2014, /* EM DASH */
-  0x2018, /* LEFT SINGLE QUOTATION MARK */
-  0x2019, /* RIGHT SINGLE QUOTATION MARK */
-  0x201A, /* SINGLE LOW-9 QUOTATION MARK */
-  0x201C, /* LEFT DOUBLE QUOTATION MARK */
-  0x201D, /* RIGHT DOUBLE QUOTATION MARK */
-  0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
-  0x2020, /* DAGGER */
-  0x2021, /* DOUBLE DAGGER */
-  0x2022, /* BULLET */
-  0x2026, /* HORIZONTAL ELLIPSIS */
-  0x2030, /* PER MILLE SIGN */
-  0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
-  0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
-  0x20AC, /* EURO SIGN */
-  0x2122, /* TRADE MARK SIGN */
+static PRUnichar gDoubleByteSpecialChars[] = {
+  0x0152, 0x0153, 0x0160, 0x0161, 0x0178, 0x017D, 0x017E, 0x0192,
+  0x02C6, 0x02DC, 0x2013, 0x2014, 0x2018, 0x2019, 0x201A, 0x201C,
+  0x201D, 0x201E, 0x2020, 0x2021, 0x2022, 0x2026, 0x2030, 0x2039,
+  0x203A, 0x20AC, 0x2122,
  0
 };

@ -4641,12 +4612,8 @@ if (gAllowDoubleByteSpecialChars) {

      // add the symbol font before the early transliterator
      // to get the bullet (hack)
-      nsCAutoString symbol_ffre("*-symbol-adobe-fontspecific");
-      nsFontGTK* symbol_font = TryNodes(symbol_ffre, 0x0030);
-
-      // Add the Adobe Euro fonts before the early transliterator
-      nsCAutoString euro_ffre("*-euro*-adobe-fontspecific");
-      nsFontGTK* euro_font = TryNodes(euro_ffre, 0x20AC);
+      nsCAutoString ffre("*-symbol-adobe-fontspecific");
+      nsFontGTK* symbol_font = TryNodes(ffre, 0x0030);

      // add the early transliterator
      // to avoid getting Japanese "special chars" such as smart
@ -4663,9 +4630,6 @@ if (gAllowDoubleByteSpecialChars) {
      else if (symbol_font && CCMAP_HAS_CHAR(symbol_font->mCCMap, aChar)) {
        return symbol_font;
      }
-      else if (euro_font && CCMAP_HAS_CHAR(euro_font->mCCMap, aChar)) {
-        return euro_font;
-      }
      else if (sub_font && CCMAP_HAS_CHAR(sub_font->mCCMap, aChar)) {
        FIND_FONT_PRINTF(("      transliterate special chars for single byte docs"));
        return sub_font;
--- a/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/gfx/src/xlib/nsFontMetricsXlib.cpp
@ -392,9 +392,6 @@ static nsFontCharSetInfoXlib ISO106461 =
 static nsFontCharSetInfoXlib AdobeSymbol =
   { "Adobe-Symbol-Encoding", SingleByteConvert, 0,
    TT_OS2_CPR1_SYMBOL, 0 };
-static nsFontCharSetInfoXlib AdobeEuro =
-  { "x-adobe-euro", SingleByteConvert, 0,
-    0, 0 };

 #ifdef MOZ_MATHML
 static nsFontCharSetInfoXlib CMCMEX =
@ -598,9 +595,6 @@ static nsFontCharSetMapXlib gNoneCharSetMap[] = { { nsnull }, };
 static nsFontCharSetMapXlib gSpecialCharSetMap[] =
 {
  { "symbol-adobe-fontspecific", &FLG_NONE, &AdobeSymbol  },
-  { "euromono-adobe-fontspecific",  &FLG_NONE, &AdobeEuro },
-  { "eurosans-adobe-fontspecific",  &FLG_NONE, &AdobeEuro },
-  { "euroserif-adobe-fontspecific", &FLG_NONE, &AdobeEuro },

 #ifdef MOZ_MATHML
  { "cmex10-adobe-fontspecific", &FLG_NONE, &CMCMEX  },
@ -669,34 +663,11 @@ static PRUint16* gDoubleByteSpecialCharsCCMap = nsnull;
 // fonts are too large to use is western fonts.
 // Here we define those characters.
 //
-static const PRUnichar gDoubleByteSpecialChars[] = {
-  0x0152, /* LATIN CAPITAL LIGATURE OE */
-  0x0153, /* LATIN SMALL LIGATURE OE */
-  0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
-  0x0161, /* LATIN SMALL LETTER S WITH CARON */
-  0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
-  0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
-  0x017E, /* LATIN SMALL LETTER Z WITH CARON */
-  0x0192, /* LATIN SMALL LETTER F WITH HOOK */
-  0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
-  0x02DC, /* SMALL TILDE */
-  0x2013, /* EN DASH */
-  0x2014, /* EM DASH */
-  0x2018, /* LEFT SINGLE QUOTATION MARK */
-  0x2019, /* RIGHT SINGLE QUOTATION MARK */
-  0x201A, /* SINGLE LOW-9 QUOTATION MARK */
-  0x201C, /* LEFT DOUBLE QUOTATION MARK */
-  0x201D, /* RIGHT DOUBLE QUOTATION MARK */
-  0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
-  0x2020, /* DAGGER */
-  0x2021, /* DOUBLE DAGGER */
-  0x2022, /* BULLET */
-  0x2026, /* HORIZONTAL ELLIPSIS */
-  0x2030, /* PER MILLE SIGN */
-  0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
-  0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
-  0x20AC, /* EURO SIGN */
-  0x2122, /* TRADE MARK SIGN */
+static PRUnichar gDoubleByteSpecialChars[] = {
+  0x0152, 0x0153, 0x0160, 0x0161, 0x0178, 0x017D, 0x017E, 0x0192,
+  0x02C6, 0x02DC, 0x2013, 0x2014, 0x2018, 0x2019, 0x201A, 0x201C,
+  0x201D, 0x201E, 0x2020, 0x2021, 0x2022, 0x2026, 0x2030, 0x2039,
+  0x203A, 0x20AC, 0x2122,
  0
 };

@ -5110,12 +5081,8 @@ if (gAllowDoubleByteSpecialChars) {

      // add the symbol font before the early transliterator
      // to get the bullet (hack)
-      nsCAutoString symbol_ffre("*-symbol-adobe-fontspecific");
-      nsFontXlib* symbol_font = TryNodes(symbol_ffre, 0x0030);
-
-      // Add the Adobe Euro fonts before the early transliterator
-      nsCAutoString euro_ffre("*-euro*-adobe-fontspecific");
-      nsFontXlib* euro_font = TryNodes(euro_ffre, 0x20AC);
+      nsCAutoString ffre("*-symbol-adobe-fontspecific");
+      nsFontXlib* symbol_font = TryNodes(ffre, 0x0030);

      // add the early transliterator
      // to avoid getting Japanese "special chars" such as smart
@ -5132,9 +5099,6 @@ if (gAllowDoubleByteSpecialChars) {
      else if (symbol_font && CCMAP_HAS_CHAR(symbol_font->mCCMap, aChar)) {
        return symbol_font;
      }
-      else if (euro_font && CCMAP_HAS_CHAR(euro_font->mCCMap, aChar)) {
-        return euro_font;
-      }
      else if (sub_font && CCMAP_HAS_CHAR(sub_font->mCCMap, aChar)) {
        FIND_FONT_PRINTF(("      transliterate special chars for single byte docs"));
        return sub_font;
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@ -186,7 +186,6 @@
 #include "nsUnicodeToUserDefined.h"
 #include "nsUnicodeToSymbol.h"
 #include "nsUnicodeToZapfDingbat.h"
-#include "nsUnicodeToAdobeEuro.h"
 #include "nsMacArabicToUnicode.h"
 #include "nsMacDevanagariToUnicode.h"
 #include "nsMacFarsiToUnicode.h"
@ -1282,11 +1281,6 @@ static const nsModuleComponentInfo components[] =
    NS_UNICODEENCODER_CONTRACTID_BASE "x-zapf-dingbats",
    nsUnicodeToZapfDingbatConstructor, 
  },
-  { 
-    ENCODER_NAME_BASE "x-adobe-euro", NS_UNICODETOADOBEEURO_CID,
-    NS_UNICODEENCODER_CONTRACTID_BASE "x-adobe-euro",
-    nsUnicodeToAdobeEuroConstructor, 
-  },
  { 
    ENCODER_NAME_BASE "x-mac-arabic" , NS_UNICODETOMACARABIC_CID, 
    NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-arabic",
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@ -160,7 +160,6 @@ CPPSRCS		= \
 		nsUnicodeToUserDefined.cpp \
 		nsUnicodeToSymbol.cpp \
 		nsUnicodeToZapfDingbat.cpp \
-		nsUnicodeToAdobeEuro.cpp \
 		$(NULL)

 EXPORTS		= nsUCvLatinCID.h
--- a/intl/uconv/ucvlatin/nsUCvLatinCID.h
+++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h
@ -585,10 +585,6 @@
 #define NS_UNICODETOZAPFDINGBATS_CID \
  { 0x21dd6a03, 0x413c, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}

-// Class ID for our UnicodeToAscii charset converter
-#define NS_UNICODETOADOBEEURO_CID \
-  { 0x822cb9ae, 0x6421, 0x4484, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
 // {4F26B731-46CB-11d3-B3C3-00805F8A6670}
 #define NS_UNICODETOTIS620WIN_CID \
  { 0x4f26b731, 0x46cb, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}