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

     CurrentY = y;
+}
 /* Basic Font Properties */
+#ifdef OLD
 static double FontHeight()
+{
     double height, depth, width;
     GMetricInfo(0, &height, &depth, &width, MetricUnit, MathDevice);
     return height + depth;
+}
+#endif
 static double xHeight()
+{
     double height, depth, width;
     GMetricInfo('x', &height, &depth, &width, MetricUnit, MathDevice);
     double height, depth, width;
     GMetricInfo('M', &height, &depth, &width, MetricUnit, MathDevice);
     return width;
+}
+/* The height of digits */
+static double FigHeight()
+{
+    double height, depth, width;
+    GMetricInfo('0', &height, &depth, &width, MetricUnit, MathDevice);
+    return height;
+}
+/* Depth of lower case descenders */
+static double DescDepth()
+{
+    double height, depth, width;
+    GMetricInfo('g', &height, &depth, &width, MetricUnit, MathDevice);
+    return depth;
+}
+static double AscHeight()
+{
+    double height, depth, width, save;
+    GMetricInfo('d', &height, &depth, &width, MetricUnit, MathDevice);
+    save = height;
+    GMetricInfo('a', &height, &depth, &width, MetricUnit, MathDevice);
+    return save - height;
+}
+/* Thickness of rules */
+static double RuleThickness()
+{
+    return 0.015;
+}
 static double ThinSpace()
+{
     double height, depth, width;
     static double OneSixth = 0.16666666666666666666;
     GMetricInfo('M', &height, &depth, &width, MetricUnit, MathDevice);
 /*
  *  Mathematics Layout Parameters
+ *
  *  The TeXBook, Appendex G, Page 447.
+ *
- *  Note : these values are ``optimised'' for PostScript.
+ *  These values are based on an inspection of TeX metafont files
- *  They can look ugly under X11.
+ *  together with some visual simplification.
+ *
+ *  Note : The values are ``optimised'' for PostScript.
+ *
  */
 typedef enum {
-    sigma2, sigma5, sigma6, sigma8, sigma9, sigma10, sigma11, sigma12,
+    sigma2,  sigma5,  sigma6,  sigma8,  sigma9,  sigma10, sigma11,
-    sigma13, sigma14, sigma15, sigma16, sigma17, sigma18, sigma19,
+    sigma12, sigma13, sigma14, sigma15, sigma16, sigma17, sigma18,
-    sigma20, sigma21, sigma22, xi8, xi9, xi10, xi11, xi12, xi13
+    sigma19, sigma20, sigma21, sigma22, xi8, xi9, xi10, xi11, xi12, xi13
+}
 TEXPAR;
-#define LINEWIDTH 0.015
+#define SUBS           0.7
 static double TeX(TEXPAR which)
+{
     double value;
     switch(which) {
     case sigma6:  /* quad */
 	return Quad();
     case sigma8:  /* num1 */
+	return AxisHeight()
+	    + 3.51 * RuleThickness()
+	    + 0.15 * XHeight()          /* 54/36 * 0.1 */
+	    + SUBS * DescDepth();
     case sigma9:  /* num2 */
+	return AxisHeight()
+	    + 1.51 * RuleThickness()
+	    + 0.08333333 * XHeight();   /* 30/36 * 0.1 */
     case sigma10: /* num3 */
-	return (0.45 * XHeight() + AxisHeight());
+	return AxisHeight()
+	    + 1.51 * RuleThickness()
+	    + 0.1333333 * XHeight();    /* 48/36 * 0.1 */
     case sigma11: /* denom1 */
+	return  - AxisHeight()
+	    + 3.51 * RuleThickness()
+	    + SUBS * FigHeight()
+	    + 0.344444 * XHeight();     /* 124/36 * 0.1 */
     case sigma12: /* denom2 */
-	return (1.45 * XHeight() - AxisHeight());
+	return  - AxisHeight()
+	    + 1.51 * RuleThickness()
+	    + SUBS * FigHeight()
+	    + 0.08333333 * XHeight();   /* 30/36 * 0.1 */
     case sigma13: /* sup1 */
+	return 0.95 * xHeight();
     case sigma14: /* sup2 */
+	return 0.825 * xHeight();
     case sigma15: /* sup3 */
-	return xHeight();
+	return 0.7 * xHeight();
     case sigma16: /* sub1 */
+	return 0.35 * xHeight();
     case sigma17: /* sub2 */
-	return 0.5 * xHeight();
+	return 0.45 * XHeight();
     case sigma18: /* sup_drop */
-	return 0.1 * xHeight();
+	return 0.3861111 * XHeight();
     case sigma19: /* sub_drop */
-	return 0.1 * xHeight();
+	return 0.05 * XHeight();
     case sigma20: /* delim1 */
+	return 2.39 * XHeight();
     case sigma21: /* delim2 */
+	return 1.01 *XHeight();
     case sigma22: /* axis_height */
 	return AxisHeight();
     case xi8:     /* default_rule_thickness */
-	return LINEWIDTH;
+	return RuleThickness();
 	break;
     case xi9:     /* big_op_spacing1 */
     case xi10:    /* big_op_spacing2 */
     case xi11:    /* big_op_spacing3 */
+}
 static int TranslatedSymbol(SEXP expr)
+{
     int code = SymbolCode(expr);
-    if ((65 <= code && code <= 90)  ||   /* Greek */
+    if ((0101 <= code && code <= 0132)  ||   /* Greek */
-	(97 <= code && code <= 122) ||
+	(0141 <= code && code <= 0172)  ||   /* Greek */
-	code == 161                 ||
+	code == 0241                    ||   /* Greek */
-	code == 162                 ||   /* minute */
+	code == 0242                    ||   /* minute */
-	code == 165                 ||   /* infinity */
+	code == 0245                    ||   /* infinity */
-	code == 176                 ||   /* degree */
+	code == 0260                    ||   /* degree */
-	code == 178                 ||   /* second */
+	code == 0262                    ||   /* second */
 )
 	return code;
     else
 	return 0;
+}
 	error("invalid mathematical annotation\n");
+}
 static SymTab BinTable[] = {
-    "*",                42,    /* Binary Operators */
+    "*",                052,    /* Binary Operators */
-    "+",                43,
+    "+",                053,
-    "-",                45,
+    "-",                055,
-    "/",                47,
+    "/",                057,
-    ":",                58,
+    ":",                072,
-    "%+-%",            177,
+    "%+-%",            0261,
-    "%*%",             180,
+    "%*%",             0264,
-    "%/%",             184,
+    "%/%",             0270,
+    "%intersection%",  0307,
+    "%union%",         0310,
-    NULL,                0
+    NULL,                 0
 };
 static int BinAtom(SEXP expr)
+{
     int i;
     double height = bboxHeight(bbox);
     double width = bboxWidth(bbox);
     double totalwidth = bboxWidth(bbox) + bboxItalic(bbox);
     double delta = totalwidth * (1 - 2 * DELTA) / NTILDE;
     double start = DELTA * totalwidth;
-    double accentGap = ACCENT_GAP * FontHeight();
+    double accentGap = ACCENT_GAP * XHeight();
-    double hatHeight = 0.5 * HAT_HEIGHT * FontHeight();
+    double hatHeight = 0.5 * HAT_HEIGHT * XHeight();
     double c = 8 * atan(1.0) / NTILDE;
     double x[NTILDE + 3], y[NTILDE + 3];
     double baseX, baseY, xval, yval;
     int i;
 static BBOX RenderWideHat(SEXP expr, int draw)
+{
     double savedX = CurrentX;
     double savedY = CurrentY;
     BBOX bbox = RenderElement(CADR(expr), draw);
-    double accentGap = ACCENT_GAP * FontHeight();
+    double accentGap = ACCENT_GAP * XHeight();
-    double hatHeight = HAT_HEIGHT * FontHeight();
+    double hatHeight = HAT_HEIGHT * XHeight();
     double totalwidth = bboxWidth(bbox) + bboxItalic(bbox);
     double height = bboxHeight(bbox);
     double width = bboxWidth(bbox);
     double x[3], y[3];
 static BBOX RenderBar(SEXP expr, int draw)
+{
     double savedX = CurrentX;
     double savedY = CurrentY;
     BBOX bbox = RenderElement(CADR(expr), draw);
-    double accentGap = ACCENT_GAP * FontHeight();
+    double accentGap = ACCENT_GAP * XHeight();
-    double hatHeight = HAT_HEIGHT * FontHeight();
+    double hatHeight = HAT_HEIGHT * XHeight();
-    double totalwidth = bboxWidth(bbox) + bboxItalic(bbox);
     double height = bboxHeight(bbox);
     double width = bboxWidth(bbox);
+    double offset = bboxItalic(bbox);
     double x[2], y[2];
     if (draw) {
-	MoveTo(savedX, savedY + height + accentGap);
+	MoveTo(savedX + offset, savedY + height + accentGap);
 	x[0] = ConvertedX();
 	y[0] = ConvertedY();
-	MoveAcross(totalwidth);
+	MoveAcross(width);
 	x[1] = ConvertedX();
 	y[1] = ConvertedY();
 	GPolyline(2, x, y, INCHES, MathDevice);
 	MoveTo(savedX + width, savedY);
+    }
     char *name;
     int code;
+}
 AccentTable[] = {
     "hat",            94,
+    "ring",          176,
     "tilde",         126,
     NULL,              0,
 };
 static int AccentCode(SEXP expr)
     return 0;
+}
 static int AccentAtom(SEXP expr)
+{
-    return NameAtom(expr) &&
+    return NameAtom(expr) && (AccentCode(expr) != 0);
-	(NameMatch(expr, "hat") || NameMatch(expr, "tilde"));
+}
 static void InvalidAccent(SEXP expr)
+{
     errorcall(expr, "invalid accent\n");
+{
     SEXP body, accent;
     double savedX = CurrentX;
     double savedY = CurrentY;
     BBOX bodyBBox, accentBBox;
-    double xoffset, yoffset;
+    double xoffset, yoffset, width, italic;
     int code;
     if (length(expr) != 2)
 	InvalidAccent(expr);
     accent = CAR(expr);
     body = CADR(expr);
-    if (NameMatch(accent, "hat"))
+    code = AccentCode(accent);
-	code = 94;
+    if (code == 0)
-    else if (NameMatch(accent, "tilde"))
-	code = 126;
-    else
 	InvalidAccent(expr);
-    bodyBBox = RenderElement(body, draw);
+    bodyBBox = RenderElement(body, 0);
+    italic = bboxItalic(bodyBBox);
     accentBBox = RenderChar(code, 0);
-    xoffset = 0.5 *(bboxWidth(bodyBBox) - bboxWidth(accentBBox));
+    width = max(bboxWidth(bodyBBox) + bboxItalic(bodyBBox),
+		bboxWidth(accentBBox));
-    yoffset = bboxHeight(bodyBBox);
+    xoffset = 0.5 *(width - bboxWidth(bodyBBox));
+    bodyBBox = RenderGap(xoffset, draw);
+    bodyBBox = CombineBBoxes(bodyBBox, RenderElement(body, draw));
+    bodyBBox = CombineBBoxes(bodyBBox, RenderGap(xoffset, draw));
+    MoveTo(savedX, savedY);
+    xoffset = 0.5 *(width - bboxWidth(accentBBox))
+	+ 0.9 * italic;
+    yoffset = bboxHeight(bodyBBox) + bboxDepth(accentBBox) + 0.1 * XHeight();
     if (draw) {
 	MoveTo(savedX + xoffset, savedY + yoffset);
 	RenderChar(code, draw);
+    }
     bodyBBox = CombineOffsetBBoxes(bodyBBox, 0, accentBBox, 0,
 				   xoffset, yoffset);
-    MoveTo(savedX + bboxWidth(bodyBBox), savedY);
+    MoveTo(savedX + width, savedY);
     return bodyBBox;
+}
 /*----------------------------------------------------------------------
 	*v = TeX(sigma12);
 	phi = theta;
+    }
     delta = (*u - bboxDepth(numBBox)) - (a + 0.5 * theta);
     if (delta < phi)
-	*u += (phi - delta);
+	*u += (phi - delta) + theta;
     delta = (a + 0.5 * theta) - (bboxHeight(denomBBox) - *v);
     if (delta < phi)
-	*v += (phi - delta);
+	*v += (phi - delta) + theta;
+}
 static void NumDenomHShift(BBOX numBBox, BBOX denomBBox,
 			   double *numShift, double *denomShift)
+{
     return CombineAlignedBBoxes(numBBox, denomBBox);
+}
 static int OverAtom(SEXP expr)
+{
+    return NameAtom(expr) &&
-    return NameAtom(expr) && NameMatch(expr, "over");
+        (NameMatch(expr, "over") || NameMatch(expr, "frac"));
+}
 static BBOX RenderOver(SEXP expr, int draw)
+{
     return RenderFraction(expr, 1, draw);
 static BBOX RenderAtop(SEXP expr, int draw)
+{
     return RenderFraction(expr, 0, draw);
+}
 /*----------------------------------------------------------------------
+ *
  *  Code for Grouped Expressions  (e.g. ( ... ))
+ *
  *    group(ldelim, body, rdelim)
+ *
  *    bgroup(ldelim, body, rdelim)
+ *
  */
+#define DelimSymbolMag 1.25
 static int DelimCode(SEXP expr, SEXP head)
+{
     int code = 0;
     if (NameAtom(head)) {
 	if (NameMatch(head, "lfloor"))
     if (code == 0)
 	errorcall(expr, "invalid group delimiter\n");
     return code;
+}
+static BBOX RenderDelimiter(int delim, int draw)
+{
+    BBOX bbox;
+    double savecex = MathDevice->gp.cex;
+    MathDevice->gp.cex = DelimSymbolMag * MathDevice->gp.cex;
+    bbox = RenderSymbolChar(delim, draw);
+    MathDevice->gp.cex = savecex;
+    return bbox;
+}
 static int GroupAtom(SEXP expr)
+{
     return NameAtom(expr) && NameMatch(expr, "group");
+}
 static BBOX RenderGroup(SEXP expr, int draw)
+{
+    double cexSaved = MathDevice->gp.cex;
     BBOX bbox;
     int code;
     if (length(expr) != 4)
 	errorcall(expr, "invalid group specification\n");
     bbox = NullBBox();
     code = DelimCode(expr, CADR(expr));
+    MathDevice->gp.cex = DelimSymbolMag * MathDevice->gp.cex;
     if (code == 2) {
 	bbox = RenderSymbolChar('|', draw);
 	bbox = RenderSymbolChar('|', draw);
+    }
     else if (code != '.')
 	bbox = RenderSymbolChar(code, draw);
+    MathDevice->gp.cex = cexSaved;
     bbox = CombineBBoxes(bbox, RenderElement(CADDR(expr), draw));
     bbox = RenderItalicCorr(bbox, draw);
     code = DelimCode(expr, CADDDR(expr));
+    MathDevice->gp.cex = DelimSymbolMag * MathDevice->gp.cex;
     if (code == 2) {
 	bbox = RenderSymbolChar('|', draw);
 	bbox = RenderSymbolChar('|', draw);
+    }
     else if (code != '.')
 	bbox = RenderSymbolChar(code, draw);
+    MathDevice->gp.cex = cexSaved;
     return bbox;
+}
 static int BGroupAtom(SEXP expr)
+{
     double savedX = CurrentX;
     double savedY = CurrentY;
     FontType prev = SetFont(SymbolFont);
     BBOX ansBBox, topBBox, botBBox, extBBox, midBBox;
     int top, bot, ext, mid;
+    int i, n;
-    double topShift, botShift;
+    double topShift, botShift, extShift, midShift;
+    double ytop, ybot, extHeight, delta;
     double axisHeight = TeX(sigma22);
     switch(which) {
     case '.':
 	return NullBBox();
 	break;
+    }
     topBBox = GlyphBBox(top);
     extBBox = GlyphBBox(ext);
     botBBox = GlyphBBox(bot);
+    if (which == '{' || which == '}') {
+	if (1.2 * (bboxHeight(topBBox) + bboxDepth(topBBox)) > dist)
+	    dist = 1.2 * (bboxHeight(topBBox) + bboxDepth(botBBox));
+    }
+    else {
+	if (0.8 * (bboxHeight(topBBox) + bboxDepth(topBBox)) > dist)
+	    dist = 0.8 * (bboxHeight(topBBox) + bboxDepth(topBBox));
+    }
+    extHeight = bboxHeight(extBBox) + bboxDepth(extBBox);
     topShift = dist - bboxHeight(topBBox) + axisHeight;
     botShift = dist - bboxDepth(botBBox) - axisHeight;
+    extShift = 0.5 * (bboxHeight(extBBox) - bboxDepth(extBBox));
     topBBox = ShiftBBox(topBBox, topShift);
     botBBox = ShiftBBox(botBBox, -botShift);
     ansBBox = CombineAlignedBBoxes(topBBox, botBBox);
+    if (which == '{' || which == '}') {
+	midBBox = GlyphBBox(mid);
+	midShift = axisHeight
+	    - 0.5 * (bboxHeight(midBBox) - bboxDepth(midBBox));
+	midBBox = ShiftBBox(midBBox, midShift);
+	ansBBox = CombineAlignedBBoxes(ansBBox, midBBox);
-    if (draw) {
+	if (draw) {
-	MoveUp(topShift);
+	    MoveTo(savedX, savedY + topShift);
-	RenderSymbolChar(top, draw);
+	    RenderSymbolChar(top, draw);
+	    MoveTo(savedX, savedY + midShift);
+	    RenderSymbolChar(mid, draw);
+	    MoveTo(savedX, savedY - botShift);
+	    RenderSymbolChar(bot, draw);
+	    MoveTo(savedX + bboxWidth(ansBBox), savedY);
+	}
+    }
+    else {
+	if (draw) {
+	    /* draw the top and bottom elements */
-	MoveTo(savedX, savedY);
+	    MoveTo(savedX, savedY + topShift);
+	    RenderSymbolChar(top, draw);
-	MoveUp(-botShift);
+	    MoveTo(savedX, savedY - botShift);
-	RenderSymbolChar(bot, draw);
+	    RenderSymbolChar(bot, draw);
+	    /* now join with extenders */
+	    ytop = axisHeight + dist
+		- (bboxHeight(topBBox) + bboxDepth(topBBox));
+	    ybot = axisHeight - dist
+		+ (bboxHeight(botBBox) + bboxDepth(botBBox));
+	    n = ceil((ytop - ybot) / (0.99 * extHeight));
+	    if (n > 0) {
+		delta = (ytop - ybot) / n;
+		for (i = 0; i < n; i++) {
+		    MoveTo(savedX, savedY + ybot + (i + 0.5) * delta - extShift);
+		    RenderSymbolChar(ext, draw);
+		}
+	    }
-	MoveTo(savedX + bboxWidth(ansBBox), savedY);
+	    MoveTo(savedX + bboxWidth(ansBBox), savedY);
+	}
+    }
     SetFont(prev);
     return ansBBox;
+}
     delim1 = DelimCode(expr, CADR(expr));
     delim2 = DelimCode(expr, CADDDR(expr));
     bbox = RenderElement(CADDR(expr), 0);
     dist = max(bboxHeight(bbox) - axisHeight, bboxDepth(bbox) + axisHeight);
     bbox = RenderDelim(delim1, dist + extra, draw);
-    bbox = CombineBBoxes(bbox,  RenderGap(ThinSpace(), draw));
     bbox = CombineBBoxes(bbox,  RenderElement(CADDR(expr), draw));
     bbox = RenderItalicCorr(bbox, draw);
     bbox = CombineBBoxes(bbox,  RenderDelim(delim2, dist + extra, draw));
-    bbox = CombineBBoxes(bbox,  RenderGap(ThinSpace(), draw));
     return bbox;
+}
 /*----------------------------------------------------------------------
+ *
+}
 static BBOX RenderParen(SEXP expr, int draw)
+{
     BBOX bbox;
-    bbox = RenderSymbolChar(S_PARENLEFT, draw);
+    bbox = RenderDelimiter(S_PARENLEFT, draw);
     bbox = CombineBBoxes(bbox, RenderElement(CADR(expr), draw));
     bbox = RenderItalicCorr(bbox, draw);
-    return CombineBBoxes(bbox, RenderSymbolChar(S_PARENRIGHT, draw));
+    return CombineBBoxes(bbox, RenderDelimiter(S_PARENRIGHT, draw));
+}
 /*----------------------------------------------------------------------
+ *
  *  Code for Integral Operators.
 static BBOX RenderIntSymbol(int draw)
+{
     double savedX = CurrentX;
     double savedY = CurrentY;
+    if (GetStyle() > STYLE_T) {
-    BBOX bbox1 = RenderSymbolChar(243, 0);
+	BBOX bbox1 = RenderSymbolChar(243, 0);
-    BBOX bbox2 = RenderSymbolChar(245, 0);
+	BBOX bbox2 = RenderSymbolChar(245, 0);
-    double shift;
+	double shift;
-    shift = TeX(sigma22) + 0.99 * bboxDepth(bbox1);
+	shift = TeX(sigma22) + 0.99 * bboxDepth(bbox1);
-    MoveUp(shift);
+	MoveUp(shift);
-    bbox1 = ShiftBBox(RenderSymbolChar(243, draw), shift);
+	bbox1 = ShiftBBox(RenderSymbolChar(243, draw), shift);
-    CurrentX = savedX;
+	CurrentX = savedX;
-    CurrentY = savedY;
+	CurrentY = savedY;
-    shift = TeX(sigma22) - 0.99 * bboxHeight(bbox2);
+	shift = TeX(sigma22) - 0.99 * bboxHeight(bbox2);
-    MoveUp(shift);
+	MoveUp(shift);
-    bbox2 = ShiftBBox(RenderSymbolChar(245, draw), shift);
+	bbox2 = ShiftBBox(RenderSymbolChar(245, draw), shift);
-    if (draw)
+	if (draw)
-	MoveTo(savedX + max(bboxWidth(bbox1), bboxWidth(bbox2)), savedY);
+	    MoveTo(savedX + max(bboxWidth(bbox1), bboxWidth(bbox2)), savedY);
-    else
+	else
-	MoveTo(savedX, savedY);
+	    MoveTo(savedX, savedY);
-    return CombineAlignedBBoxes(bbox1, bbox2);
+	return CombineAlignedBBoxes(bbox1, bbox2);
+    }
+    else {
+	return RenderSymbolChar(0362, draw);
+    }
+}
 static BBOX RenderInt(SEXP expr, int draw)
+{
     BBOX opBBox, lowerBBox, upperBBox, bodyBBox;
     BBOX bbox;
     double cexSaved = MathDevice->gp.cex;
     double savedX = CurrentX;
     double savedY = CurrentY;
     double shift;
+    int display = (GetStyle() > STYLE_T);
     int opId = OpAtom(op);
     if (opId == S_SUM || opId == S_PRODUCT) {
+	if (display) {
-	MathDevice->gp.cex = OperatorSymbolMag * MathDevice->gp.cex;
+	    MathDevice->gp.cex = OperatorSymbolMag * MathDevice->gp.cex;
-	bbox = RenderSymbolChar(OpAtom(op), 0);
+	    bbox = RenderSymbolChar(OpAtom(op), 0);
-	shift = 0.5 * (bboxHeight(bbox) - bboxDepth(bbox)) - TeX(sigma22);
+	    shift = 0.5 * (bboxHeight(bbox) - bboxDepth(bbox)) - TeX(sigma22);
-	if (draw) {
+	    if (draw) {
-	    MoveUp(-shift);
+		MoveUp(-shift);
-	    bbox = RenderSymbolChar(OpAtom(op), 1);
+		bbox = RenderSymbolChar(opId, 1);
-	    MoveUp(shift);
+		MoveUp(shift);
+	    }
+	    MathDevice->gp.cex = cexSaved;
+	    return ShiftBBox(bbox, -shift);
+	}
-	MathDevice->gp.cex = cexSaved;
-	return ShiftBBox(bbox, -shift);
+	else return RenderSymbolChar(opId, draw);
+    }
     else {
 	FontType prevfont = SetFont(PlainFont);
 	bbox = RenderStr(CHAR(PRINTNAME(op)), draw);
 	SetFont(prevfont);
     if (NameAtom(CAR(expr)))
 	bbox = RenderSymbolString(CAR(expr), draw);
     else
 	bbox = RenderElement(CAR(expr), draw);
     bbox = RenderItalicCorr(bbox, draw);
-    bbox = CombineBBoxes(bbox, RenderSymbolChar(S_PARENLEFT, draw));
+    bbox = CombineBBoxes(bbox, RenderDelimiter(S_PARENLEFT, draw));
     bbox = CombineBBoxes(bbox, RenderCommaList(CDR(expr), draw));
     bbox = RenderItalicCorr(bbox, draw);
-    bbox = CombineBBoxes(bbox, RenderSymbolChar(S_PARENRIGHT, draw));
+    bbox = CombineBBoxes(bbox, RenderDelimiter(S_PARENRIGHT, draw));
     return bbox;
+}
 /*----------------------------------------------------------------------
+ *
     MathDevice = dd;
     BaseCex = MathDevice->gp.cex;
     BoxColor = name2col("pink");
     TextColor = MathDevice->gp.col;
     CurrentStyle = STYLE_D;
-#ifdef OLD
-    /* SetFont(ItalicFont); */
+    SetFont(PlainFont);
-#endif
     bbox = RenderElement(expr, 0);
     ReferenceX = x;
     ReferenceY = y;
     GConvert(&ReferenceX, &ReferenceY, coords, INCHES, dd);
     if (FINITE(xc))

The R Project SVN R

(root)/branches/R-exp-R5/src/main/plotmath.c @ 63243 – Rev 2028 → 2105