The R Project SVN – R – Diff – /branches/R-Win-CMD/src/unix/devQuartz.c

 , 243, 134,  32,  32, 167, 136, 135, 137, 139,
 , 140, 190, 141, 143, 142, 144, 145, 147, 146,
 , 149,  32, 150, 152, 151, 153, 155, 154, 214,
 , 157, 156, 158, 159,  32,  32, 216};
+#define MAX_NON_SYMBS 17
+unsigned char NotSymbols[] = {
+, 33, 37, 38, 40, 41, 42, 43, 44, 58,
+, 61, 62, 91, 93, 95, 123, 125
+};
+/* conversion table to use symbol font enoded as
+   unicode under MacOSX and no longer MacRoman
+*/
+unsigned char Lat2Uni[] = {
+, /* space */
+, /* exclam */
+, /* universal" */
+, /* numbersign */
+, /* existential */
+, /* percent */
+, /* ampersand */
+, /* suchthat */
+, /* parenleft */
+, /* parenright */
+, /* asteriskmath */
+, /* plus */
+, /* comma */
+, /* minus */
+, /* period */
+, /* slash*/
+, /* 0 */
+, /* 1 */
+, /* 2 */
+, /* 3 */
+, /* 4 */
+, /* 5 */
+, /* 6 */
+, /* 7 */
+, /* 8 */
+, /* 9 */
+, /* colon */
+, /* semicolon */
+, /* less */
+, /* equal */
+, /* greater */
+, /* question */
+, /* congruent */
+, /* Alpha */
+, /* Beta */
+, /* Chi */
+, /* Delta */
+, /* Epsilon */
+, /* Phi */
+, /* Gamma */
+, /* Eta */
+, /* Iota */
+, /* theta1 */
+, /* Kappa */
+, /* Lambda */
+, /* Mu */
+, /* Nu */
+, /* Omicron */
+, /* Pi */
+, /* Theta */
+, /* Rho */
+, /* Sigma */
+, /* Tau */
+, /* Upsilon */
+, /* sigma1 */
+, /* Omega */
+, /* Xi */
+, /* Psi */
+, /* Zeta */
+, /* bracketleft */  /* Miscellaneous Special Characters */
+, /* therefore */
+, /* bracketright */
+, /* perpendicular */
+, /* underscore */
+, /* radicalex */
+, /* alpha */
+, /* beta */
+, /* chi */
+, /* delta */
+, /* epsilon */
+, /* phi */
+, /* gamma */
+, /* eta */
+, /* iota */
+, /* phi1 */
+, /* kappa */
+, /* lambda */
+, /* mu */
+, /* nu */
+, /* omicron */
+, /* pi */
+, /* theta */
+, /* rho */
+, /* sigma */
+, /* tau */
+, /* upsilon */
+, /* omega1 */
+, /* omega */
+, /* xi */
+, /* psi */
+, /* zeta */
+, /* braceleft */
+, /* bar */
+, /* braceright */
+, /* similar */
+, 32, 32, 32,
+, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+, /* Upsilon1 */	/* Lone Greek */
+, /* minute */
+, /* lessequal */
+, /* fraction */
+, /* infinity */
+, /* florin      ??? */
+, /* club */
+, /* diamond */
+, /* heart */
+, /* spade */
+, /* arrowboth */
+, /* arrowleft */
+, /* arrowup */
+, /* arrowright */
+, /* arrowdown */
+, /* degree */
+, /* plusminus */
+, /* second */
+, /* greaterequal */
+, /* multiply */
+, /* proportional */
+, /* partialdiff */
+, /* bullet */
+, /* divide */
+, /* notequal */
+, /* equivalence */
+, /* approxequal ??? */
+, /* ellipsis    ??? */
+, /* arrowvertex ??? */
+, /* arrowhorizex ??? */
+, /* carriagereturn */
+, /* aleph */
+, /* Ifraktur */
+, /* Rfraktur */
+, /* weierstrass ??? */
+, /* circlemultiply */
+, /* circleplus */
+, /* emptyset */
+, /* intersection */
+, /* union */
+, /* propersuperset */
+, /* reflexsuperset */
+, /* notsubset */
+, /* propersubset */
+, /* reflexsubset */
+, /* element */
+, /* notelement */
+, /* angle */
+, /* gradient */
+, /* registerserif */
+, /* copyrightserif */
+, /* trademarkserif */
+, /* product */
+, /* radical */
+, /* dotmath */
+,
+, /* logicaland ???*/
+, /* logicalor ???*/
+, /* arrowdblboth */
+, /* arrowdblleft */
+, /* arrowdblup */
+, /* arrowdblright */
+, /* arrowdbldown */
+, /* lozenge */
+, /* angleleft ???*/
+, /* registersans */
+, /* copyrightsans */
+, /* trademarksans */
+, /* summation */
+, /* parenlefttp */
+, /* parenleftex */
+, /* parenleftbt */
+, /* bracketlefttp */
+, /* bracketleftex */
+, /* bracketleftbt */
+, /* bracelefttp */
+, /* braceleftmid */
+, /* braceleftbt */
+, /* braceex */
+,
+, /* angleright */
+, /* integral */
+, /* integraltp */
+, /* integralex */
+, /* integralbt */
+, /* parenrighttp */
+, /* parenrightex */
+, /* parenrightbt */
+, /* bracketrighttp */
+, /* bracketrightex */
+, /* bracketrightbt */
+, /* bracerighttp */
+, /* bracerightmid */
+, /* bracerightbt */
+/* NULL */
+};
 unsigned char Mac2Lat[] = {
 , 197, 199, 201, 209, 214, 220, 225, 224, 226,
 , 227, 229, 231, 233, 232, 234, 235, 237, 236,
 , 239, 241, 243, 242, 244, 246, 245, 250, 249,
 , 252,  32, 176, 162, 163, 167,  32, 182, 223,
     return(position.x);
+}
+/* This new version of Quartz_SetFont handles correctly the unicode encoding of
+   the Symbol font under Panther
+ */
 static void Quartz_SetFont(int style,  double cex, double ps, NewDevDesc *dd)
+{
     QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
     int size = cex * ps + 0.5;
     SetPortWindowPort(xd->window);
     switch(style){
      case 5:
       strcpy(CurrFont,"Symbol");
+	  CGContextSelectFont( GetContext(xd), CurrFont, size,kCGEncodingFontSpecific);
      break;
      default:
         if(xd->family)
             strcpy(CurrFont,xd->family);
         else
             strcpy(CurrFont,"Helvetica");
+		    CGContextSelectFont( GetContext(xd), CurrFont, size, kCGEncodingMacRoman);
      break;
+    }
+/* This is needed for test only purposes
+    if(strcmp(CurrFont,"Symbol")==0)
-    CGContextSelectFont( GetContext(xd), CurrFont, size, kCGEncodingMacRoman);
+     CGContextSelectFont( GetContext(xd), CurrFont, size, kCGEncodingFontSpecific);
+*/
     CopyCStringToPascal(CurrFont,CurrFontName);
     GetFNum(CurrFontName, &CurrFontId);
     TextSize(size);
     TextFont(CurrFontId);
     SetPort(savePort);
+}
+Boolean IsThisASymbol(unsigned char c);
+Boolean IsThisASymbol(unsigned char c){
+ int i;
+ for(i=0; i <  MAX_NON_SYMBS; i++){
+  if(c == NotSymbols[i])
+   return(false);
+  }
+  return(true);
+}
+/* This new version of Quartz_Text handles correctly the symbol font under Panther */
 static void 	Quartz_Text(double x, double y, char *str,
 			    double rot, double hadj,
 			    R_GE_gcontext *gc,
 			    NewDevDesc *dd)
+{
     int len,i;
     char *buf=NULL;
+	char symbuf;
     unsigned char tmp;
     QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
     CGContextSaveGState( GetContext(xd) );
     CGContextTranslateCTM( GetContext(xd), x, y );
     CGContextScaleCTM( GetContext(xd) , -1, 1);
     CGContextSetTextDrawingMode( GetContext(xd), kCGTextFill );
     Quartz_SetFill(gc->col, gc->gamma, dd);
     Quartz_SetFont(gc->fontface, gc->cex,  gc->ps, dd);
     len = strlen(str);
-    if(gc->fontface == 5)
+    if( (gc->fontface == 5) && (len==1) ){
+	   tmp = (unsigned char)str[0];
+       if(tmp>31)
+        symbuf = (char)Lat2Uni[tmp-31-1];
+	   else
+	    symbuf = str[0];
+       if( !IsThisASymbol(tmp) ){
+		 Quartz_SetFont(-1, gc->cex,  gc->ps, dd);
+		 symbuf = str[0];
+       }
-     CGContextShowTextAtPoint( GetContext(xd), 0, 0, str, strlen(str) );
+     CGContextShowTextAtPoint( GetContext(xd), 0, 0, &symbuf, len );
-    else {
+     } else {
      if( (buf = malloc(len)) != NULL){
       for(i=0;i <len;i++){
         tmp = (unsigned char)str[i];
       if(tmp>127)
        buf[i] = (char)Lat2Mac[tmp-127-1];
+    }
     CGContextRestoreGState( GetContext(xd) );
+}
 static void 	Quartz_Rect(double x0, double y0, double x1, double y1,
 			    R_GE_gcontext *gc,
 			    NewDevDesc *dd)
+{
     QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
 static void 	Quartz_Hold(NewDevDesc *dd)
+{
  return;
+}
+#if !defined(FixedToFloat)
-#define FixedToFloat(a)	((float)(a) / fixed1)
+# define FixedToFloat(a)	((float)(a) / fixed1)
-#define FloatToFixed(a)	((Fixed)((float) (a) * fixed1))
+# define FloatToFixed(a)	((Fixed)((float) (a) * fixed1))
+#endif
 static void 	Quartz_MetricInfo(int c,
 				  R_GE_gcontext *gc,
 				  double* ascent, double* descent,
 				  double* width,
     QuartzDesc *xd = (QuartzDesc *) dd-> deviceSpecific;
     char testo[2];
     CGrafPtr savedPort;
     Rect bounds;
     CGPoint position;
+	unsigned char tmp;
     testo[0] = c;
     testo[1] = '\0';
     GetPort(&savedPort);
     CGContextTranslateCTM( GetContext(xd), 0, 0 );
     CGContextScaleCTM( GetContext(xd), -1, 1);
     CGContextRotateCTM( GetContext(xd), -1.0 * 3.1416);
     CGContextSetTextDrawingMode( GetContext(xd), kCGTextInvisible );
     Quartz_SetFont(gc->fontface, gc->cex,  gc->ps, dd);
+	tmp = (unsigned char)c;
+    if( (gc->fontface == 5) ){
+       if( (tmp>31) && IsThisASymbol(tmp))
+        testo[0] = (char)Lat2Uni[tmp-31-1];
+       else
+		Quartz_SetFont(-1, gc->cex,  gc->ps, dd);
+	 } else {
+        if(tmp>127)
+         testo[0] = (char)Lat2Mac[tmp-127-1];
+     }
     CGContextShowTextAtPoint( GetContext(xd), 0, 0, testo, 1 );
     position = CGContextGetTextPosition( GetContext(xd) );
     CGContextRestoreGState( GetContext(xd) );
         QDTextBounds(1,testo,&bounds);
         *ascent = -bounds.top;

The R Project SVN R

(root)/branches/R-Win-CMD/src/unix/devQuartz.c – Rev 28254 → 28362