mirror of
https://github.com/exyte/Macaw.git
synced 2024-09-19 08:57:35 +03:00
include negative values in transform attributes
This commit is contained in:
parent
d1eac37c75
commit
b735dc9ff6
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user