Update for OS X 10.10

Author: jjgod

AppController.m

@@ -52,7 +52,7 @@ + (void)initialize {
 
   [appDefaults setValue:@"#000000" forKey:@"foregroundColor"];
   [appDefaults setValue:@"#FFFFFF" forKey:@"backgroundColor"];
-  [appDefaults setValue:@"STKaiti" forKey:@"fontName"];
+  [appDefaults setValue:@"STKaiti-SC-Regular" forKey:@"fontName"];
   [appDefaults setValue:@24.0 forKey:@"fontSize"];
   [appDefaults setValue:@1.1 forKey:@"lineHeight"];
   [appDefaults setValue:[NSMutableDictionary dictionaryWithCapacity:20]

TTDocument.m

@@ -75,7 +75,6 @@ - (void)close {
 }
 
 - (void)dealloc {
-
   NSArray* keyPaths =
       @[ @"backgroundColor", @"lineHeight", @"fontName", @"fontSize" ];
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
@@ -115,15 +114,10 @@ - (NSData*)dataOfType:(NSString*)typeName error:(NSError**)outError {
 
 - (NSDictionary*)attributesForText {
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-  NSDictionary* descriptorAttributes =
-      @{(NSString*)kCTFontNameAttribute : [defaults stringForKey:@"fontName"]};
-  CTFontDescriptorRef cjkDescriptor = CTFontDescriptorCreateWithAttributes(
-      (CFDictionaryRef)descriptorAttributes);
-
-  CTFontDescriptorRef descriptor = cjkDescriptor;
-  CTFontRef font = CTFontCreateWithFontDescriptor(
-      descriptor, [defaults doubleForKey:@"fontSize"], NULL);
-  CFRelease(descriptor);
+  CTFontRef font =
+      CTFontCreateWithName((CFStringRef)[defaults stringForKey:@"fontName"],
+                           [defaults doubleForKey:@"fontSize"],
+                           NULL);
   NSDictionary* attributes =
       @{(NSString*)kCTFontAttributeName : CFBridgingRelease(font)};
   return attributes;
@@ -239,15 +233,12 @@ - (BOOL)readFromURL:(NSURL*)absoluteURL
                                    NSRange tokenRange,
                                    NSRange sentenceRange,
                                    BOOL* stop) {
-                          if ([tag isEqualToString:@"Latn"]) {
-                            NSString* token =
-                                [tagger.string substringWithRange:tokenRange];
-                            NSLog(@"%@", token);
-                            [fileContents
-                                addAttribute:(NSString*)kCTFontAttributeName
-                                       value:latinFont
-                                       range:tokenRange];
-                          }
+                        if (![tag hasPrefix:@"Han"]) {
+                          [fileContents
+                              addAttribute:(NSString*)kCTFontAttributeName
+                                     value:latinFont
+                                     range:tokenRange];
+                        }
                       }];
   }
 

TTTextView.mm

@@ -99,13 +99,10 @@ - (void)invalidateLayout {
       [[NSUserDefaults standardUserDefaults] doubleForKey:@"lineHeight"];
   _lineHeight = ceil(_lineHeight);
 
-  CGFloat scrollerWidth = [NSScroller isCompatibleWithOverlayScrollers]
-                                  ? 0
-                                  : [NSScroller scrollerWidth];
   CGRect frameRect =
       CGRectMake(textInset.width,
                  textInset.height,
-                 contentSize.width - 2 * textInset.width - scrollerWidth,
+                 contentSize.width - 2 * textInset.width,
                  contentSize.height - textInset.height);
 
   TTLineData lineData = {NULL, CGPointMake(0, 0)};