Add support for Swift Package Manager

.gitignore

@@ -52,3 +52,7 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/screenshots
+
+# Swift Package Manager 
+.swiftpm/  
+.build/

Package.swift

@@ -0,0 +1,40 @@
+// swift-tools-version: 5.6
+
+import PackageDescription
+
+let package = Package(
+  name: "iosMath",
+  defaultLocalization: "en",
+  platforms: [.iOS(.v10), .macOS(.v11)],
+  products: [
+    .library(
+      name: "iosMath",
+      targets: ["iosMath"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "iosMath",
+      dependencies: [],
+      path: "./iosMath",
+      resources: [
+        .process("fonts")
+      ],
+      cSettings: [
+        .headerSearchPath("./render"),
+        .headerSearchPath("./lib"),
+        .headerSearchPath("./render/internal"),
+        // Prevent NSAssert from crashing the app in release builds
+        .define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release)),
+      ]
+    ),
+    .testTarget(
+      name: "iosMathTests",
+      dependencies: ["iosMath"],
+      path: "iosMathTests",
+      cSettings: [
+        .headerSearchPath("../iosMath/render"),
+      ]
+    ),
+  ]
+)

README.md

@@ -46,6 +46,23 @@ Additionally for MacOS it requires:
 
 ## Installation
 
+### Swift Package Manager
+To install iosMath using [Swift Package Manager](https://github.com/apple/swift-package-manager):
+
+1. In Xcode, select "File" -> "Add Packages"
+2. Enter `https://github.com/kostub/iosMath.git`
+
+Alternatively, add iosMath to a `Package.swift`:
+
+```
+dependencies: [
+  .package(url: "https://github.com/kostub/iosMath.git", branch: "master")
+  // Any other dependencies you have...
+],
+```
+
+You can also follow the [tutorial from developer.apple.com](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app).
+
 ### Cocoapods
 
 iosMath is available through [CocoaPods](http://cocoapods.org). To install

iosMath/fonts

@@ -0,0 +1 @@
+../fonts

iosMath/include/MTConfig.h

@@ -0,0 +1 @@
+../render/MTConfig.h

iosMath/include/MTFont.h

@@ -0,0 +1 @@
+../render/MTFont.h

iosMath/include/MTFontManager.h

@@ -0,0 +1 @@
+../render/MTFontManager.h

iosMath/include/MTLabel.h

@@ -0,0 +1 @@
+../render/MTLabel.h

iosMath/include/MTMathAtomFactory.h

@@ -0,0 +1 @@
+../lib/MTMathAtomFactory.h

iosMath/include/MTMathList.h

@@ -0,0 +1 @@
+../lib/MTMathList.h

iosMath/include/MTMathListBuilder.h

@@ -0,0 +1 @@
+../lib/MTMathListBuilder.h

iosMath/include/MTMathListDisplay.h

@@ -0,0 +1 @@
+../render/MTMathListDisplay.h

iosMath/include/MTMathListIndex.h

@@ -0,0 +1 @@
+../lib/MTMathListIndex.h

iosMath/include/MTMathUILabel.h

@@ -0,0 +1 @@
+../render/MTMathUILabel.h

iosMath/include/MTTypesetter.h

@@ -0,0 +1 @@
+../render/internal/MTTypesetter.h

iosMath/include/MTUnicode.h

@@ -0,0 +1 @@
+../lib/MTUnicode.h

iosMath/include/NSBezierPath+addLineToPoint.h

@@ -0,0 +1 @@
+../render/NSBezierPath+addLineToPoint.h

iosMath/include/NSColor+HexString.h

@@ -0,0 +1 @@
+../render/NSColor+HexString.h

iosMath/include/NSView+backgroundColor.h

@@ -0,0 +1 @@
+../render/NSView+backgroundColor.h

iosMath/include/UIColor+HexString.h

@@ -0,0 +1 @@
+../render/UIColor+HexString.h

iosMath/render/MTFont.m

@@ -33,10 +33,10 @@ - (instancetype)initFontWithName:(NSString *)name size:(CGFloat)size
         NSBundle* bundle = [MTFont fontBundle];
         NSString* fontPath = [bundle pathForResource:name ofType:@"otf"];
         CGDataProviderRef fontDataProvider = CGDataProviderCreateWithFilename(fontPath.UTF8String);
-        self.defaultCGFont = CGFontCreateWithDataProvider(fontDataProvider);
+        _defaultCGFont = CGFontCreateWithDataProvider(fontDataProvider);
         CFRelease(fontDataProvider);
 
-        self.ctFont = CTFontCreateWithGraphicsFont(self.defaultCGFont, size, nil, nil);
+        _ctFont = CTFontCreateWithGraphicsFont(self.defaultCGFont, size, nil, nil);
 
         NSString* mathTablePlist = [bundle pathForResource:name ofType:@"plist"];
         NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:mathTablePlist];
@@ -69,6 +69,9 @@ - (void)setCtFont:(CTFontRef)ctFont {
 
 + (NSBundle*) fontBundle
 {
+#ifdef SWIFTPM_MODULE_BUNDLE
+    return SWIFTPM_MODULE_BUNDLE;
+#endif
     // Uses bundle for class so that this can be access by the unit tests.
     return [NSBundle bundleWithURL:[[NSBundle bundleForClass:[self class]] URLForResource:@"mathFonts" withExtension:@"bundle"]];
 }
@@ -77,11 +80,11 @@ - (MTFont *)copyFontWithSize:(CGFloat)size
 {
     MTFont* copyFont = [[[self class] alloc] init];
     copyFont.defaultCGFont = self.defaultCGFont;
-    // Retain the font as we are adding another reference to it.
-    CGFontRetain(copyFont.defaultCGFont);
-    copyFont.ctFont = CTFontCreateWithGraphicsFont(self.defaultCGFont, size, nil, nil);
+    CTFontRef newCtFont = CTFontCreateWithGraphicsFont(self.defaultCGFont, size, nil, nil);
+    copyFont.ctFont = newCtFont;
     copyFont.rawMathTable = self.rawMathTable;
     copyFont.mathTable = [[MTFontMathTable alloc] initWithFont:copyFont mathTable:copyFont.rawMathTable];
+    CFRelease(newCtFont);
     return copyFont;
 }
 

iosMath/render/MTFontManager.h

@@ -20,6 +20,9 @@
 /** Get the singleton instance of MTFontManager. */
 + (nonnull instancetype) fontManager;
 
+/** Swift friendly version of `fontManager`. */
++ (nonnull instancetype) sharedInstance;
+
 /** Returns the default font, which is Latin Modern Math with 20pt */
 - (nonnull MTFont*) defaultFont;
 

iosMath/render/MTFontManager.m

@@ -31,6 +31,11 @@ + (instancetype) fontManager
     return manager;
 }
 
++ (instancetype) sharedInstance
+{
+    return [MTFontManager fontManager];
+}
+
 - (instancetype)init
 {
     self = [super init];

iosMath/render/UIColor+HexString.h

@@ -8,6 +8,8 @@
 
 #if TARGET_OS_IPHONE
 
+@import UIKit;
+
 @interface UIColor (HexString)
 
 + (UIColor *)colorFromHexString:(NSString *)hexString;