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

     if (draw)
 	PMoveAcross(gap, mc);
     return MakeBBox(0, 0, gap);
+}
-/* Draw a Symbol from the Special Font */
+/* Draw a Symbol from the Special Font:
+   this is assumed to be 8-bit encoded in Adobe Symbol.
+ */
 static BBOX RenderSymbolChar(int ascii, int draw, mathContext *mc,
 			     R_GE_gcontext *gc, GEDevDesc *dd)
+{
     FontType prev;
 	prev = SetFont(PlainFont, gc);
     else
 	prev = SetFont(SymbolFont, gc);
     bbox = GlyphBBox(ascii, gc, dd);
     if (draw) {
-	/* <UTF8-FIXME> */
 	asciiStr[0] = ascii;
 	asciiStr[1] = '\0';
 	GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), asciiStr,
 .0, 0.0, mc->CurrentAngle, gc,
 	       dd);
+    }
     SetFont(prev, gc);
     return bbox;
+}
-/* Draw a Symbol String in "Math Mode */
+/* Draw a Symbol String in "Math Mode" */
 /* This code inserts italic corrections after */
 /* every character. */
 static BBOX RenderSymbolStr(char *str, int draw, mathContext *mc,
 			    R_GE_gcontext *gc, GEDevDesc *dd)
+{
-    char chr[2];
+    char chr[7] = "", *s = str;
     BBOX glyphBBox;
     BBOX resultBBox = NullBBox();
     double lastItalicCorr = 0;
     FontType prevfont = GetFont(gc);
     FontType font = prevfont;
-    chr[1] = '\0';
     if (str) {
+#ifdef SUPPORT_MBCS
+	if(mbcslocale) {  /* need to advance by character, not byte */
+	    wchar_t wc;
-	/* <UTF8-FIXME> perhaps */
+	    mbstate_t mb_st;
-	char *s = str;
+	    size_t res;
+	    memset(&mb_st, 0, sizeof(mb_st));
-	while (*s) {
+	    while (*s) {
+		wc = 0;
+		res = mbrtowc(&wc, s, MB_LEN_MAX, &mb_st);
-	    if (isdigit((int)*s) && font != PlainFont) {
+		if (iswdigit(wc) && font != PlainFont) {
-		font = PlainFont;
+		    font = PlainFont;
-		SetFont(PlainFont, gc);
+		    SetFont(PlainFont, gc);
-	    }
+		}
-	    else if (font != prevfont) {
+		else if (font != prevfont) {
-		font = prevfont;
+		    font = prevfont;
-		SetFont(prevfont, gc);
+		    SetFont(prevfont, gc);
+		}
+		glyphBBox = GlyphBBox((int)wc, gc, dd);
+		if (UsingItalics(gc))
+		    bboxItalic(glyphBBox) =
+			ItalicFactor * bboxHeight(glyphBBox);
+		else
+		    bboxItalic(glyphBBox) = 0;
+		if (draw) {
+		    memset(chr, 0, sizeof(chr));
+		    wcrtomb(chr,wc,&mb_st);
+		    PMoveAcross(lastItalicCorr, mc);
+		    GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), chr,
+.0, 0.0, mc->CurrentAngle, gc,
+			   dd);
+		    PMoveAcross(bboxWidth(glyphBBox), mc);
+		}
+		bboxWidth(resultBBox) += lastItalicCorr;
+		resultBBox = CombineBBoxes(resultBBox, glyphBBox);
+		lastItalicCorr = bboxItalic(glyphBBox);
+		s += res;
+	    }
+	} else
+#endif
+	{
+	    while (*s) {
+		if (isdigit((int)*s) && font != PlainFont) {
+		    font = PlainFont;
+		    SetFont(PlainFont, gc);
+		}
+		else if (font != prevfont) {
+		    font = prevfont;
+		    SetFont(prevfont, gc);
+		}
-	    glyphBBox = GlyphBBox(*s, gc, dd);
+		glyphBBox = GlyphBBox(*s, gc, dd);
-	    if (UsingItalics(gc))
+		if (UsingItalics(gc))
+		    bboxItalic(glyphBBox) =
-		bboxItalic(glyphBBox) = ItalicFactor * bboxHeight(glyphBBox);
+			ItalicFactor * bboxHeight(glyphBBox);
-	    else
+		else
-		bboxItalic(glyphBBox) = 0;
+		    bboxItalic(glyphBBox) = 0;
-	    if (draw) {
+		if (draw) {
-		chr[0] = *s;
+		    chr[0] = *s;
-		PMoveAcross(lastItalicCorr, mc);
+		    PMoveAcross(lastItalicCorr, mc);
-		GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), chr,
+		    GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), chr,
 .0, 0.0, mc->CurrentAngle, gc,
-		       dd);
+			   dd);
-		PMoveAcross(bboxWidth(glyphBBox), mc);
+		    PMoveAcross(bboxWidth(glyphBBox), mc);
+		}
+		bboxWidth(resultBBox) += lastItalicCorr;
+		resultBBox = CombineBBoxes(resultBBox, glyphBBox);
+		lastItalicCorr = bboxItalic(glyphBBox);
+		s++;
+	    }
-	    bboxWidth(resultBBox) += lastItalicCorr;
-	    resultBBox = CombineBBoxes(resultBBox, glyphBBox);
-	    lastItalicCorr = bboxItalic(glyphBBox);
-	    s++;
+	}
 	if (font != prevfont)
 	    SetFont(prevfont, gc);
+    }
     bboxSimple(resultBBox) = 1;
 /* This only gets called from RenderAccent */
 static BBOX RenderChar(int ascii, int draw, mathContext *mc,
 		       R_GE_gcontext *gc, GEDevDesc *dd)
+{
     BBOX bbox;
-    char asciiStr[2];
+    char asciiStr[7];
     bbox = GlyphBBox(ascii, gc, dd);
     if (draw) {
-	/* <UTF8-FIXME> This appears only to get called with values
+        memset(asciiStr, 0, sizeof(asciiStr));
+#ifdef SUPPORT_MBCS
+	if(mbcslocale) {
-	   for hat, tilde and ring.  The latter appears to be hardcoded
+	    wcrtomb(asciiStr, ascii, NULL);
-	   in Latin-1.
+	} else
-	 */
+#endif
-	asciiStr[0] = ascii;
+	    asciiStr[0] = ascii;
-	asciiStr[1] = '\0';
 	GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), asciiStr,
 .0, 0.0, mc->CurrentAngle, gc,
 	       dd);
 	PMoveAcross(bboxWidth(bbox), mc);
+    }
     code = AccentCode(accent);
     if (code == 0)
 	InvalidAccent(expr);
     bodyBBox = RenderElement(body, 0, mc, gc, dd);
     italic = bboxItalic(bodyBBox);
+    if (code == 176 || /* ring (as degree) */
-    if (code == 215) /* dotmath */
+	code == 215)   /* dotmath */
 	accentBBox = RenderSymbolChar(code, 0, mc, gc, dd);
     else
 	accentBBox = RenderChar(code, 0, mc, gc, dd);
     width = max(bboxWidth(bodyBBox) + bboxItalic(bodyBBox),
 		bboxWidth(accentBBox));
 	+ 0.9 * italic;
     yoffset = bboxHeight(bodyBBox) + bboxDepth(accentBBox) +
 .1 * XHeight(gc, dd);
     if (draw) {
 	PMoveTo(savedX + xoffset, savedY + yoffset, mc);
+	if (code == 176 || /* ring (as degree) */
-	if (code == 215) /* dotmath */
+	    code == 215) /* dotmath */
 	    RenderSymbolChar(code, draw, mc, gc, dd);
 	else
 	    RenderChar(code, draw, mc, gc, dd);
+    }
     bodyBBox = CombineOffsetBBoxes(bodyBBox, 0, accentBBox, 0,

The R Project SVN R

(root)/branches/R-noNULLenv/src/main/plotmath.c @ 63243 – Rev 33419 → 34864