DOM.Anchor

Author: swhitty

SwiftDraw/DOM.PresentationAttributes.swift

@@ -166,6 +166,8 @@ extension DOM.GraphicsElement {
             return "image"
         case is DOM.Group:
             return "g"
+        case is DOM.Anchor:
+            return "a"
         case is DOM.SVG:
             return "svg"
         default:

SwiftDraw/DOM.Text.swift

@@ -29,17 +29,24 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
 
+import Foundation
+
 extension DOM {
-  
-  final class Text: GraphicsElement {
-    var x: Coordinate?
-    var y: Coordinate?
-    var value: String
 
-    init(x: Coordinate? = nil, y: Coordinate? = nil, value: String) {
-      self.x = x
-      self.y = y
-      self.value = value
+    final class Text: GraphicsElement {
+        var x: Coordinate?
+        var y: Coordinate?
+        var value: String
+
+        init(x: Coordinate? = nil, y: Coordinate? = nil, value: String) {
+            self.x = x
+            self.y = y
+            self.value = value
+        }
+    }
+
+    final class Anchor: GraphicsElement, ContainerElement {
+        var href: URL?
+        var childElements = [GraphicsElement]()
     }
-  }
 }

SwiftDraw/Parser.XML.Element.swift

@@ -92,6 +92,9 @@ extension XMLParser {
         case "text":
             guard let text = try parseText(att, element: e) else { return nil }
             ge = text
+        case "a":
+            guard let anchor = try parseAnchor(att, element: e) else { return nil }
+            ge = anchor
         case "use": ge = try parseUse(att)
         case "switch": ge = try parseSwitch(e)
         case "image": ge = try parseImage(att)
@@ -114,7 +117,8 @@ extension XMLParser {
                 e.name == "mask" ||
                 e.name == "defs" ||
                 e.name == "switch" ||
-                e.name == "g" else {
+                e.name == "g" ||
+                e.name == "a" else {
             throw Error.invalid
         }
 

SwiftDraw/Parser.XML.Text.swift

@@ -32,23 +32,30 @@
 import Foundation
 
 extension XMLParser {
-  
-  func parseText(_ att: AttributeParser, element: XML.Element) throws -> DOM.Text? {
-    guard
-      let text = element.innerText?.trimmingCharacters(in: .whitespacesAndNewlines),
-      !text.isEmpty else {
-        return nil
+
+    func parseText(_ att: AttributeParser, element: XML.Element) throws -> DOM.Text? {
+        guard
+            let text = element.innerText?.trimmingCharacters(in: .whitespacesAndNewlines),
+            !text.isEmpty else {
+            return nil
+        }
+
+        return try parseText(att, value: text)
+    }
+
+    func parseAnchor(_ att: AttributeParser, element: XML.Element) throws -> DOM.Anchor? {
+        let anchor = DOM.Anchor()
+        anchor.href = try att.parseUrl("href")
+        anchor.childElements = try parseContainerChildren(element)
+        return anchor
+    }
+
+    func parseText(_ att: AttributeParser, value: String) throws -> DOM.Text {
+        let element = DOM.Text(value: value)
+        element.x = try att.parseCoordinate("x")
+        element.y = try att.parseCoordinate("y")
+        element.attributes.fontFamily = (try att.parseString("font-family"))?.trimmingCharacters(in: .whitespacesAndNewlines)
+        element.attributes.fontSize = try att.parseFloat("font-size")
+        return element
     }
-    
-    return try parseText(att, value: text)
-  }
-  
-  func parseText(_ att: AttributeParser, value: String) throws -> DOM.Text {
-    let element = DOM.Text(value: value)
-    element.x = try att.parseCoordinate("x")
-    element.y = try att.parseCoordinate("y")
-    element.attributes.fontFamily = (try att.parseString("font-family"))?.trimmingCharacters(in: .whitespacesAndNewlines)
-    element.attributes.fontSize = try att.parseFloat("font-size")
-    return element
-  }
 }

SwiftDraw/Renderer.SFSymbol.swift

@@ -211,7 +211,10 @@ extension DOM.SVG {
                     <text x="250px" y="30px">Ultralight</text>
                     <text x="450px" y="30px">Regular</text>
                  <text x="650px" y="30px">Black</text>
-                 <text id="template-version"  x="730px" y="590px" fill="#555">Template v.3.0</text>
+                 <text id="template-version" fill="#505050" x="730.0" y="575.0">Template v.3.0</text>
+                 <a href="https://github.com/swhitty/SwiftDraw">
+                   <text fill="#505050" x="627.0" y="590.0">https://github.com/swhitty/SwiftDraw</text>
+                 </a>
                 </g>
             </g>
 

SwiftDraw/XML.Formatter.SVG.swift

@@ -173,6 +173,8 @@ extension XML.Formatter {
                 element = makeElement(from: group)
             } else if let text = graphic as? DOM.Text {
                 element = makeElement(from: text)
+            } else if let anchor = graphic as? DOM.Anchor {
+                element = makeElement(from: anchor)
             } else if let path = graphic as? DOM.Path {
                 element = makeElement(from: path)
             } else {
@@ -235,6 +237,15 @@ extension XML.Formatter {
             return element
         }
 
+        func makeElement(from anchor: DOM.Anchor) -> XML.Element {
+            let element = XML.Element(
+                name: "a",
+                attributes: makeGraphicsAttributes(from: anchor)
+            )
+            element.attributes["href"] = anchor.href?.absoluteString
+            return element
+        }
+
         func makeElement(from path: DOM.Path) -> XML.Element {
             let element = XML.Element(
                 name: "path",