bug fix for glyph rendering on quartz()

git-svn-id: https://svn.r-project.org/R/trunk@88411 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: murrell

doc/NEWS.Rd

@@ -181,6 +181,12 @@
       vectors, the same as for \code{list}s, i.e., padding with \code{NULL}
       entries if the length is increased.  Thanks to \I{Mikael Jagan}'s
       \PR{18917}.
+
+      \item Fix for glyph rendering on the \code{quartz()} device when
+      there is other (\dQuote{normal}) text drawn on the device.  The
+      problem was that the text transformation matrix was not reset
+      so glyphs would be rendered incorrectly (often completely outside
+      the device, i.e., not visible).
     }
   }
 }

src/library/grDevices/src/devQuartz.c

@@ -3160,6 +3160,7 @@ void RQuartz_glyph(int n, int *glyphs, double *x, double *y,
         /* NOTE: that the font needs an inversion (in y) matrix
            because the device has an inversion in user space 
            (for bitmap devices anyway) */
+        CGContextSetTextMatrix(ctx, CGAffineTransformIdentity);
         CGAffineTransform trans = CGAffineTransformMakeScale(1.0, -1.0);
         if (rot != 0.0) trans = CGAffineTransformRotate(trans, rot/180.*M_PI);
         CTFontRef ctFont =