The R Project SVN R

Rev

Rev 54810 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 54810 Rev 55065
Line 1398... Line 1398...
1398
    SEXP body = CADR(expr);
1398
    SEXP body = CADR(expr);
1399
    SEXP sub = CADDR(expr);
1399
    SEXP sub = CADDR(expr);
1400
    STYLE style = GetStyle(mc);
1400
    STYLE style = GetStyle(mc);
1401
    double savedX = mc->CurrentX;
1401
    double savedX = mc->CurrentX;
1402
    double savedY = mc->CurrentY;
1402
    double savedY = mc->CurrentY;
1403
    double v, s5, s16;
1403
    double v, s16;
1404
    bodyBBox = RenderElement(body, draw, mc, gc, dd);
1404
    bodyBBox = RenderElement(body, draw, mc, gc, dd);
1405
    bodyBBox = RenderItalicCorr(bodyBBox, draw, mc, gc, dd);
1405
    bodyBBox = RenderItalicCorr(bodyBBox, draw, mc, gc, dd);
1406
    v = bboxSimple(bodyBBox) ? 0 : bboxDepth(bodyBBox) + TeX(sigma19, gc, dd);
1406
    v = bboxSimple(bodyBBox) ? 0 : bboxDepth(bodyBBox) + TeX(sigma19, gc, dd);
1407
    s5 = TeX(sigma5, gc, dd);
-
 
1408
    s16 = TeX(sigma16, gc, dd);
1407
    s16 = TeX(sigma16, gc, dd);
1409
    SetSubStyle(style, mc, gc);
1408
    SetSubStyle(style, mc, gc);
1410
    subBBox = RenderElement(sub, 0, mc, gc, dd);
1409
    subBBox = RenderElement(sub, 0, mc, gc, dd);
1411
    v = max(max(v, s16), bboxHeight(subBBox) - 0.8 * sigma5);
1410
    v = max(max(v, s16), bboxHeight(subBBox) - 0.8 * sigma5);
1412
    subBBox = RenderOffsetElement(sub, 0, -v, draw, mc, gc, dd);
1411
    subBBox = RenderOffsetElement(sub, 0, -v, draw, mc, gc, dd);
Line 2428... Line 2427...
2428
			  pGEcontext gc, pGEDevDesc dd)
2427
			  pGEcontext gc, pGEDevDesc dd)
2429
{
2428
{
2430
    SEXP body = CADR(expr);
2429
    SEXP body = CADR(expr);
2431
    SEXP order = CADDR(expr);
2430
    SEXP order = CADDR(expr);
2432
    BBOX bodyBBox, orderBBox;
2431
    BBOX bodyBBox, orderBBox;
2433
    double radWidth, radHeight, radDepth;
2432
    double radWidth, radHeight;
2434
    double leadWidth, leadHeight, twiddleHeight;
2433
    double leadWidth, leadHeight, twiddleHeight;
2435
    double hshift, vshift;
2434
    double hshift, vshift;
2436
    double radGap, radSpace, radTrail;
2435
    double radGap, radSpace, radTrail;
2437
    STYLE style = GetStyle(mc);
2436
    STYLE style = GetStyle(mc);
2438
    double savedX = mc->CurrentX;
2437
    double savedX = mc->CurrentX;
Line 2446... Line 2445...
2446
    bodyBBox = RenderElement(body, 0, mc, gc, dd);
2445
    bodyBBox = RenderElement(body, 0, mc, gc, dd);
2447
    bodyBBox = RenderItalicCorr(bodyBBox, 0, mc, gc, dd);
2446
    bodyBBox = RenderItalicCorr(bodyBBox, 0, mc, gc, dd);
2448
 
2447
 
2449
    radWidth = 0.6 *XHeight(gc, dd);
2448
    radWidth = 0.6 *XHeight(gc, dd);
2450
    radHeight = bboxHeight(bodyBBox) + radGap;
2449
    radHeight = bboxHeight(bodyBBox) + radGap;
2451
    radDepth = bboxDepth(bodyBBox);
-
 
2452
    twiddleHeight = CenterShift(bodyBBox);
2450
    twiddleHeight = CenterShift(bodyBBox);
2453
 
2451
 
2454
    leadWidth = radWidth;
2452
    leadWidth = radWidth;
2455
    leadHeight = radHeight;
2453
    leadHeight = radHeight;
2456
    if (order != R_NilValue) {
2454
    if (order != R_NilValue) {