diff --git a/Sources/SwiftSVG/Ellipse.swift b/Sources/SwiftSVG/Ellipse.swift index 7bbaaf0..15eb2f8 100644 --- a/Sources/SwiftSVG/Ellipse.swift +++ b/Sources/SwiftSVG/Ellipse.swift @@ -66,7 +66,7 @@ public struct Ellipse: Element { // MARK: - CustomStringConvertible public var description: String { - let desc = "" } } diff --git a/Sources/SwiftSVG/Group.swift b/Sources/SwiftSVG/Group.swift index df3efbb..7813c42 100644 --- a/Sources/SwiftSVG/Group.swift +++ b/Sources/SwiftSVG/Group.swift @@ -23,7 +23,9 @@ public struct Group: Container, Element { // CoreAttributes public var id: String? - + public var title: String? + public var desc: String? + // PresentationAttributes public var fillColor: String? public var fillOpacity: Double? @@ -50,6 +52,8 @@ public struct Group: Container, Element { case rectangles = "rect" case texts = "text" case id + case title + case desc case fillColor = "fill" case fillOpacity = "fill-opacity" case fillRule = "fill-rule" @@ -68,7 +72,19 @@ public struct Group: Container, Element { // MARK: - CustomStringConvertible public var description: String { - return "\(containerDescription)\n" + var contents: String = "" + + if let title = self.title { + contents.append("\n\(title)") + } + + if let desc = self.desc { + contents.append("\n\(desc)") + } + + contents.append(containerDescription) + + return "\(contents)\n" } }