diff -r 3eb7be1dd7b6 -r af9b2b929b03 Source/GGBTextLayer.m
--- a/Source/GGBTextLayer.m	Mon Mar 10 17:30:57 2008 -0700
+++ b/Source/GGBTextLayer.m	Wed Mar 12 15:51:32 2008 -0700
@@ -18,17 +18,36 @@
                                fontSize: (float) fontSize
                               alignment: (enum CAAutoresizingMask) align
 {
+#if TARGET_OS_ASPEN
+    UIFont *font = [UIFont systemFontOfSize: fontSize];
+#else
+    NSFont *font = [NSFont systemFontOfSize: fontSize];
+#endif
+    return [self textLayerInSuperlayer: superlayer
+                              withText: text
+                                  font: font
+                             alignment: align];
+}
+
+
++ (GGBTextLayer*) textLayerInSuperlayer: (CALayer*)superlayer
+                               withText: (NSString*)text
+                                   font: (id)inputFont
+                              alignment: (enum CAAutoresizingMask) align
+{
     GGBTextLayer *label = [[self alloc] init];
     label.string = text;
 
 #if TARGET_OS_ASPEN
-    UIFont *font = [UIFont systemFontOfSize: fontSize];
+    UIFont *font = inputFont;
+    [label setNeedsDisplay];
+    label.needsDisplayOnBoundsChange = YES;
 #else
-    NSFont *font = [NSFont systemFontOfSize: fontSize];
-    label.font = font;
+    NSFont *font = inputFont;
+    label.fontSize = font.pointSize;
 #endif
     
-    label.fontSize = fontSize;
+    label.font = font;
     label.foregroundColor = kBlackColor;
     
     NSString *mode;
@@ -45,29 +64,116 @@
     if( [superlayer respondsToSelector: @selector(borderWidth)] )
         inset += ((GGBLayer*)superlayer).borderWidth;
     CGRect bounds = CGRectInset(superlayer.bounds, inset, inset);
+    if( mode==@"center" )
+        bounds = CGRectInset(bounds,-inset,0);
     CGFloat height = font.ascender;
+    float descender = font.descender;
+#if TARGET_OS_ASPEN
+    descender = -descender;
+#endif
     CGFloat y = bounds.origin.y;
-    if( align & kCALayerHeightSizable )
+    if( align & kCALayerHeightSizable ) {
         y += (bounds.size.height-height)/2.0;
-    else if( align & kCALayerMinYMargin )
+#if TARGET_OS_ASPEN
+        y -= descender/2.0;
+#endif
+    } else if( align & kCALayerMinYMargin )
         y += bounds.size.height - height;
     align &= ~kCALayerHeightSizable;
-    label.bounds = CGRectMake(0, font.descender,
-                              bounds.size.width, height - font.descender);
-    label.position = CGPointMake(bounds.origin.x,y+font.descender);
+    label.bounds = CGRectMake(0, descender,
+                              bounds.size.width, height - descender);
+    label.position = CGPointMake(bounds.origin.x,y+descender);
     label.anchorPoint = CGPointMake(0,0);
     
+#if ! TARGET_OS_ASPEN
     label.autoresizingMask = align;
+#endif
     [superlayer addSublayer: label];
     [label release];
+    
+    //label.borderWidth = 1;
+    //label.borderColor = kBlackColor;
+    
     return label;
 }
 
 
 #if TARGET_OS_ASPEN
-@synthesize string=_string, fontSize=_fontSize, 
+@synthesize string=_string, font=_font, 
             foregroundColor=_foregroundColor, alignmentMode=_alignmentMode;
+
+
+- (id) copyWithZone: (NSZone*)zone
+{
+    GGBTextLayer *clone = [super copyWithZone: zone];
+    clone.string = _string;
+    clone.font = _font;
+    clone.foregroundColor = _foregroundColor;
+    clone.alignmentMode = _alignmentMode;
+    return clone;
+}
+
+
+- (void)drawInContext:(CGContextRef)ctx
+{
+    [super drawInContext: ctx];
+    
+    if( _string.length > 0 ) {
+        CGContextSaveGState(ctx);
+        UIGraphicsPushContext(ctx);
+        
+        if( _foregroundColor )
+            CGContextSetFillColorWithColor(ctx, _foregroundColor);
+        
+        UITextAlignment align;
+        if( [_alignmentMode isEqualToString: @"center"] )
+            align = UITextAlignmentCenter;
+        else if( [_alignmentMode isEqualToString: @"right"] )
+            align = UITextAlignmentRight;
+        else
+            align = UITextAlignmentLeft;
+        
+        CGRect bounds = self.bounds;
+        bounds.origin.y += _font.ascender+_font.descender - _font.leading;
+        [_string drawInRect: bounds 
+                   withFont: _font
+              lineBreakMode: UILineBreakModeClip
+                  alignment: align];
+        
+        UIGraphicsPopContext();
+        CGContextRestoreGState(ctx);
+    }
+}
+
+
 #endif
 
 
 @end
+
+
+/*
+ .times lt mm: (TimesLTMM)
+ times new roman: (TimesNewRomanBoldItalic, TimesNewRomanItalic, TimesNewRoman, TimesNewRomanBold)
+ phonepadtwo: (PhonepadTwo)
+ hiragino kaku gothic pron w3: (HiraKakuProN-W3)
+ helvetica neue: (HelveticaNeueBold, HelveticaNeue)
+ trebuchet ms: (TrebuchetMSItalic, TrebuchetMSBoldItalic, TrebuchetMSBold, TrebuchetMS)
+ courier new: (CourierNewBoldItalic, CourierNewBold, CourierNewItalic, CourierNew)
+ arial unicode ms: (arialuni)
+ georgia: (Georgia, GeorgiaBold, GeorgiaBoldItalic, GeorgiaItalic)
+ zapfino: (Zapfino)
+ arial rounded mt bold: (ArialRoundedMTBold)
+ db lcd temp: (DB_LCD_Temp-Black)
+ verdana: (Verdana, VerdanaItalic, VerdanaBoldItalic, VerdanaBold)
+ american typewriter: (AmericanTypewriterCondensedBold, AmericanTypewriter)
+ helvetica: (HelveticaBoldOblique, Helvetica, HelveticaOblique, HelveticaBold)
+ lock clock: (LockClock)
+ courier: (CourierBoldOblique, CourierOblique)
+ hiragino kaku gothic pron w6: (HiraKakuProN-W6)
+ arial: (ArialItalic, ArialBold, Arial, ArialBoldItalic)
+ .helvetica lt mm: (HelveticaLTMM)
+ stheiti: (STHeiti, STXihei)
+ applegothic: (AppleGothicRegular)
+ marker felt: (MarkerFeltThin)
+*/
\ No newline at end of file