exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-11-14 01:48:49 +03:00
Code Issues Projects Releases Wiki Activity

Fix #407: Shapes exports to SVG without their identifiers

Browse Source 
Fix warning
This commit is contained in:
Alisa Mylnikova 2018-06-21 16:54:46 +07:00
parent bd9ed35075
commit 56e762b95a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/svg/SVGSerializer.swift
View File

@ -142,6 +142,7 @@ open class SVGSerializer {
fileprivate func imageToSVG(_ image: Image) -> String {
var result = tag(SVGImageOpenTag, close: false)
result += idToSVG(image.tag)
result += clipToSVG(image.clip)
result += transformToSVG(image)
if image.src.contains("memory://") {
@ -177,6 +178,7 @@ open class SVGSerializer {
fileprivate func textToSVG(_ text: Text) -> String {
var result = tag(SVGTextOpenTag)
result += idToSVG(text.tag)
if let font = text.font {
result += " font-family=\"\(font.name)\" font-size=\"\(font.size)\" "
// TODO: check with enums
@ -320,6 +322,13 @@ open class SVGSerializer {
defs += "<clipPath id=\"\(SVGClipPathName)\(clipPathCount)\">" + locusToSVG(clip) + SVGGenericCloseTag + "</clipPath>"
}
fileprivate func idToSVG(_ tag: [String]?) -> String {
guard let tag = tag, !tag.isEmpty, let id = tag.first else {
return ""
}
return " id=\"\(id)\""
}
fileprivate func clipToSVG(_ clipLocus: Locus?) -> String {
guard let clip = clipLocus else {
return ""
@ -331,6 +340,7 @@ open class SVGSerializer {
fileprivate func macawShapeToSvgShape (macawShape: Shape) -> String {
let locus = macawShape.formVar.value
var result = locusToSVG(locus)
result += idToSVG(macawShape.tag)
result += clipToSVG(macawShape.clip)
result += fillToSVG(macawShape.fillVar.value)
result += strokeToSVG(macawShape.strokeVar.value)
@ -345,6 +355,7 @@ open class SVGSerializer {
}
if let group = node as? Group {
var result = indentTextWithOffset(SVGGroupOpenTag, offset)
result += idToSVG(group.tag)
result += clipToSVG(group.clip)
result += transformToSVG(group)
result += SVGGenericEndTag