--- dia-0.83-7pr1/lib/font.c	Sat Feb 19 01:15:04 2000
+++ dia-0.83-7pr1.solaris/lib/font.c	Fri Feb 18 16:19:01 2000
@@ -81,31 +81,31 @@
 FontData font_data[] = {
   { "��ī",
     { "Times-Roman", "Ryumin-Light" },
-    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Times-Roman",
     { "Times-Roman", "Ryumin-Light" },
-    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-times-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   }, 
   { "Times-Italic",
     { "Times-Italic", "Ryumin-Light" },
-    { "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-i-normal-*-%d-*-*-*-*-*-*-*",
+    { "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-i-*-*-%d-*-*-*-*-*-*-*",
       "-adobe-times-medium-i-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-i-normal-*-%d-*-*-*-*-*-*-*"
     }
   }, 
   { "Times-Bold",
     { "Times-Bold", "GothicBBB-Medium" },
-    { "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+    { "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
       "-adobe-times-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   }, 
   { "Times-BoldItalic",
     { "Times-BoldItalic", "GothicBBB-Medium" },
-    { "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-i-normal-*-%d-*-*-*-*-*-*-*",
+    { "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
       "-adobe-times-bold-i-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-i-normal-*-%d-*-*-*-*-*-*-*"
     }
   }, 
@@ -159,74 +159,75 @@
   },
   { "Courier",
     { "Courier", "Ryumin-Light" },
-    { "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { 
+      "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Courier-Oblique",
     { "Courier-Oblique", "Ryumin-Light" },
-    { "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Courier-Bold",
     { "Courier-Bold", "GothicBBB-Medium" },
-    { "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Courier-BoldOblique",
     { "Courier-BoldOblique", "GothicBBB-Medium" },
-    { "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-courier-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica",
     { "Helvetica", "Ryumin-Light" },
-    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Oblique",
     { "Helvetica-Oblique", "Ryumin-Light" },
-    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Bold",
     { "Helvetica-Bold", "GothicBBB-Medium" },
-    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-BoldOblique",
     { "Helvetica-BoldOblique", "GothicBBB-Medium" },
-    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Narrow",
     { "Helvetica-Narrow", "Ryumin-Light" },
-    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Narrow-Oblique",
     { "Helvetica-Narrow-Oblique", "Ryumin-Light" },
-    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-medium-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Narrow-Bold",
     { "Helvetica-Narrow-Bold", "GothicBBB-Medium" },
-    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "Helvetica-Narrow-BoldOblique",
     { "Helvetica-Narrow-BoldOblique", "GothicBBB-Medium" },
-    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*",
-      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-fixed-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+    { "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-morisawa-gothic medium bbb-bold-r-normal-*-%d-*-*-*-*-*-*-*",
+      "-adobe-helvetica-bold-o-normal-*-%d-*-*-*-*-*-*-*,-*-mincho-bold-r-normal-*-%d-*-*-*-*-*-*-*"
     }
   },
   { "NewCenturySchoolbook-Roman",
@@ -305,7 +306,7 @@
 GHashTable *fonts_hash = NULL;
 
 char *last_resort_fonts[] = {
-  "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+  "-ricoh-hg mincho l-medium-r-normal-*-%d-*-*-*-*-*-*-*",
   "fixed" /* Must be last. This is guaranteed to exist on an X11 system. */
 };
 #define NUM_LAST_RESORT_FONTS (sizeof(last_resort_fonts)/sizeof(char *))
