The R Project SVN R

Rev

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

Rev 257 Rev 526
Line 1291... Line 1291...
1291 
	return result;
 1291 
	return result;
1292 
}
 1292 
}
1293 
 
 1293 
 
1294 
static BBOX supBBox(SEXP expr)
 1294 
static BBOX supBBox(SEXP expr)
1295 
{
 1295 
{
1296 
	BBOX result;
 - 
 
1297 
	SEXP body = CADR(expr);
 1296 
	SEXP body = CADR(expr);
1298 
	SEXP superscript = CADDR(expr);
 1297 
	SEXP superscript = CADDR(expr);
1299 
	double supShift;
 - 
 
1300 
	int supsub = 0;
 1298 
	int supsub = 0;
1301 
 
 1299 
 
1302 
	if (formulaExpression(body))
 1300 
	if (formulaExpression(body))
1303 
		if (subAtom(CAR(body)))
 1301 
		if (subAtom(CAR(body)))
1304 
			supsub = 1;
 1302 
			supsub = 1;
Line 1834... Line 1832...
1834 
{
 1832 
{
1835 
	SEXP body = CADR(expr);
 1833 
	SEXP body = CADR(expr);
1836 
	BBOX bodyBBox = elementBBox(expr);
 1834 
	BBOX bodyBBox = elementBBox(expr);
1837 
	double height = bboxHeight(bodyBBox);
 1835 
	double height = bboxHeight(bodyBBox);
1838 
	double depth = bboxDepth(bodyBBox);
 1836 
	double depth = bboxDepth(bodyBBox);
1839 
	double width = bboxWidth(bodyBBox);
 - 
 
1840 
	double savedX = currentX;
 - 
 
1841 
	double savedY = currentY;
 - 
 
1842 
 
 1837 
 
1843 
	moveUp(-depth);
 1838 
	moveUp(-depth);
1844 
	GStartPath();
 1839 
	GStartPath();
1845 
	GMoveTo(convertedX(), convertedY());
 1840 
	GMoveTo(convertedX(), convertedY());
1846 
	moveUp(depth + height);
 1841 
	moveUp(depth + height);
Line 1914... Line 1909...
1914 
	return expressionBBox(CADR(expr));
 1909 
	return expressionBBox(CADR(expr));
1915 
}
 1910 
}
1916 
 
 1911 
 
1917 
static void drawFormula(SEXP);
 1912 
static void drawFormula(SEXP);
1918 
 
 1913 
 
1919 
static drawCurly(SEXP expr)
 1914 
static void drawCurly(SEXP expr)
1920 
{
 1915 
{
1921 
	drawFormula(CADR(expr));
 1916 
	drawFormula(CADR(expr));
1922 
}
 1917 
}
1923 
 
 1918 
 
1924 
/* code for relation expressions (i.e. ... == ...) */
 1919 
/* code for relation expressions (i.e. ... == ...) */
Line 2010... Line 2005...
2010 
/* code for plain expressions */
 2005 
/* code for plain expressions */
2011 
 
 2006 
 
2012 
static BBOX plainBBox(SEXP expr)
 2007 
static BBOX plainBBox(SEXP expr)
2013 
{
 2008 
{
2014 
  BBOX result = nullBBox();
 2009 
  BBOX result = nullBBox();
2015 
  SEXP body = CADR(expr);
 - 
 
2016 
  int savedFont = getFont();
 2010 
  int savedFont = getFont();
2017 
 
 2011 
 
2018 
  plainFont();
 2012 
  plainFont();
2019 
  result = elementBBox(CADR(expr));
 2013 
  result = elementBBox(CADR(expr));
2020 
  setFont(savedFont);
 2014 
  setFont(savedFont);