NS Scroll View Magnification

AppKit/NSDocument.m

@@ -426,6 +426,10 @@ - (void) updateChangeCount: (NSDocumentChangeType) changeType {
     case NSChangeAutosaved:
         NSUnimplementedMethod();
         break;
+
+    case NSChangeRedone:
+        _changeCount++; //Opposite of Undo - this may be wrong
+        break;
     }
 
     BOOL edited = [self isDocumentEdited];
@@ -467,6 +471,7 @@ - (BOOL) readFromURL: (NSURL *) url
         if ([self _isSelectorOverridden: @selector(readFromFile:ofType:)]) {
             return [self readFromFile: [url path] ofType: type];
         } else {
+
             NSFileWrapper *fileWrapper = [[[NSFileWrapper alloc]
                     initWithPath: [url path]] autorelease];
 
@@ -695,8 +700,8 @@ - (void) runModalSavePanelForSaveOperation: (NSSaveOperationType) operation
 
 #if 0
     // setAllowedFileTypes: is unimplemented - so don't call it.
-	NSArray* writableTypes = [self writableTypesForSaveOperation: operation];
-	[savePanel setAllowedFileTypes: writableTypes];
+    NSArray* writableTypes = [self writableTypesForSaveOperation: operation];
+    [savePanel setAllowedFileTypes: writableTypes];
 #endif
 
     if ([self prepareSavePanel: savePanel] == NO) {
@@ -1197,9 +1202,8 @@ - (NSFileWrapper *) fileWrapperRepresentationOfType: (NSString *) type {
     return self;
 }
 
-- initWithContentsOfURL: (NSURL *) url ofType: (NSString *) type {
+- (id) initWithContentsOfURL: (NSURL *) url ofType: (NSString *) type {
     NSError *error;
-
     [self init];
 
     error = nil;
@@ -1223,6 +1227,7 @@ - (NSFileWrapper *) fileWrapperRepresentationOfType: (NSString *) type {
     return self;
 }
 
+
 - (BOOL) loadDataRepresentation: (NSData *) data ofType: (NSString *) type {
     [NSException raise: NSInternalInconsistencyException
                 format: @"-[%@ %s]", [self class], sel_getName(_cmd)];
@@ -1507,4 +1512,18 @@ - (void) performSynchronousFileAccessUsingBlock: (void (^)(void)) block {
     block();
 }
 
+- (void) saveToURL: (NSURL *) url
+            ofType: (NSString *) typeName
+  forSaveOperation: (NSSaveOperationType) saveOperation
+ completionHandler: (void (^)(NSError *errorOrNil)) completionHandler
+ {
+    NSUnimplementedMethod();
+}
+
+- (void) autosaveWithImplicitCancellability: (BOOL) autosavingIsImplicitlyCancellable
+                          completionHandler: (void (^)(NSError *errorOrNil)) completionHandler
+{
+    NSUnimplementedMethod();
+}
+
 @end

AppKit/NSDocumentController.m

@@ -30,14 +30,50 @@ this software and associated documentation files (the "Software"), to deal in
 
 @interface _NSUnsupportedDocument : NSObject
 
-- initWithType: (NSString *) type error: (NSError **) error;
+- (instancetype) initWithType: (NSString *) type error: (NSError **) error;
+- (instancetype) initWithContentsOfURL: (NSURL *) url
+                                ofType: (NSString *) typeName
+                                 error: (NSError *_Nullable *) outError;
+- (id) initWithContentsOfURL: (NSURL *) url ofType: (NSString *) typeName;
+- (id) initWithContentsOfFile: (NSString *) absolutePath
+                       ofType: (NSString *) typeName;
 
 @end
 
 @implementation _NSUnsupportedDocument
 
-- initWithType: (NSString *) type error: (NSError **) error {
-    *error = [NSError errorWithDomain:NSCocoaErrorDomain code: NSFeatureUnsupportedError userInfo: nil];
+- (instancetype) initWithType: (NSString *) type error: (NSError **) error {
+    *error = [NSError errorWithDomain: NSCocoaErrorDomain
+                                 code: NSFeatureUnsupportedError
+                             userInfo: nil];
+    [self release];
+    return nil;
+}
+
+- (instancetype) initWithContentsOfURL: (NSURL *) url
+                                ofType: (NSString *) typeName
+                                 error: (NSError *_Nullable *) outError
+{
+
+    if (outError) {
+        *outError = [NSError errorWithDomain: NSCocoaErrorDomain
+                                        code: NSFeatureUnsupportedError
+                                    userInfo: nil];
+    }
+
+    [self release];
+    return nil;
+}
+
+- (id) initWithContentsOfURL: (NSURL *) url ofType: (NSString *) typeName {
+    [self release];
+    return nil;
+}
+
+- (id) initWithContentsOfFile: (NSString *) absolutePath
+                       ofType: (NSString *) typeName
+{
+    [self release];
     return nil;
 }
 
@@ -141,10 +177,15 @@ - (NSString *) displayNameForType: (NSString *) type {
 }
 
 - (Class) documentClassForType: (NSString *) type {
-    NSDictionary *info = [self _infoForType: type];
-    NSString *result = [info objectForKey: @"NSDocumentClass"];
+    NSString *result = nil;
+    for (NSDictionary *fileType in _fileTypes) {
+        if ([type isEqualToString: [fileType objectForKey: @"CFBundleTypeName"]]) {
+            result = [fileType objectForKey: @"NSDocumentClass"];
+            break;
+        }
+    }
 
-    return (result == nil) ? [_NSUnsupportedDocument class] : NSClassFromString(result);
+    return (result == nil) ? nil : NSClassFromString(result);
 }
 
 - (NSArray *) fileExtensionsFromType: (NSString *) type {
@@ -168,13 +209,13 @@ - (NSArray *) _allFileExtensions {
 
 - (NSString *) typeFromFileExtension: (NSString *) extension {
     extension = [extension lowercaseString];
-
     for (NSDictionary *fileType in _fileTypes)
         for (NSString *name in
-             [fileType objectForKey: @"CFBundleTypeExtensions"])
+             [fileType objectForKey: @"CFBundleTypeExtensions"]) {
             if ([[name lowercaseString] isEqual: extension] ||
                 [name isEqual: @"*"])
                 return [fileType objectForKey: @"CFBundleTypeName"];
+        }
 
     return nil;
 }
@@ -259,7 +300,21 @@ - (NSString *) typeForContentsOfURL: (NSURL *) url error: (NSError **) error {
     if (extension == nil)
         return nil;
 
-    return [self typeFromFileExtension: extension];
+    NSString *UTI;
+
+    BOOL success = [url getResourceValue: &UTI
+                                  forKey: NSURLTypeIdentifierKey
+                                   error: error];
+    if (!success) {
+        return nil;
+    }
+
+    for(NSDictionary *fileType in _fileTypes) {
+        if ([[fileType objectForKey: @"LSItemContentTypes"] containsObject: UTI]) {
+            return [fileType objectForKey: @"CFBundleTypeName"];
+        }
+    }
+    return nil;
 }
 
 - makeDocumentWithContentsOfFile: (NSString *) path ofType: (NSString *) type {
@@ -281,7 +336,6 @@ - (NSString *) typeForContentsOfURL: (NSURL *) url error: (NSError **) error {
 
     result = [[[class alloc] initWithContentsOfURL: url
                                             ofType: type] autorelease];
-
     return result;
 }
 
@@ -367,7 +421,6 @@ - (id) makeUntitledDocumentOfType: (NSString *) type
 
 - openUntitledDocumentAndDisplay: (BOOL) display error: (NSError **) error {
     NSString *type = [self defaultType];
-
     /* Cocoa documentation says:
          "For backward binary compatibility with Mac OS X v10.3 and earlier,
           the default implementation of this method instead invokes
@@ -430,13 +483,20 @@ - (id) makeUntitledDocumentOfType: (NSString *) type
         NSDocument *result = [self documentForURL: url];
 
         if (result == nil) {
-            NSString *extension = [[url path] pathExtension];
-            NSString *type = [self typeFromFileExtension: extension];
+            NSError *type_error = nil;
+            NSString *type = [self typeForContentsOfURL: url
+                                                  error: &type_error];
+
+            if (type_error) {
+                if (error) {
+                    *error = type_error;
+                }
+                return result;
+            }
 
             result = [self makeDocumentWithContentsOfURL: url
                                                   ofType: type
                                                    error: error];
-
             if (result != nil) {
                 [self addDocument: result];
                 [result makeWindowControllers];

AppKit/NSMutableAttributedString.m

@@ -203,4 +203,22 @@ - (void) applyFontTraits: (NSFontTraitMask) traits range: (NSRange) range {
     [self endEditing];
 }
 
+- (BOOL) readFromURL: (NSURL *) url
+             options: (NSDictionary<NSAttributedStringDocumentReadingOptionKey, id> *) opts
+  documentAttributes: (NSDictionary<NSAttributedStringDocumentAttributeKey, id> *_Nullable *) dict
+               error: (NSError *_Nullable *) error
+{
+    NSAttributedString *str = [NSAttributedString alloc];
+    str = [str initWithURL: url
+                   options: opts
+        documentAttributes: dict
+                     error: error];
+    if (str == nil) {
+        return NO;
+    }
+    [self setAttributedString: str];
+    [str release];
+    return YES;
+}
+
 @end

AppKit/NSMutableParagraphStyle.m

@@ -128,9 +128,29 @@ - (void) setDefaultTabInterval: (CGFloat) interval {
 }
 
 - (void) setTabStops: (NSArray *) tabStops {
-    tabStops = [tabStops copy];
-    [_tabStops release];
-    _tabStops = tabStops;
+    if (tabStops != _tabStops) {
+        [_tabStops removeAllObjects];
+        [_tabStops addObjectsFromArray: tabStops];
+        [_tabStops sortUsingSelector: @selector(compare:)];
+    }
+}
+
+- (void) addTabStop: (NSTextTab *) tabStop {
+    NSUInteger index = [_tabStops
+            indexOfObjectPassingTest: ^BOOL(NSTextTab *other, NSUInteger id,
+                                            BOOL *stop) {
+              return [other compare: tabStop] == NSOrderedAscending;
+            }];
+
+    if (index == NSNotFound) {
+        [_tabStops insertObject: tabStop atIndex: 0];
+    } else {
+        [_tabStops insertObject: tabStop atIndex: index];
+    }
+}
+
+- (void) removeTabStop: (NSTextTab *) tabStop {
+    [_tabStops removeObject: tabStop];
 }
 
 - (void) setHyphenationFactor: (float) factor {

AppKit/NSParagraphStyle.m

@@ -34,6 +34,11 @@ + (NSParagraphStyle *) defaultParagraphStyle {
     return shared;
 }
 
++ (NSWritingDirection) defaultWritingDirectionForLanguage: (NSString *) languageName {
+    NSUnimplementedMethod();
+    return NSWritingDirectionNatural;
+}
+
 + (NSArray *) _defaultTabStops {
     static NSArray *shared = nil;
 
@@ -69,7 +74,7 @@ - (void) _initWithDefaults {
     _lineHeightMultiple = 0;
     _lineSpacing = 0;
     _defaultTabInterval = 0;
-    _tabStops = [[[self class] _defaultTabStops] retain];
+    _tabStops = [[[self class] _defaultTabStops] mutableCopy];
     _hyphenationFactor = 0;
     _tighteningFactorForTruncation = 0;
 }