The R Project SVN R

Rev

Rev 33417 | Rev 35776 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 33417 Rev 33681
Line 1727... Line 1727...
1727 
    code = AccentCode(accent);
 1727 
    code = AccentCode(accent);
1728 
    if (code == 0)
 1728 
    if (code == 0)
1729 
	InvalidAccent(expr);
 1729 
	InvalidAccent(expr);
1730 
    bodyBBox = RenderElement(body, 0, mc, gc, dd);
 1730 
    bodyBBox = RenderElement(body, 0, mc, gc, dd);
1731 
    italic = bboxItalic(bodyBBox);
 1731 
    italic = bboxItalic(bodyBBox);
- 
 
 1732 
    if (code == 176 || /* ring (as degree) */
1732 
    if (code == 215) /* dotmath */
 1733 
	code == 215)   /* dotmath */
1733 
	accentBBox = RenderSymbolChar(code, 0, mc, gc, dd);
 1734 
	accentBBox = RenderSymbolChar(code, 0, mc, gc, dd);
1734 
    else
 1735 
    else
1735 
	accentBBox = RenderChar(code, 0, mc, gc, dd);
 1736 
	accentBBox = RenderChar(code, 0, mc, gc, dd);
1736 
    width = max(bboxWidth(bodyBBox) + bboxItalic(bodyBBox),
 1737 
    width = max(bboxWidth(bodyBBox) + bboxItalic(bodyBBox),
1737 
		bboxWidth(accentBBox));
 1738 
		bboxWidth(accentBBox));
Line 1744... Line 1745...
1744 
	+ 0.9 * italic;
 1745 
	+ 0.9 * italic;
1745 
    yoffset = bboxHeight(bodyBBox) + bboxDepth(accentBBox) +
 1746 
    yoffset = bboxHeight(bodyBBox) + bboxDepth(accentBBox) +
1746 
	0.1 * XHeight(gc, dd);
 1747 
	0.1 * XHeight(gc, dd);
1747 
    if (draw) {
 1748 
    if (draw) {
1748 
	PMoveTo(savedX + xoffset, savedY + yoffset, mc);
 1749 
	PMoveTo(savedX + xoffset, savedY + yoffset, mc);
- 
 
 1750 
	if (code == 176 || /* ring (as degree) */
1749 
	if (code == 215) /* dotmath */
 1751 
	    code == 215) /* dotmath */
1750 
	    RenderSymbolChar(code, draw, mc, gc, dd);
 1752 
	    RenderSymbolChar(code, draw, mc, gc, dd);
1751 
	else
 1753 
	else
1752 
	    RenderChar(code, draw, mc, gc, dd);
 1754 
	    RenderChar(code, draw, mc, gc, dd);
1753 
    }
 1755 
    }
1754 
    bodyBBox = CombineOffsetBBoxes(bodyBBox, 0, accentBBox, 0,
 1756 
    bodyBBox = CombineOffsetBBoxes(bodyBBox, 0, accentBBox, 0,