Initial work on adding support for links.

Author: cocoatoucher

Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "XMLText",
     platforms: [
-        .iOS(.v14), .macOS(.v11), .tvOS(.v14), .watchOS(.v7)
+        .iOS(.v15), .macOS(.v12), .tvOS(.v14), .watchOS(.v7)
     ],
     products: [
         .library(

Sources/XMLText/Style/Style.swift

@@ -30,14 +30,20 @@ public class Style: StyleProtocol {
 
     public var strikethroughColor: Color?
 
+    public var strikethroughStyle: NSUnderlineStyle?
+    
     public var underlineColor: Color?
 
+    public var underlineStyle: NSUnderlineStyle?
+    
     public var kerning: CGFloat?
 
     public var tracking: CGFloat?
 
     public var baselineOffset: CGFloat?
 
+    public var link: URL?
+    
     public init(_ handler: ((Style) -> Void)? = nil) {
         handler?(self)
     }
@@ -51,11 +57,17 @@ public class Style: StyleProtocol {
             result.append(.foregroundColor(foregroundColor))
         }
         if let strikethroughColor = strikethroughColor {
-            result.append(.strikethrough(strikethroughColor))
+            result.append(.strikethroughColor(strikethroughColor))
+        }
+        if let strikethroughStyle = strikethroughStyle {
+            result.append(.strikethroughStyle(strikethroughStyle))
         }
         if let underlineColor = underlineColor {
             result.append(.underline(underlineColor))
         }
+        if let underlineStyle = underlineStyle {
+            result.append(.underlineStyle(underlineStyle))
+        }
         if let kerning = kerning {
             result.append(.kerning(kerning))
         }
@@ -65,6 +77,9 @@ public class Style: StyleProtocol {
         if let baselineOffset = baselineOffset {
             result.append(.baselineOffset(baselineOffset))
         }
+        if let link = link {
+            result.append(.link(link))
+        }
         return result
     }
 }

Sources/XMLText/Style/StyleProtocol.swift

@@ -25,46 +25,48 @@ import SwiftUI
 public enum StyleModifier {
     case font(SwiftUI.Font)
     case foregroundColor(Color)
-    case strikethrough(Color)
+    case strikethroughColor(Color)
+    case strikethroughStyle(NSUnderlineStyle)
     case underline(Color)
+    case underlineStyle(NSUnderlineStyle)
     case kerning(CGFloat)
     case tracking(CGFloat)
     case baselineOffset(CGFloat)
+    case link(URL)
 }
 
 public protocol StyleProtocol {
     var modifiers: [StyleModifier] { get }
 
-    func add(to source: Text) -> Text
+    func add(to source: AttributedString) -> AttributedString
 }
 
 public extension StyleProtocol {
 
-    func add(to source: Text) -> Text {
+    func add(to source: AttributedString) -> AttributedString {
         var result = source
         for modifier in self.modifiers {
             switch modifier {
             case .font(let font):
-                result = result
-                    .font(font)
+                result.font = font
             case .foregroundColor(let color):
-                result = result
-                    .foregroundColor(color)
-            case .strikethrough(let color):
-                result = result
-                    .strikethrough(true, color: color)
+                result.foregroundColor = color
+            case .strikethroughColor(let color):
+                result.strikethroughColor = .init(color)
+            case .strikethroughStyle(let style):
+                result.strikethroughStyle = style
             case .underline(let color):
-                result = result
-                    .underline(true, color: color)
+                result.underlineColor = .init(color)
+            case .underlineStyle(let style):
+                result.underlineStyle = style
             case .kerning(let kerning):
-                result = result
-                    .kerning(kerning)
+                result.kern = kerning
             case .tracking(let tracking):
-                result = result
-                    .tracking(tracking)
+                result.tracking = tracking
             case .baselineOffset(let baselineOffset):
-                result = result
-                    .baselineOffset(baselineOffset)
+                result.baselineOffset = baselineOffset
+            case .link(let link):
+                result.link = link
             }
         }
         return result

Sources/XMLText/Text.XMLString.swift

@@ -17,22 +17,21 @@ public extension Text {
     ///   - styleGroup: Style group used for styling.
     init(xmlString: String, styleGroup: StyleGroup) {
         do {
-            var text = Text("")
+            var text = AttributedString()
             let xmlParser = XMLTextBuilder(
                 styleGroup: styleGroup,
                 string: xmlString,
                 didFindNewString: { string, styles in
-                    var currentText = Text(string)
-                    
-                    for style in styles.reversed() {
+                    var currentText = AttributedString(string)
+                    if let style = styles.last {
                         currentText = style.add(to: currentText)
                     }
-                    text = text + currentText
+                    text += currentText
                 }
             )
             if let xmlParser = xmlParser {
                 try xmlParser.parse()
-                self = text
+                self = Text(text)
             } else {
                 self = Text(xmlString)
             }
@@ -121,12 +120,14 @@ struct Text_XMLString_Previews: PreviewProvider {
             style.font = Font.italic(.system(size: 20))()
             style.foregroundColor = .blue
             style.strikethroughColor = .yellow
+            style.strikethroughStyle = .single
         }
 
         let boldStyle = Style { style in
             style.font = Font.bold(.system(size: 20))()
             style.foregroundColor = .yellow
             style.underlineColor = .red
+            style.underlineStyle = .single
         }
 
         return .init(