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

      * We used to just force lwd = 1, which is a reasonable sanity check
      * because if the user had set lwd = 10 for something, your
      * mathematical annotation would look REALLY bad.
      * Unfortunately, this meant that the user could not set a nice
      * small lwd to get a finer line;  we always bumped it back up to 1.
      * NOW we just reduce lwd to 1 (as a sanity check) ONLY if
      * lwd is greater than 1.
      */
     if (gc->lwd > 1)
 	gc->lwd = 1;
     GEPolyline(5, x, y, gc, dd);
 static BBOX GlyphBBox(int chr, pGEcontext gc, pGEDevDesc dd)
+{
     BBOX bbox;
     double height, depth, width;
     int chr1 = chr;
     if(dd->dev->wantSymbolUTF8 && gc->fontface == 5)
 	chr1 = -Rf_AdobeSymbol2ucs2(chr);
     GEMetricInfo(chr1, gc, &height, &depth, &width, dd);
     bboxHeight(bbox) = fromDeviceHeight(height, MetricUnit, dd);
     bboxDepth(bbox)  = fromDeviceHeight(depth, MetricUnit, dd);
     bboxWidth(bbox)  = fromDeviceHeight(width, MetricUnit, dd);
 	prev = SetFont(SymbolFont, gc);
     bbox = GlyphBBox(ascii, gc, dd);
     if (draw) {
 	asciiStr[0] = ascii;
 	asciiStr[1] = '\0';
 	GEText(ConvertedX(mc ,dd), ConvertedY(mc, dd), asciiStr,
 	       CE_SYMBOL,
 .0, 0.0, mc->CurrentAngle, gc,
 	       dd);
 	PMoveAcross(bboxWidth(bbox), mc);
+    }
     BBOX bbox;
     char asciiStr[7];
     bbox = GlyphBBox(ascii, gc, dd);
     if (draw) {
-        memset(asciiStr, 0, sizeof(asciiStr));
+	memset(asciiStr, 0, sizeof(asciiStr));
 #ifdef SUPPORT_MBCS
 	if(mbcslocale) {
 	    size_t res = wcrtomb(asciiStr, ascii, NULL);
 	    if(res == -1)
 		error("invalid character in current multibyte locale");
 	phi = theta;
+    }
     delta = (*u - bboxDepth(numBBox)) - (a + 0.5 * theta);
     /*
      * Numerators and denominators on fractions appear too far from
      * horizontal bar.
      * Reread of Knuth suggests removing "+ theta" components below.
      */
     if (delta < phi)
 	*u += (phi - delta); /* + theta; */
     delta = (a + 0.5 * theta) - (bboxHeight(denomBBox) - *v);
     if (delta < phi)
 	*v += (phi - delta); /* + theta; */
+    }
     return CombineAlignedBBoxes(numBBox, denomBBox);
+}
 static BBOX RenderUnderline(SEXP expr, int draw, mathContext *mc,
-	        	    pGEcontext gc, pGEDevDesc dd)
+			    pGEcontext gc, pGEDevDesc dd)
+{
     SEXP body = CADR(expr);
     BBOX BBox;
     double width, adepth, depth, x[2], y[2];
     double savedX = mc->CurrentX;
     BBox = RenderElement(body, draw, mc, gc, dd);
     adepth = 0.1 * XHeight(gc, dd);
     depth = bboxDepth(BBox) + adepth;
     if (draw) {
-        int savedlty = gc->lty;
+	int savedlty = gc->lty;
-        double savedlwd = gc->lwd;
+	double savedlwd = gc->lwd;
-        mc->CurrentX = savedX;
+	mc->CurrentX = savedX;
-        mc->CurrentY = savedY;
+	mc->CurrentY = savedY;
-        PMoveUp(-depth, mc);
+	PMoveUp(-depth, mc);
-        x[0] = ConvertedX(mc, dd);
+	x[0] = ConvertedX(mc, dd);
-        y[0] = ConvertedY(mc, dd);
+	y[0] = ConvertedY(mc, dd);
-        PMoveAcross(width, mc);
+	PMoveAcross(width, mc);
-        x[1] = ConvertedX(mc, dd);
+	x[1] = ConvertedX(mc, dd);
-        y[1] = ConvertedY(mc, dd);
+	y[1] = ConvertedY(mc, dd);
-        gc->lty = LTY_SOLID;
+	gc->lty = LTY_SOLID;
 	if (gc->lwd > 1)
 	    gc->lwd = 1;
-        GEPolyline(2, x, y, gc, dd);
+	GEPolyline(2, x, y, gc, dd);
-        PMoveUp(depth, mc);
+	PMoveUp(depth, mc);
-        gc->lty = savedlty;
+	gc->lty = savedlty;
-        gc->lwd = savedlwd;
+	gc->lwd = savedlwd;
-        PMoveTo(savedX + width, savedY, mc);
+	PMoveTo(savedX + width, savedY, mc);
+    }
     return EnlargeBBox(BBox, 0.0, adepth, 0.0);
+}
     return NameAtom(expr) &&
 	NameMatch(expr, "symbol");
+}
 static BBOX RenderSymbolFace(SEXP expr, int draw, mathContext *mc,
-                             pGEcontext gc, pGEDevDesc dd)
+			     pGEcontext gc, pGEDevDesc dd)
+{
     BBOX bbox;
     int prevfont = SetFont(SymbolFont, gc);
     bbox = RenderElement(CADR(expr), draw, mc, gc, dd);
     SetFont(prevfont, gc);
     else if (AccentAtom(head))
 	return RenderAccent(expr, draw, mc, gc, dd);
     else if (OverAtom(head))
 	return RenderOver(expr, draw, mc, gc, dd);
     else if (UnderlAtom(head))
-        return RenderUnderl(expr, draw, mc, gc, dd);
+	return RenderUnderl(expr, draw, mc, gc, dd);
     else if (AtopAtom(head))
 	return RenderAtop(expr, draw, mc, gc, dd);
     else if (ParenAtom(head))
 	return RenderParen(expr, draw, mc, gc, dd);
     else if (BGroupAtom(head))

The R Project SVN R

(root)/branches/djm-parseRd/src/main/plotmath.c @ 77458 – Rev 44534 → 45446