The R Project SVN – R – Diff – /trunk/src/main/plotmath.c

     ReferenceY = y;
     GConvert(&ReferenceX, &ReferenceY, coords, INCHES, dd);
     if (R_FINITE(xc))
 	CurrentX = ReferenceX - xc * bboxWidth(bbox);
     else
+	/* Paul 11/2/02
+	 * If xc == NA then should centre horizontally.
+	 * Used to left-adjust.
+	 */
-	CurrentX = ReferenceX;
+	CurrentX = ReferenceX - 0.5 * bboxWidth(bbox);
     if (R_FINITE(yc))
 	CurrentY = ReferenceY + bboxDepth(bbox)
 	    - yc * (bboxHeight(bbox) + bboxDepth(bbox));
     else
+	/* Paul 11/2/02
+	 * If xc == NA then should centre vertically.
+	 * Used to bottom-adjust.
+	 */
-	CurrentY = ReferenceY;
+	CurrentY = ReferenceY + bboxDepth(bbox)
+	    - 0.5 * (bboxHeight(bbox) + bboxDepth(bbox));
     CurrentAngle = rot;
     rot *= M_PI_2 / 90 ;/* radians */
     CosAngle = cos(rot);
     SinAngle = sin(rot);
     RenderElement(expr, 1);
 	if(las == 2 || las == 3) {
 	    angle = 90;
 	    yadj = 0.5;
+	}
 	else {
-	    line = line + 1 - Rf_gpptr(dd)->yLineBias;
+	    /*	    line = line + 1 - Rf_gpptr(dd)->yLineBias;
+		    angle = 0;
+		    yadj = NA_REAL; */
+	    line = line + 1;
 	    angle = 0;
-	    yadj = NA_REAL;
+	    yadj = 0;
+	}
 	break;
     case 2:
 	if(las == 1 || las == 2) {
 	    angle = 0;
 	    yadj = 0.5;
+	}
 	else {
-	    line = line + Rf_gpptr(dd)->yLineBias;
+	    /*	    line = line + Rf_gpptr(dd)->yLineBias;
+		    angle = 90;
+		    yadj = NA_REAL; */
 	    angle = 90;
-	    yadj = NA_REAL;
+	    yadj = 0;
+	}
 	break;
     case 3:
 	if(las == 2 || las == 3) {
 	    angle = 90;
 	    yadj = 0.5;
+	}
 	else {
-	    line = line + Rf_gpptr(dd)->yLineBias;
+	    /*   line = line + Rf_gpptr(dd)->yLineBias;
+		 angle = 0;
+		 yadj = NA_REAL; */
 	    angle = 0;
-	    yadj = NA_REAL;
+	    yadj = 0;
+	}
 	break;
     case 4:
 	if(las == 1 || las == 2) {
 	    angle = 0;
 	    yadj = 0.5;
+	}
 	else {
-	    line = line + 1 - Rf_gpptr(dd)->yLineBias;
+	    /*   line = line + 1 - Rf_gpptr(dd)->yLineBias;
+		 angle = 90;
+		 yadj = NA_REAL; */
+	    line = line + 1;
 	    angle = 90;
-	    yadj = NA_REAL;
+	    yadj = 0;
+	}
 	break;
+    }
     GMathText(at, line, coords, str, xadj, yadj, angle, dd);
 }/* GMMathText */

The R Project SVN R

(root)/trunk/src/main/plotmath.c @ 28362 – Rev 17179 → 18202