adding conversion of Text to CGPath

Author: swhitty

Samples/shapes.svg

@@ -12,7 +12,7 @@
 		<key>SwiftVG.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

SwiftVG.xcodeproj/xcuserdata/swhitty.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,6 +9,9 @@
 import CoreGraphics
 import CoreText
 import Foundation
+#if os(macOS)
+    import AppKit
+#endif
 
 extension CGPath {
     func applyA(action: @escaping (CGPathElement)->()) {
@@ -52,12 +55,20 @@ extension CGPath {
 
 extension String {
 
-    func toPath(font: CTFont) -> CGPath {
-        let attrs: [String: AnyObject] = [kCTFontAttributeName as String: font]
-        let attString = CFAttributedStringCreate(nil, self as CFString, attrs as CFDictionary)!
+    func toPath(font: CTFont) -> CGPath? {
+        //kCTFontAttributeName
+        let attributes = [NSFontAttributeName as String: font]
+        let attString = CFAttributedStringCreate(nil, self as CFString, attributes as CFDictionary)!
         let line = CTLineCreateWithAttributedString(attString)
         let glyphRuns = CTLineGetGlyphRuns(line)
 
+        var ascent = CGFloat(0)
+        var descent = CGFloat(0)
+        var leading = CGFloat(0)
+        CTLineGetTypographicBounds(line, &ascent, &descent, &leading)
+        let baseline = ascent
+
+        
         let path = CGMutablePath()
 
         for idx in 0..<CFArrayGetCount(glyphRuns) {
@@ -70,12 +81,15 @@ extension String {
                 var position: CGPoint = .zero
                 CTRunGetGlyphs(run, glyphRange, &glyph)
                 CTRunGetPositions(run, glyphRange, &position)
-                if let glyphPath = CTFontCreatePathForGlyph(font, glyph, nil) {
-                    let t = CGAffineTransform(translationX: position.x, y: position.y)
-                    path.addPath(glyphPath, transform: t)
+                var t = CGAffineTransform.identity
+                if let glyphPath = CTFontCreatePathForGlyph(font, glyph, &t) {
+                    let t = CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: position.x, ty: baseline)
+                    let t1 = t.translatedBy(x: 0, y: baseline)
+                    path.addPath(glyphPath, transform: t1)
                 }
             }
         }
+        
         return path
     }
 }

SwiftVG/Extensions/CGPath.swift

@@ -11,16 +11,19 @@ import Foundation
 
 extension Builder {
 
-    func createCommands<T: RendererTypeProvider>(for svg: DOM.Svg, with provider: T) -> [RendererCommand<T>] {
+    func createCommands<T: RendererTypeProvider>(for svg: DOM.Svg, with provider: T, isFlipped: Bool = true) -> [RendererCommand<T>] {
 
         let width = Float(svg.width)
         let height = Float(svg.height)
 
         self.defs = svg.defs
         var commands = [RendererCommand<T>]()
-        let flip = Transform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: height)
-        let t = provider.createTransform(from: flip)
-        commands.append(.concatenate(transform: t))
+        
+        if !isFlipped {
+            let flip = Transform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: height)
+            let t = provider.createTransform(from: flip)
+            commands.append(.concatenate(transform: t))
+        }
 
         if let viewBox = svg.viewBox {
 
@@ -312,8 +315,12 @@ extension Builder {
             return provider.createPath(from: path)
         } else if let text = element as? DOM.Text {
             let size = provider.createFloat(from: text.fontSize ?? 12.0)
-            let p = provider.createText(from: text.value, with: text.fontFamily ?? "Helvetica", ofSize: size)
-            return p
+            
+            let origin = provider.createPoint(from: Builder.Point(text.x ?? 0, text.y ?? 0))
+            return provider.createText(from: text.value,
+                                       with: text.fontFamily ?? "SystemFont",
+                                       at: origin,
+                                       ofSize: size)
         }
 
         return nil
@@ -331,6 +338,4 @@ extension Builder {
 
             return provider.createPath(from: paths)
         }
-    
-    
 }

SwiftVG/SVG/Builder/Builder.Command.swift

@@ -10,7 +10,7 @@ import UIKit
 
 extension UIImage {
 
-    class func svgNamed(_ name: String,
+    public class func svgNamed(_ name: String,
                         in bundle: Bundle = Bundle.main) -> UIImage? {
         guard let svg = ImageLoader.svgNamed(name, in: bundle) else { return nil }
         return image(from: svg)
@@ -19,7 +19,7 @@ extension UIImage {
     class func image(from svg: DOM.Svg) -> UIImage {
         let size = CGSize(width: svg.width, height: svg.height)
         let f = UIGraphicsImageRendererFormat.default()
-        f.opaque = true
+        f.opaque = false
         f.prefersExtendedRange = false
         let r = UIGraphicsImageRenderer(size: size, format: f)
 

SwiftVG/SVG/Image/UIImage.swift

@@ -80,7 +80,7 @@ struct CodeProvider: RendererTypeProvider {
         return .compound(paths: subPaths)
     }
 
-    func createText(from text: String, with font: String, ofSize: Float) -> Path {
+    func createText(from text: String, with font: String, at origin: Point, ofSize pt: Float) -> Path? {
         return .ellipse(within: Builder.Rect(x: 0, y: 0, width: 0, height: 0))
     }
 

SwiftVG/SVG/Renderer/CodeRenderer.swift

@@ -146,9 +146,12 @@ struct CoreGraphicsProvider: RendererTypeProvider {
         return cgPath
     }
 
-    func createText(from text: String, with fontName: String, ofSize pt: Float) -> Path {
-        let font = CTFontCreateWithName(text as CFString, pt, nil)
-        return text.toPath(font: font)
+    func createText(from text: String, with fontName: String, at origin: Point, ofSize pt: Float) -> Path? {
+        let font = CTFontCreateWithName(fontName as CFString, pt, nil)
+        guard let path = text.toPath(font: font) else { return nil }
+        
+        var transform = CGAffineTransform(translationX: origin.x, y: origin.y)
+        return path.copy(using: &transform)
     }
 
     func createImage(from image: Builder.Image) -> CGImage? {

SwiftVG/SVG/Renderer/CoreGraphicsRenderer.swift

@@ -34,7 +34,7 @@ protocol RendererTypeProvider {
     func createLine(from origin: Point, to desination: Point) -> Path
     func createLine(between points: [Point]) -> Path
     func createPolygon(between points: [Point]) -> Path
-    func createText(from text: String, with font: String, ofSize: Float) -> Path
+    func createText(from text: String, with font: String, at origin: Point, ofSize pt: Float) -> Path?
 
     func createRect(from rect: Rect, radii: Builder.Size) -> Path
 }