Merge branch 'feature/primitiveExportTypes'

IconJar · Dec 12, 2019 · 7f7321e · 7f7321e
2 parents 63586f1 + d0878c9
commit 7f7321e
Show file tree

Hide file tree

Showing 144 changed files with 9,436 additions and 8,377 deletions.
diff --git a/Framework/IJSVG/IJSVG.xcodeproj/project.pbxproj b/Framework/IJSVG/IJSVG.xcodeproj/project.pbxproj
diff --git a/Framework/IJSVG/IJSVG.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Framework/IJSVG/IJSVG.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Framework/IJSVG/IJSVG.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Framework/IJSVG/IJSVG.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...proj/project.xcworkspace/xcuserdata/curtishard.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/curtishard.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Framework/IJSVG/IJSVG.xcodeproj/xcshareddata/xcschemes/IJSVG.xcscheme b/Framework/IJSVG/IJSVG.xcodeproj/xcshareddata/xcschemes/IJSVG.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1120"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "594CF46E238FF38E009B251B"
+               BuildableName = "IJSVG.framework"
+               BlueprintName = "IJSVG"
+               ReferencedContainer = "container:IJSVG.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "594CF46E238FF38E009B251B"
+            BuildableName = "IJSVG.framework"
+            BlueprintName = "IJSVG"
+            ReferencedContainer = "container:IJSVG.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...JSVG/IJSVG.xcodeproj/xcuserdata/curtishard.xcuserdatad/xcschemes/xcschememanagement.plist b/...JSVG/IJSVG.xcodeproj/xcuserdata/curtishard.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>IJSVG.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>594CF46E238FF38E009B251B</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Framework/IJSVG/IJSVG/Info.plist b/Framework/IJSVG/IJSVG/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Curtis Hard. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/source/IJSVGBezierPathAdditions.h → ...urce/Additions/IJSVGBezierPathAdditions.h b/source/IJSVGBezierPathAdditions.h → ...urce/Additions/IJSVGBezierPathAdditions.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //
 
+#import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
 @interface NSBezierPath (IJSVGAdditions)

diff --git a/source/IJSVGBezierPathAdditions.m → ...urce/Additions/IJSVGBezierPathAdditions.m b/source/IJSVGBezierPathAdditions.m → ...urce/Additions/IJSVGBezierPathAdditions.m
@@ -15,9 +15,9 @@ - (void)addQuadCurveToPoint:(CGPoint)QP2
 {
     CGPoint QP0 = [self currentPoint];
     CGPoint CP3 = QP2;
-    CGPoint CP1 = CGPointMake( QP0.x + ((2.0 / 3.0) * (QP1.x - QP0.x)), QP0.y + ((2.0 / 3.0) * (QP1.y - QP0.y)));
-    CGPoint CP2 = CGPointMake( QP2.x + (2.0 / 3.0) * (QP1.x - QP2.x), QP2.y + (2.0 / 3.0) * (QP1.y - QP2.y) );
-    
+    CGPoint CP1 = CGPointMake(QP0.x + ((2.0 / 3.0) * (QP1.x - QP0.x)), QP0.y + ((2.0 / 3.0) * (QP1.y - QP0.y)));
+    CGPoint CP2 = CGPointMake(QP2.x + (2.0 / 3.0) * (QP1.x - QP2.x), QP2.y + (2.0 / 3.0) * (QP1.y - QP2.y));
+
     [self curveToPoint:CP3
          controlPoint1:CP1
          controlPoint2:CP2];

diff --git a/source/IJSVGStringAdditions.h → ...G/Source/Additions/IJSVGStringAdditions.h b/source/IJSVGStringAdditions.h → ...G/Source/Additions/IJSVGStringAdditions.h
@@ -13,6 +13,6 @@
 - (NSArray<NSString *> *)ijsvg_componentsSeparatedByChars:(char *)aChar;
 - (BOOL)ijsvg_isNumeric;
 - (BOOL)ijsvg_containsAlpha;
-- (NSArray *)ijsvg_componentsSplitByWhiteSpace;
+- (NSArray*)ijsvg_componentsSplitByWhiteSpace;
 
 @end
diff --git a/source/IJSVGStringAdditions.m → ...G/Source/Additions/IJSVGStringAdditions.m b/source/IJSVGStringAdditions.m → ...G/Source/Additions/IJSVGStringAdditions.m
@@ -10,50 +10,49 @@
 
 @implementation NSString (IJSVGAdditions)
 
-- (NSArray<NSString *> *)ijsvg_componentsSeparatedByChars:(char *)aChar
+- (NSArray<NSString*>*)ijsvg_componentsSeparatedByChars:(char*)aChar
 {
-    NSMutableArray * comp = [[[NSMutableArray alloc] init] autorelease];
+    NSMutableArray* comp = [[[NSMutableArray alloc] init] autorelease];
     NSInteger length = self.length;
-    unichar * chars = (unichar *)calloc(sizeof(unichar),self.length);
-    
+    unichar* chars = (unichar*)calloc(sizeof(unichar), self.length);
+
     NSInteger ind = 0;
     BOOL startedString = NO;
-    
+
     // block for easy comparison
     NSUInteger aLength = strlen(aChar);
     BOOL (^charsContainsChar)(char anotherChar) = ^(char anotherChar) {
-        for(NSInteger i = 0; i < aLength; i++) {
-            if(aChar[i] == anotherChar) {
+        for (NSInteger i = 0; i < aLength; i++) {
+            if (aChar[i] == anotherChar) {
                 return YES;
             }
         }
         return NO;
     };
-    
-    for(NSInteger i = 0; i < length; i++) {
-        
+
+    for (NSInteger i = 0; i < length; i++) {
+
         // the char
         unichar theChar = [self characterAtIndex:i];
-        
+
         // start the buffer
         BOOL isEqualToChar = charsContainsChar(theChar);
-        if(isEqualToChar == NO) {
+        if (isEqualToChar == NO) {
             startedString = YES;
             chars[ind++] = theChar;
         }
-        
+
         // has started and char is the search char, or its at end
-        if((startedString == YES && isEqualToChar) ||
-           (i == (length-1) && startedString == YES)) {
+        if ((startedString == YES && isEqualToChar) || (i == (length - 1) && startedString == YES)) {
             startedString = NO;
-            
+
             // append the comp
             [comp addObject:[NSString stringWithCharacters:chars length:ind]];
             free(chars);
-            
+
             // restart and realloc the memory
             ind = 0;
-            chars = (unichar *)calloc(sizeof(unichar), self.length);
+            chars = (unichar*)calloc(sizeof(unichar), self.length);
         }
     }
     free(chars);
@@ -62,10 +61,10 @@ @implementation NSString (IJSVGAdditions)
 
 - (BOOL)ijsvg_containsAlpha
 {
-    const char * buffer = self.UTF8String;
+    const char* buffer = self.UTF8String;
     unsigned long length = strlen(buffer);
-    for( int i = 0; i < length; i++ ) {
-        if( isalpha(buffer[i]) ) {
+    for (int i = 0; i < length; i++) {
+        if (isalpha(buffer[i])) {
             return YES;
         }
     }
@@ -74,19 +73,19 @@ - (BOOL)ijsvg_containsAlpha
 
 - (BOOL)ijsvg_isNumeric
 {
-    const char * buffer = self.UTF8String;
+    const char* buffer = self.UTF8String;
     unsigned long length = strlen(buffer);
-    for(int i = 0; i < length; i++) {
-        if(!isnumber(buffer[i])) {
+    for (int i = 0; i < length; i++) {
+        if (!isnumber(buffer[i])) {
             return NO;
         }
     }
     return YES;
 }
 
-- (NSArray *)ijsvg_componentsSplitByWhiteSpace
+- (NSArray*)ijsvg_componentsSplitByWhiteSpace
 {
-    return [self componentsSeparatedByChars:"\t\n\r "];
+    return [self ijsvg_componentsSeparatedByChars:"\t\n\r "];
 }
 
 @end
diff --git a/source/IJSVGColor.h → ...rk/IJSVG/IJSVG/Source/Colors/IJSVGColor.h b/source/IJSVGColor.h → ...rk/IJSVG/IJSVG/Source/Colors/IJSVGColor.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //
 
+#import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
 typedef NS_OPTIONS(NSInteger, IJSVGColorStringOptions) {
@@ -16,7 +17,7 @@ typedef NS_OPTIONS(NSInteger, IJSVGColorStringOptions) {
     IJSVGColorStringOptionDefault = IJSVGColorStringOptionAllowShortHand
 };
 
-typedef NS_ENUM( NSInteger, IJSVGPredefinedColor ) {
+typedef NS_ENUM(NSInteger, IJSVGPredefinedColor) {
     IJSVGColorAliceblue,
     IJSVGColorAntiquewhite,
     IJSVGColorAqua,
@@ -168,29 +169,29 @@ typedef NS_ENUM( NSInteger, IJSVGPredefinedColor ) {
 
 @interface IJSVGColor : NSObject
 
-CGFloat * IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightness);
+CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightness);
 
-+ (NSColor *)computeColorSpace:(NSColor *)color;
-+ (NSColorSpace *)defaultColorSpace;
-+ (BOOL)isColor:(NSString *)string;
-+ (NSString *)colorStringFromColor:(NSColor *)color
-                           options:(IJSVGColorStringOptions)options;
-+ (NSString *)colorStringFromColor:(NSColor *)color;
-+ (NSColor *)colorFromHEXInteger:(NSInteger)hex;
-+ (NSColor *)computeColor:(id)colour;
-+ (NSColor *)colorFromString:(NSString *)string;
-+ (NSColor *)colorFromHEXString:(NSString *)string;
-+ (NSColor *)colorFromHEXString:(NSString *)string
-         containsAlphaComponent:(BOOL *)containsAlphaComponent;
++ (NSColor*)computeColorSpace:(NSColor*)color;
++ (NSColorSpace*)defaultColorSpace;
++ (BOOL)isColor:(NSString*)string;
++ (NSString*)colorStringFromColor:(NSColor*)color
+                          options:(IJSVGColorStringOptions)options;
++ (NSString*)colorStringFromColor:(NSColor*)color;
++ (NSColor*)colorFromHEXInteger:(NSInteger)hex;
++ (NSColor*)computeColor:(id)colour;
++ (NSColor*)colorFromString:(NSString*)string;
++ (NSColor*)colorFromHEXString:(NSString*)string;
++ (NSColor*)colorFromHEXString:(NSString*)string
+        containsAlphaComponent:(BOOL*)containsAlphaComponent;
 + (BOOL)HEXContainsAlphaComponent:(NSUInteger)hex;
 + (unsigned long)lengthOfHEXInteger:(NSUInteger)hex;
-+ (NSColor *)colorFromRString:(NSString *)rString
-                      gString:(NSString *)gString
-                      bString:(NSString *)bString
-                      aString:(NSString *)aString;
-+ (NSColor *)colorFromPredefinedColorName:(NSString *)name;
-+ (NSString *)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
-+ (NSColor *)changeAlphaOnColor:(NSColor *)color
-                             to:(CGFloat)alphaValue;
++ (NSColor*)colorFromRString:(NSString*)rString
+                     gString:(NSString*)gString
+                     bString:(NSString*)bString
+                     aString:(NSString*)aString;
++ (NSColor*)colorFromPredefinedColorName:(NSString*)name;
++ (NSString*)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
++ (NSColor*)changeAlphaOnColor:(NSColor*)color
+                            to:(CGFloat)alphaValue;
 
 @end