CGTextRenderer

Author: swhitty

CommandLine/CommandLine.swift

@@ -71,7 +71,7 @@ extension SwiftDraw.CommandLine {
   static func processImage(config: Configuration) -> Data? {
     switch config.format {
     case .swift:
-      let code = Image.cgCodeText(fileURL: config.input)
+      let code = CGTextRenderer.render(fileURL: config.input)
       return code?.data(using: .utf8)
     case .jpeg, .pdf, .png:
       return SwiftDraw.Image(fileURL: config.input).flatMap { processImage($0, with: config) }
@@ -94,7 +94,7 @@ extension SwiftDraw.CommandLine {
   static func printHelp() {
     print("")
     print("""
-swiftdraw, version 0.7.6
+swiftdraw, version 0.8.0
 copyright (c) 2021 Simon Whitty
 
 usage: swiftdraw <file.svg> [--format png | pdf | jpeg | swift] [--size wxh] [--scale 1x | 2x | 3x]

Examples/Basic/Sources/ViewController.swift

@@ -70,7 +70,7 @@ class ViewController: UIViewController {
         imageView.backgroundColor = .white
         self.view = imageView
 
-        print(Image.cgCodeText(named: "rings.svg")!)
+        print(CGTextRenderer.render(named: "rings.svg")!)
     }
 }
 

Package.swift

@@ -8,7 +8,7 @@ let exclude: [String]
 		"CGPath+Segment.swift",
 		"Renderer.CoreGraphics.swift",
         "Image+CoreGraphics.swift",
-		"Image+CGText.swift",
+		"CGTextRenderer+Code.swift",
         "NSImage+Image.swift",
         "UIImage+Image.swift",
         "CGRendererTests.swift",

SwiftDraw.xcodeproj/project.pbxproj

@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		01FAD0512678CFA9003B6875 /* Renderer.CGText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0502678CFA9003B6875 /* Renderer.CGText.swift */; };
-		01FAD0582678D652003B6875 /* Image+CGText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0572678D652003B6875 /* Image+CGText.swift */; };
+		01FAD0582678D652003B6875 /* CGTextRenderer+Code.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0572678D652003B6875 /* CGTextRenderer+Code.swift */; };
 		01FAD070267A0DA6003B6875 /* LayerTree.CommandOptimizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD06F267A0DA6003B6875 /* LayerTree.CommandOptimizer.swift */; };
 		D90DB39A219CCB9E00D374D2 /* Renderer.CoreGraphicsTypesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90DB397219CCB9E00D374D2 /* Renderer.CoreGraphicsTypesTests.swift */; };
 		D90DB39B219CCB9E00D374D2 /* Renderer.CoreGraphicsTypesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90DB397219CCB9E00D374D2 /* Renderer.CoreGraphicsTypesTests.swift */; };
@@ -225,7 +225,7 @@
 		D9ECAF9B21AADA1E006A5328 /* SwiftDraw.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D962D26D1E6ECD5C00B825C6 /* SwiftDraw.framework */; };
 		D9F33F96267DA1EF00FD3173 /* LayerTree.CommandOptimizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD06F267A0DA6003B6875 /* LayerTree.CommandOptimizer.swift */; };
 		D9F33F97267DA27000FD3173 /* Renderer.CGText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0502678CFA9003B6875 /* Renderer.CGText.swift */; };
-		D9F33F98267DA2E600FD3173 /* Image+CGText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0572678D652003B6875 /* Image+CGText.swift */; };
+		D9F33F98267DA2E600FD3173 /* CGTextRenderer+Code.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01FAD0572678D652003B6875 /* CGTextRenderer+Code.swift */; };
 		D9F3AD5A219E9DF400BAFA55 /* XML.SAXParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD59219E9DF400BAFA55 /* XML.SAXParserTests.swift */; };
 		D9F3AD5B219E9DF400BAFA55 /* XML.SAXParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD59219E9DF400BAFA55 /* XML.SAXParserTests.swift */; };
 		D9F3AD5E21A218CF00BAFA55 /* ImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD5D21A218CF00BAFA55 /* ImageTests.swift */; };
@@ -271,7 +271,7 @@
 
 /* Begin PBXFileReference section */
 		01FAD0502678CFA9003B6875 /* Renderer.CGText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Renderer.CGText.swift; sourceTree = "<group>"; };
-		01FAD0572678D652003B6875 /* Image+CGText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image+CGText.swift"; sourceTree = "<group>"; };
+		01FAD0572678D652003B6875 /* CGTextRenderer+Code.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGTextRenderer+Code.swift"; sourceTree = "<group>"; };
 		01FAD06F267A0DA6003B6875 /* LayerTree.CommandOptimizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayerTree.CommandOptimizer.swift; sourceTree = "<group>"; };
 		D90DB396219CCB9E00D374D2 /* CGRenderer.PathTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGRenderer.PathTests.swift; sourceTree = "<group>"; };
 		D90DB397219CCB9E00D374D2 /* Renderer.CoreGraphicsTypesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Renderer.CoreGraphicsTypesTests.swift; sourceTree = "<group>"; };
@@ -515,7 +515,7 @@
 				D928197821FBB9D200F5D060 /* Image+CoreGraphics.swift */,
 				D90DB3DE219CCE0E00D374D2 /* NSImage+Image.swift */,
 				D90DB3DF219CCE0E00D374D2 /* UIImage+Image.swift */,
-				01FAD0572678D652003B6875 /* Image+CGText.swift */,
+				01FAD0572678D652003B6875 /* CGTextRenderer+Code.swift */,
 			);
 			name = Image;
 			sourceTree = "<group>";
@@ -1073,7 +1073,7 @@
 				D90DB407219CD06800D374D2 /* XML.swift in Sources */,
 				D90DB3F0219CCEDE00D374D2 /* URL+Data.swift in Sources */,
 				D90DB3DA219CCCDA00D374D2 /* LayerTree.Builder.Path.swift in Sources */,
-				D9F33F98267DA2E600FD3173 /* Image+CGText.swift in Sources */,
+				D9F33F98267DA2E600FD3173 /* CGTextRenderer+Code.swift in Sources */,
 				D90DB3C2219CCC4500D374D2 /* Renderer.CoreGraphics.swift in Sources */,
 				D9D9EB38224AD524006CF83C /* LayerTree.Pattern.swift in Sources */,
 				D90DB3B1219CCC4100D374D2 /* LayerTree.Transform.swift in Sources */,
@@ -1168,7 +1168,7 @@
 				D90DB3E3219CCE0E00D374D2 /* UIImage+Image.swift in Sources */,
 				D9D9EB2F224A3DEA006CF83C /* Parser.XML.Pattern.swift in Sources */,
 				D90DB427219CD1C600D374D2 /* DOM.Gradient.swift in Sources */,
-				01FAD0582678D652003B6875 /* Image+CGText.swift in Sources */,
+				01FAD0582678D652003B6875 /* CGTextRenderer+Code.swift in Sources */,
 				D9D9EB27224A3B4F006CF83C /* DOM.Pattern.swift in Sources */,
 				D90DB437219CD1C600D374D2 /* DOM.Image.swift in Sources */,
 				01FAD0512678CFA9003B6875 /* Renderer.CGText.swift in Sources */,

SwiftDraw/Image+CGText.swift renamed to SwiftDraw/CGTextRenderer+Code.swift

@@ -31,14 +31,14 @@
 
 import Foundation
 
-public extension Image {
+public extension CGTextRenderer {
 
-  static func cgCodeText(named name: String, in bundle: Bundle = Bundle.main) -> String? {
+  static func render(named name: String, in bundle: Bundle = Bundle.main) -> String? {
     guard let url = bundle.url(forResource: name, withExtension: nil) else { return nil }
-    return cgCodeText(fileURL: url)
+    return render(fileURL: url)
   }
 
-  static func cgCodeText(fileURL: URL) -> String? {
+  static func render(fileURL: URL) -> String? {
     guard let svg = try? DOM.SVG.parse(fileURL: fileURL) else {
       return nil
     }

SwiftDraw/Renderer.CGText.swift

@@ -270,7 +270,7 @@ struct CGTextProvider: RendererTypeProvider {
   }
 }
 
-final class CGTextRenderer: Renderer {
+public final class CGTextRenderer: Renderer {
   typealias Types = CGTextTypes
 
   private let name: String