exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-17 16:07:44 +03:00
Code Issues Projects Releases Wiki Activity

include negative values in transform attributes

Browse Source
This commit is contained in:
Alexandra Novikova 2016-08-03 16:51:02 +07:00
parent d1eac37c75
commit b735dc9ff6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/svg/SVGParser.swift
View File

@ -176,7 +176,7 @@ public class SVGParser {
private func parseTransformationAttribute(attributes: String, transform: Transform = Transform()) -> Transform {
do {
var finalTransform = transform
let transformPattern = "([a-z]+)\\(((\\d+\\.?\\d*\\s*,?\\s*)+)\\)"
let transformPattern = "([a-z]+)\\(((\\-?\\d+\\.?\\d*\\s*,?\\s*)+)\\)"
let matcher = try NSRegularExpression(pattern: transformPattern, options: .CaseInsensitive)
let fullRange = NSRange(location: 0, length: attributes.characters.count)
if let matchedAttribute = matcher.firstMatchInString(attributes, options: .ReportCompletion, range: fullRange) {
@ -247,7 +247,7 @@ public class SVGParser {
private func parseTransformValues(values: String, collectedValues: [String] = []) -> [String] {
var updatedValues: [String] = collectedValues
do {
let pattern = "\\d+\\.?\\d*"
let pattern = "\\-?\\d+\\.?\\d*"
let matcher = try NSRegularExpression(pattern: pattern, options: .CaseInsensitive)
let fullRange = NSRange(location: 0, length: values.characters.count)
if let matchedValue = matcher.firstMatchInString(values, options: .ReportCompletion, range: fullRange) {