From 039c940e55b575f8e9002ee6e8ebe12c1c35678f Mon Sep 17 00:00:00 2001
From: "rbs%maths.uq.edu.au" <rbs%maths.uq.edu.au>
Date: Wed, 23 May 2001 05:18:58 +0000
Subject: [PATCH] Enable some MathML-specific fonts for parity with Win32

---
 gfx/src/gtk/nsFontMetricsGTK.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gfx/src/gtk/nsFontMetricsGTK.cpp b/gfx/src/gtk/nsFontMetricsGTK.cpp
index 69aaec2969b7..cc8d8fe8d3fd 100644
--- a/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -285,12 +285,15 @@ static nsFontCharSetInfo ISO106461 =
 static nsFontCharSetInfo AdobeSymbol =
    { "Adobe-Symbol-Encoding", SingleByteConvert, 0 };
 
+#ifdef MOZ_MATHML
 static nsFontCharSetInfo CMCMEX =
    { "x-t1-cmex", SingleByteConvert, 0 };
 static nsFontCharSetInfo CMCMSY =
    { "x-t1-cmsy", SingleByteConvert, 0 };
-
-#ifdef MOZ_MATHML
+static nsFontCharSetInfo CMCMR =
+   { "x-t1-cmr", SingleByteConvert, 0 };
+static nsFontCharSetInfo CMCMMI =
+   { "x-t1-cmmi", SingleByteConvert, 0 };
 static nsFontCharSetInfo Mathematica1 =
    { "x-mathematica1", SingleByteConvert, 0 };
 static nsFontCharSetInfo Mathematica2 =
@@ -481,10 +484,13 @@ static nsFontFamilyName gFamilyNameTable[] =
 static nsFontCharSetMap gSpecialCharSetMap[] =
 {
   { "symbol-adobe-fontspecific", &FLG_NONE, &AdobeSymbol  },
-  { "cmex10-adobe-fontspecific", &FLG_NONE, &CMCMEX  },
-  { "cmsy10-adobe-fontspecific", &FLG_NONE, &CMCMSY  },
 
 #ifdef MOZ_MATHML
+  { "cmex10-adobe-fontspecific", &FLG_NONE, &CMCMEX  },
+  { "cmsy10-adobe-fontspecific", &FLG_NONE, &CMCMSY  },
+  { "cmr10-adobe-fontspecific",  &FLG_NONE, &CMCMR  },
+  { "cmmi10-adobe-fontspecific", &FLG_NONE, &CMCMMI  },
+
   { "math1-adobe-fontspecific", &FLG_NONE, &Mathematica1 },
   { "math2-adobe-fontspecific", &FLG_NONE, &Mathematica2 },
   { "math3-adobe-fontspecific", &FLG_NONE, &Mathematica3 },
@@ -1530,8 +1536,10 @@ CheckSelf(void)
 {
   CheckMap(gCharSetMap);
 
-  // XXX MathML people: please figure out why this is failing
-  // CheckMap(gSpecialCharSetMap);
+#ifdef MOZ_MATHML
+  // For this to pass, the ucvmath module must be built as well
+  CheckMap(gSpecialCharSetMap);
+#endif
 }
 
 #endif /* DEBUG */