The R Project SVN – R – Diff – /branches/R-exp-API/src/main/plotmath.c

 typedef enum {
     PlainFont	   = 1,
     BoldFont	   = 2,
     ItalicFont	   = 3,
     BoldItalicFont = 4,
-    SymbolFont	   = 5,
+    SymbolFont	   = 5
 } FontType;
 /*
  *  Italic Correction Factor
+ *
     FontType font = prevfont;
     chr[1] = '\0';
     if (str) {
 	char *s = str;
 	while (*s) {
-	    if (isdigit(*s) && font != PlainFont) {
+	    if (isdigit((int)*s) && font != PlainFont) {
 		font = PlainFont;
 		SetFont(PlainFont);
+	    }
 	    else if (font != prevfont) {
 		font = prevfont;
 void GMathText(double x, double y, int coords, SEXP expr,
 	       double xc, double yc, double rot, DevDesc *dd)
+{
     BBOX bbox;
+#ifdef BUG61
+#else
+    /* IF font metric information is not available for device */
+    /* then bail out */
+    double ascent, descent, width;
+    GMetricInfo(0, &ascent, &descent, &width, DEVICE, dd);
+    if ((ascent==0) && (descent==0) && (width==0))
+	error("Metric information not yet available for this device\n");
+#endif
     MathDevice = dd;
     BaseCex = MathDevice->gp.cex;
     BoxColor = name2col("pink");
     TextColor = MathDevice->gp.col;
     CurrentStyle = STYLE_D;
 		double at, int las, DevDesc *dd)
+{
     int coords = 0;
     double a, xadj, yadj;
+#ifdef BUG61
+#else
+    /* IF font metric information is not available for device */
+    /* then bail out */
+    double ascent, descent, width;
+    GMetricInfo(0, &ascent, &descent, &width, DEVICE, dd);
+    if ((ascent==0) && (descent==0) && (width==0))
+	error("Metric information not yet available for this device\n");
+#endif
     MathDevice = dd;
     if (outer) {
 	switch (side) {
 	case 1:

The R Project SVN R

(root)/branches/R-exp-API/src/main/plotmath.c @ 34412 – Rev 5731 → 6098