From 7ce2379dc9e04d2c49128b7930d9de73da1eaf96 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 00:21:31 +0800 Subject: [PATCH 01/25] Add SVGDefs --- Source/Model/Nodes/SVGDefs.swift | 9 ++++ .../PolyfillTests.swift | 44 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 Source/Model/Nodes/SVGDefs.swift create mode 100644 Tests/ExternalSVGSamplesTests/PolyfillTests.swift diff --git a/Source/Model/Nodes/SVGDefs.swift b/Source/Model/Nodes/SVGDefs.swift new file mode 100644 index 0000000..525c76b --- /dev/null +++ b/Source/Model/Nodes/SVGDefs.swift @@ -0,0 +1,9 @@ +#if os(WASI) || os(Linux) +import Foundation +#else +import SwiftUI +import Combine +#endif + +public class SVGDefs: SVGGroup {} + diff --git a/Tests/ExternalSVGSamplesTests/PolyfillTests.swift b/Tests/ExternalSVGSamplesTests/PolyfillTests.swift new file mode 100644 index 0000000..930091d --- /dev/null +++ b/Tests/ExternalSVGSamplesTests/PolyfillTests.swift @@ -0,0 +1,44 @@ +// +// PolyfillTests.swift +// SVGView +// +// Tests for CoreGraphicsPolyfill.swift - comprehensive testing of the CoreGraphics +// polyfill implementation for WASI/Linux platforms where CoreGraphics is not available. +// +// These tests verify: +// - CGAffineTransform operations (identity, translation, scaling, rotation, concatenation) +// - CGPath functionality (basic operations, bounding box calculation, shape addition) +// - MBezierPath operations (initialization, path building, transformations, arc handling) +// - PathElement enum and extensions +// - Edge cases and error handling +// +// On platforms with native CoreGraphics (macOS, iOS), only a fallback test runs +// since the polyfill types are aliases to the native CoreGraphics types. +// + +import XCTest + +@testable import SVGView + +final class MermaidMindmapTests: XCTestCase { + let svgCode1 = """ + +
Tropical FruitsDurianJackfruitPapayaAvocadoBananaPineapple300+ varieties inThailandStrong odourThorn-covered rindLargest tree fruit200-500 fruits per yearTropical regionscultivation5-10m tallLarge palmately lobedleavesSingle stemMexico to Costa RicaoriginOily fruitAlligator pearElongated curved fruitStarchy fleshMultiple varieties1-1.5m tallUp to 200 flowersMultiple fruit formation + """ + + func testMermaidMindmap() { + let node = SVGParser.parse(contentsOf: svgCode1)! + let content = Serializer.serialize(node) + print(content) + } +} From d134c83b7d2ab343367fe6a477b825621d4f939f Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 00:22:20 +0800 Subject: [PATCH 02/25] Add parameter related to marker element --- Source/Model/Nodes/SVGMarker.swift | 137 +++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 Source/Model/Nodes/SVGMarker.swift diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift new file mode 100644 index 0000000..6f7dc5a --- /dev/null +++ b/Source/Model/Nodes/SVGMarker.swift @@ -0,0 +1,137 @@ +#if os(WASI) || os(Linux) +import Foundation +#else +import SwiftUI +import Combine +#endif + +public class SVGMarker: SVGNode { + public enum Orient { + public init?(rawValue: String) { + if rawValue == "auto" { + self = .auto + } else if rawValue == "auto-start-reverse" { + self = .autoStartReverse + } else if let angle = Float(rawValue) { + self = .angle(angle) + } else { + self = .angle(0) + } + } + + public var rawValue: String { + switch self { + case .auto: + return "auto" + case .autoStartReverse: + return "auto-start-reverse" + case .angle(let f): + return "\(f)" + } + } + + case auto + case autoStartReverse + case angle(Float) + } + + public enum RefMagnitude { + case left + case center + case right + case coordinate(CGFloat) + } + + public enum MarkerUnits: String, SerializableEnum { + case userSpaceOnUse + case strokeWidth + } + + #if os(WASI) || os(Linux) + // TODO + public var contents: [SVGNode] = [] + #else + @Published public var markerHeight: SVGLength + @Published public var markerUnits: MarkerUnits + @Published public var markerWidth: SVGLength + @Published public var orient: Orient + @Published public var preserveAspectRatio: SVGPreserveAspectRatio + @Published public var refX: RefMagnitude + @Published public var refY: RefMagnitude + @Published public var viewBox: CGRect? + @Published public var contents: [SVGNode] = [] +// @Published public var id: String? + #endif + + public init(markerHeight: SVGLength, markerUnits: MarkerUnits, markerWidth: SVGLength, orient: Orient, preserveAspectRatio: SVGPreserveAspectRatio, refX: RefMagnitude, refY: RefMagnitude, viewBox: CGRect? = nil, contents: [SVGNode]) { + self.markerHeight = markerHeight + self.markerUnits = markerUnits + self.markerWidth = markerWidth + self.orient = orient + self.preserveAspectRatio = preserveAspectRatio + self.refX = refX + self.refY = refY + self.viewBox = viewBox + self.contents = contents + } + + override public func bounds() -> CGRect { + contents.map { $0.bounds() }.reduce(contents.first?.bounds() ?? CGRect.zero) { $0.union($1) } + } + + override public func getNode(byId id: String) -> SVGMarker? { + self.id == id ? self : .none + } + + override func serialize(_ serializer: Serializer) { + // TODO + serializer.add("viewBox", viewBox) +// serializer.add("scaling", preserveAspectRatio.scaling) +// serializer.add("xAlign", preserveAspectRatio.xAlign) +// serializer.add("yAlign", preserveAspectRatio.yAlign) + serializer.add("contents", contents) + serializer.add("markerHeight", markerHeight.toString(), "100%") + serializer.add("markerWidth", markerWidth.toString(), "100%") + serializer.add("markerUnits", markerUnits) + // TODO + super.serialize(serializer) + + } + + #if canImport(SwiftUI) + public func contentView() -> some View { + SVGMarkerView(model: self) + } + #endif + + override var typeName: String { + return String(describing: type(of: self)) + } + + func parseContents(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> [SVGNode] { + return context.element.contents + .compactMap { $0 as? XMLElement } + .compactMap { delegate($0) } + } +} + +#if canImport(SwiftUI) +extension SVGMarker: ObservableObject {} +struct SVGMarkerView: View { + + @ObservedObject var model: SVGMarker + + public var body: some View { + ZStack { + ForEach(0.. Date: Tue, 27 May 2025 00:23:33 +0800 Subject: [PATCH 03/25] Add members to store marker start and marker end in SVGShape --- Source/Model/Nodes/SVGShape.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Model/Nodes/SVGShape.swift b/Source/Model/Nodes/SVGShape.swift index ea23743..8bd9234 100644 --- a/Source/Model/Nodes/SVGShape.swift +++ b/Source/Model/Nodes/SVGShape.swift @@ -10,14 +10,20 @@ public class SVGShape: SVGNode { #if os(WASI) || os(Linux) public var fill: SVGPaint? public var stroke: SVGStroke? + public var markerStart: String? + public var markerEnd: String? #else @Published public var fill: SVGPaint? @Published public var stroke: SVGStroke? + @Published public var markerStart: String? + @Published public var markerEnd: String? #endif override func serialize(_ serializer: Serializer) { fill?.serialize(key: "fill", serializer: serializer) serializer.add("stroke", stroke) + serializer.add("marker-start", markerStart) + serializer.add("marker-end", markerEnd) super.serialize(serializer) } } From 17265e2d369c4731fe8adefb2a04d1f7a03f427d Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 00:24:10 +0800 Subject: [PATCH 04/25] Add new parser --- .../SVG/Elements/SVGStructureParsers.swift | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/Source/Parser/SVG/Elements/SVGStructureParsers.swift b/Source/Parser/SVG/Elements/SVGStructureParsers.swift index 4a13745..1ceb9bf 100644 --- a/Source/Parser/SVG/Elements/SVGStructureParsers.swift +++ b/Source/Parser/SVG/Elements/SVGStructureParsers.swift @@ -119,3 +119,151 @@ class SVGUseParser: SVGBaseElementParser { return useNode } } + +class SVGVDefParser: SVGGroupParser { + override func doParse(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> SVGNode? { + return SVGGroup(contents: parseContents(context: context, delegate: delegate)) + } + + func parseContents(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> [SVGNode] { + return context.element.contents + .compactMap { $0 as? XMLElement } + .compactMap { delegate($0) } + } +} + +class SVGMarkerParser: SVGBaseElementParser { + + override func doParse(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> SVGNode? { + let attributes = context.properties + + let markerWidth = Self.parseDimension(attributes, "markerWidth") ?? SVGLength(percent: 100) + let markerHeight = Self.parseDimension(attributes, "markerHeight") ?? SVGLength(percent: 100) + let markerUnits = Self.parseMarkerUnits(attributes["markerUnits"]) + let orient = Self.parseOrient(attributes["orient"]) + let viewBox = Self.parseViewBox(attributes, context: context) + let par = Self.parsePreserveAspectRatio(string: attributes["preserveAspectRatio"], context: context) + let refX = Self.parseRefMagnitude(attributes["refX"]) + let refY = Self.parseRefMagnitude(attributes["refY"]) + return SVGMarker(markerHeight: markerHeight, markerUnits: markerUnits, markerWidth: markerWidth, orient: orient, preserveAspectRatio: par, refX: refX, refY: refY, viewBox: viewBox, contents: parseContents(context: context, delegate: delegate)) + } + + func parseContents(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> [SVGNode] { + return context.element.contents + .compactMap { $0 as? XMLElement } + .compactMap { delegate($0) } + } + + static func parseDimension(_ attributes: [String: String], _ key: String) -> SVGLength? { + guard let string = attributes[key] else { + return .none + } + if string.hasSuffix("%"), let value = Double(string.dropLast()) { + return SVGLength(percent: CGFloat(value)) + } + if let value = Double(string) { + return SVGLength(pixels: CGFloat(value)) + } + return .none + } + + static func parseMarkerUnits(_ string: String?) -> SVGMarker.MarkerUnits { + if let anchor = string { + if anchor == "userSpaceOnUse" { + return .userSpaceOnUse + } else if anchor == "strokeWidth" { + return .strokeWidth + } + } + return .strokeWidth + } + + static func parseOrient(_ value: String?) -> SVGMarker.Orient { + guard let value else { + return .angle(0) + } + if value == "auto" { + return .auto + } else if value == "auto-start-reverse" { + return .autoStartReverse + } else if let angle = Float(value) { + return .angle(angle) + } else { + return .angle(0) + } + } + + static func parseRefMagnitude(_ value: String?) -> SVGMarker.RefMagnitude { + guard let value else { + return .coordinate(0) + } + if value == "right" { + return .right + } else if value == "left" { + return .left + } else if value == "center" { + return .center + } else if let magnitude = Double(value) { + return .coordinate(magnitude) + } else { + return .coordinate(0) + } + } + + static func parsePreserveAspectRatio(string: String?, context: SVGContext) -> SVGPreserveAspectRatio { + if let contentModeString = string { + let strings = contentModeString.components(separatedBy: CharacterSet(charactersIn: " ")) + if strings.count == 1 { // none + return SVGPreserveAspectRatio(scaling: parseScaling(strings[0])) + } + guard strings.count == 2 else { + context.log(message: "Invalid content mode \(contentModeString)") + return SVGPreserveAspectRatio() + } + + let alignString = strings[0] + var xAlign = alignString.prefix(4).lowercased() + xAlign.remove(at: xAlign.startIndex) + let xAligningMode = parseAlign(xAlign) + + var yAlign = alignString.suffix(4).lowercased() + yAlign.remove(at: yAlign.startIndex) + let yAligningMode = parseAlign(yAlign) + + let scalingMode = parseScaling(strings[1]) + return SVGPreserveAspectRatio(scaling: scalingMode, xAlign: xAligningMode, yAlign: yAligningMode) + } + return SVGPreserveAspectRatio() + } + + static func parseAlign(_ string: String) -> SVGPreserveAspectRatio.Align { + switch string { + case "min": return .min + case "max": return .max + default: return .mid + } + } + + static func parseScaling(_ string: String) -> SVGPreserveAspectRatio.Scaling { + switch string { + case "meet": return .meet + case "slice": return .slice + default: return .none + } + } + + static func parseViewBox(_ attributes: [String: String], context: SVGContext) -> CGRect? { + // TODO: temporary solution, all attributes should be case insensitive + if let string = attributes[ignoreCase: "viewBox"] { + let nums = string.components(separatedBy: .whitespaces) + if nums.count == 4, + let x = SVGLengthParser.xAxis.double(string: nums[0], context: context), + let y = SVGLengthParser.yAxis.double(string: nums[1], context: context), + let width = SVGLengthParser.xAxis.double(string: nums[2], context: context), + let height = SVGLengthParser.yAxis.double(string: nums[3], context: context) { + return CGRect(x: x, y: y, width: width, height: height) + } + } + return nil + } +} From d70adb746d4ecf830a77e510b2b309e19017373c Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 09:55:30 +0800 Subject: [PATCH 05/25] Generate tests --- SVGViewTests/SVG11Tests.swift | 4 ++++ SVGViewTests/SVG12Tests.swift | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SVGViewTests/SVG11Tests.swift b/SVGViewTests/SVG11Tests.swift index a531daf..cc35bd2 100644 --- a/SVGViewTests/SVG11Tests.swift +++ b/SVGViewTests/SVG11Tests.swift @@ -153,6 +153,10 @@ class SVG11Tests: BaseTestCase { compareToReference("painting-fill-05-b") } + func testPaintingMarker01F() { + compareToReference("painting-marker-01-f") + } + func testPaintingStroke01T() { compareToReference("painting-stroke-01-t") } diff --git a/SVGViewTests/SVG12Tests.swift b/SVGViewTests/SVG12Tests.swift index 1982bda..b1b2883 100644 --- a/SVGViewTests/SVG12Tests.swift +++ b/SVGViewTests/SVG12Tests.swift @@ -56,7 +56,7 @@ class SVG12Tests: BaseTestCase { func testPaintFill04T() { compareToReference("paint-fill-04-t") } - + func testPaintFill06T() { compareToReference("paint-fill-06-t") } From e52b39f4d441f0cfedbdabbc215a1ab1d7aab6e4 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 09:55:58 +0800 Subject: [PATCH 06/25] Update SVGMarker --- Source/Model/Nodes/SVGMarker.swift | 53 +++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index 6f7dc5a..c7598d1 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -7,7 +7,15 @@ import Combine public class SVGMarker: SVGNode { public enum Orient { - public init?(rawValue: String) { + case auto + case autoStartReverse + case angle(Float) + + public init?(rawValue: String?) { + guard let rawValue else { + self = .angle(0) + return + } if rawValue == "auto" { self = .auto } else if rawValue == "auto-start-reverse" { @@ -18,8 +26,8 @@ public class SVGMarker: SVGNode { self = .angle(0) } } - - public var rawValue: String { + + public func toString() -> String { switch self { case .auto: return "auto" @@ -29,17 +37,26 @@ public class SVGMarker: SVGNode { return "\(f)" } } - - case auto - case autoStartReverse - case angle(Float) } public enum RefMagnitude { case left case center case right - case coordinate(CGFloat) + case coordinate(SVGLength) + + public func toString() -> String { + switch self { + case .left: + return "left" + case .center: + return "center" + case .right: + return "right" + case .coordinate(let f): + return f.toString() + } + } } public enum MarkerUnits: String, SerializableEnum { @@ -84,16 +101,22 @@ public class SVGMarker: SVGNode { } override func serialize(_ serializer: Serializer) { - // TODO - serializer.add("viewBox", viewBox) -// serializer.add("scaling", preserveAspectRatio.scaling) -// serializer.add("xAlign", preserveAspectRatio.xAlign) -// serializer.add("yAlign", preserveAspectRatio.yAlign) serializer.add("contents", contents) serializer.add("markerHeight", markerHeight.toString(), "100%") - serializer.add("markerWidth", markerWidth.toString(), "100%") serializer.add("markerUnits", markerUnits) - // TODO + serializer.add("markerWidth", markerWidth.toString(), "100%") + serializer.add("orient", orient.toString()) + + // preserveAspectRatio, please refer to the implementation in SVGViewport + serializer.add("scaling", preserveAspectRatio.scaling) + serializer.add("xAlign", preserveAspectRatio.xAlign) + serializer.add("yAlign", preserveAspectRatio.yAlign) + + serializer.add("refX", refX.toString()) + serializer.add("refY", refY.toString()) + + serializer.add("viewBox", viewBox) + super.serialize(serializer) } From e5dea6c4144ca2551703a9a620abf429e13e607e Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 13:58:04 +0800 Subject: [PATCH 07/25] Add SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref --- .../w3c/1.1F2/refs/painting-marker-01-f.ref | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref new file mode 100644 index 0000000..55977d0 --- /dev/null +++ b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref @@ -0,0 +1,225 @@ +SVGViewport { + id: "svg-root", + viewBox: { width: 480, height: 360 }, + contents: [ + SVGDefs { }, + SVGGroup { + id: "test-body-content", + contents: [ + SVGDefs { + contents: [ + SVGMarker { + id: "marker1", + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ], + markerHeight: "2", + markerUnits: "strokeWidth", + markerWidth: "2", + orient: "0.0", + scaling: "none", + refX: "5", + refY: "5", + viewBox: { width: 10, height: 10 } + }, + SVGMarker { + id: "marker2", + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ], + markerHeight: "2", + markerUnits: "strokeWidth", + markerWidth: "2", + orient: "auto", + scaling: "none", + refX: "5", + refY: "5", + viewBox: { width: 10, height: 10 } + }, + SVGMarker { + id: "markerStart", + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ], + markerHeight: "2", + markerUnits: "strokeWidth", + markerWidth: "2", + orient: "0.0", + scaling: "none", + refX: "5", + refY: "5", + viewBox: { width: 10, height: 10 } + }, + SVGMarker { + id: "markerMiddle", + contents: [ + SVGCircle { cx: 5, cy: 5, r: 5, fill: "green" } + ], + markerHeight: "2", + markerUnits: "strokeWidth", + markerWidth: "2", + orient: "0.0", + scaling: "none", + refX: "5", + refY: "5", + viewBox: { width: 10, height: 10 } + }, + SVGMarker { + id: "markerEnd", + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ], + markerHeight: "2", + markerUnits: "strokeWidth", + markerWidth: "2", + orient: "0.0", + scaling: "none", + refX: "5", + refY: "5", + viewBox: { width: 10, height: 10 } + } + ] + }, + SVGText { + text: "Basic Markers", + font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, + fill: "black", + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 170.0000000000, 30.0000000000] + }, + SVGPath { + path: "M130,40 L180,40 L180,90", + stroke: { fill: "black", width: 8 }, + marker-start: "marker1", + marker-mid: "marker1", + marker-end: "marker1" + }, + SVGGroup { + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + contents: [ + SVGPath { + path: "M130,40 L180,40 L180,90", + stroke: { fill: "black", width: 8 } + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 32.0000000000], + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ] + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 32.0000000000], + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ] + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 82.0000000000], + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ] + } + ] + }, + SVGText { + text: "Start, Middle and End", + font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, + fill: "black", + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 145.0000000000, 125.0000000000] + }, + SVGPath { + path: "M130,135 L180,135 L180,185", + stroke: { fill: "black", width: 8 }, + marker-start: "markerStart", + marker-mid: "markerMiddle", + marker-end: "markerEnd" + }, + SVGGroup { + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + contents: [ + SVGPath { + path: "M130,135 L180,135 L180,185", + stroke: { fill: "black", width: 8 } + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 127.0000000000], + contents: [ + SVGRect { width: 10, height: 10, fill: "purple" } + ] + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 127.0000000000], + contents: [ + SVGCircle { cx: 5, cy: 5, r: 5, fill: "green" } + ] + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 177.0000000000], + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ] + } + ] + }, + SVGText { + text: "Automatic Orientation", + font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, + fill: "black", + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 145.0000000000, 220.0000000000] + }, + SVGPath { + path: "M130,230 L180,230 L180,280", + stroke: { fill: "black", width: 8 }, + marker-start: "marker2", + marker-mid: "marker2", + marker-end: "marker2" + }, + SVGGroup { + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + contents: [ + SVGPath { + path: "M130,230 L180,230 L180,280", + stroke: { fill: "black", width: 8 } + }, + SVGGroup { + transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 222.0000000000], + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ] + }, + SVGGroup { + transform: [1.1313708499, 1.1313708499, -1.1313708499, 1.1313708499, 180.0000000000, 218.6862915010], + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ] + }, + SVGGroup { + transform: [0.0000000000, 1.6000000000, -1.6000000000, 0.0000000000, 188.0000000000, 272.0000000000], + contents: [ + SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } + ] + } + ] + } + ] + }, + SVGGroup { + contents: [ + SVGText { + id: "revision", + text: "$Revision: 1.7 $", + font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, + fill: "black", + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + } + ] + }, + SVGRect { + id: "test-frame", + x: 1, + y: 1, + width: 478, + height: 358, + stroke: { fill: "black" } + } + ] +} From dcdbfb57675f227254a0ac90933e597da57c0587 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 13:59:39 +0800 Subject: [PATCH 08/25] Update SVG/SVGParser.swift --- Source/Parser/SVG/SVGParser.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Parser/SVG/SVGParser.swift b/Source/Parser/SVG/SVGParser.swift index 125970e..1c11de2 100644 --- a/Source/Parser/SVG/SVGParser.swift +++ b/Source/Parser/SVG/SVGParser.swift @@ -63,6 +63,8 @@ public struct SVGParser { "polygon": SVGPolygonParser(), "polyline": SVGPolylineParser(), "path": SVGPathParser(), + "marker": SVGMarkerParser(), + "defs": SVGVDefParser(), ] private static func parse(context: SVGNodeContext) -> SVGNode? { From 9c7c0a75f5e126fa49ca9498a136140ff84c4eea Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 14:00:07 +0800 Subject: [PATCH 09/25] Parse marker-start, marker-mid and marker-end --- Source/Parser/SVG/Elements/SVGElementParser.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Parser/SVG/Elements/SVGElementParser.swift b/Source/Parser/SVG/Elements/SVGElementParser.swift index 527e1ca..4b1d1b8 100644 --- a/Source/Parser/SVG/Elements/SVGElementParser.swift +++ b/Source/Parser/SVG/Elements/SVGElementParser.swift @@ -28,6 +28,10 @@ class SVGBaseElementParser: SVGElementParser { } node.id = SVGHelper.parseId(context.properties) + + node.markerStart = SVGHelper.parseMarkerInAttribute(context.properties, key: "marker-start") + node.markerMid = SVGHelper.parseMarkerInAttribute(context.properties, key: "marker-mid") + node.markerEnd = SVGHelper.parseMarkerInAttribute(context.properties, key: "marker-end") return node } From 6853713d8cd711b0596c39f433f6e98a0d9b8766 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:13:03 +0800 Subject: [PATCH 10/25] Parse marker attribute --- Source/Parser/SVG/SVGParserPrimitives.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Parser/SVG/SVGParserPrimitives.swift b/Source/Parser/SVG/SVGParserPrimitives.swift index 250c5ef..1348699 100644 --- a/Source/Parser/SVG/SVGParserPrimitives.swift +++ b/Source/Parser/SVG/SVGParserPrimitives.swift @@ -25,6 +25,14 @@ public class SVGHelper: NSObject { return dict["id"] ?? dict["xml:id"] } + static func parseMarkerInAttribute(_ dict: [String: String], key: String) -> String? { + guard let markerId = dict[key] else { + return .none + } + return markerId.replacingOccurrences(of: "url(#", with: "") + .replacingOccurrences(of: ")", with: "") + } + static func parseStroke(_ style: [String: String], index: SVGIndex) -> SVGStroke? { guard let fill = SVGHelper.parseStrokeFill(style, index) else { return .none From f3485beb4461c7c3adb2e8a97695e44f01633393 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:16:06 +0800 Subject: [PATCH 11/25] SVGShape supports markers --- SVGViewTests/SVGRefGenerator.swift | 1 + Source/Model/Nodes/SVGNode.swift | 11 ++++++++++- Source/Model/Nodes/SVGShape.swift | 5 +---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/SVGViewTests/SVGRefGenerator.swift b/SVGViewTests/SVGRefGenerator.swift index 60f2009..6eceeaf 100644 --- a/SVGViewTests/SVGRefGenerator.swift +++ b/SVGViewTests/SVGRefGenerator.swift @@ -46,6 +46,7 @@ class SVGRefGenerator: XCTestCase { createReference(name: "masking-opacity-01-b", version: v11) createReference(name: "painting-control-02-f", version: v11) createReference(name: "painting-control-03-f", version: v11) + createReference(name: "painting-marker-01-f", version: v11) createReference(name: "painting-fill-01-t", version: v11) createReference(name: "painting-fill-02-t", version: v11) createReference(name: "painting-fill-03-t", version: v11) diff --git a/Source/Model/Nodes/SVGNode.swift b/Source/Model/Nodes/SVGNode.swift index 214b486..1476a92 100644 --- a/Source/Model/Nodes/SVGNode.swift +++ b/Source/Model/Nodes/SVGNode.swift @@ -14,6 +14,9 @@ public class SVGNode: SerializableElement { public var clip: SVGNode? public var mask: SVGNode? public var id: String? + public var markerStart: String? + public var markerMid: String? + public var markerEnd: String? #else @Published public var transform: CGAffineTransform = CGAffineTransform.identity @Published public var opaque: Bool @@ -21,16 +24,22 @@ public class SVGNode: SerializableElement { @Published public var clip: SVGNode? @Published public var mask: SVGNode? @Published public var id: String? + @Published public var markerStart: String? + @Published public var markerMid: String? + @Published public var markerEnd: String? #endif - public init(transform: CGAffineTransform = .identity, opaque: Bool = true, opacity: Double = 1, clip: SVGNode? = nil, mask: SVGNode? = nil, id: String? = nil) { + public init(transform: CGAffineTransform = .identity, opaque: Bool = true, opacity: Double = 1, clip: SVGNode? = nil, mask: SVGNode? = nil, id: String? = nil, markerStart: String? = nil, markerMid: String? = nil, markerEnd: String? = nil) { self.transform = transform self.opaque = opaque self.opacity = opacity self.clip = clip self.mask = mask self.id = id + self.markerStart = markerStart + self.markerMid = markerMid + self.markerEnd = markerEnd } public func bounds() -> CGRect { diff --git a/Source/Model/Nodes/SVGShape.swift b/Source/Model/Nodes/SVGShape.swift index 8bd9234..e186de2 100644 --- a/Source/Model/Nodes/SVGShape.swift +++ b/Source/Model/Nodes/SVGShape.swift @@ -10,19 +10,16 @@ public class SVGShape: SVGNode { #if os(WASI) || os(Linux) public var fill: SVGPaint? public var stroke: SVGStroke? - public var markerStart: String? - public var markerEnd: String? #else @Published public var fill: SVGPaint? @Published public var stroke: SVGStroke? - @Published public var markerStart: String? - @Published public var markerEnd: String? #endif override func serialize(_ serializer: Serializer) { fill?.serialize(key: "fill", serializer: serializer) serializer.add("stroke", stroke) serializer.add("marker-start", markerStart) + serializer.add("marker-mid", markerMid) serializer.add("marker-end", markerEnd) super.serialize(serializer) } From 6215fe1637b1a067cffdf3ec83169818a687c020 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:16:38 +0800 Subject: [PATCH 12/25] Update parser to set default --- .../SVG/Elements/SVGStructureParsers.swift | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Parser/SVG/Elements/SVGStructureParsers.swift b/Source/Parser/SVG/Elements/SVGStructureParsers.swift index 1ceb9bf..4c4f692 100644 --- a/Source/Parser/SVG/Elements/SVGStructureParsers.swift +++ b/Source/Parser/SVG/Elements/SVGStructureParsers.swift @@ -122,10 +122,10 @@ class SVGUseParser: SVGBaseElementParser { class SVGVDefParser: SVGGroupParser { override func doParse(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> SVGNode? { - return SVGGroup(contents: parseContents(context: context, delegate: delegate)) + return SVGDefs(contents: parseContents(context: context, delegate: delegate)) } - func parseContents(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> [SVGNode] { + override func parseContents(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> [SVGNode] { return context.element.contents .compactMap { $0 as? XMLElement } .compactMap { delegate($0) } @@ -143,8 +143,8 @@ class SVGMarkerParser: SVGBaseElementParser { let orient = Self.parseOrient(attributes["orient"]) let viewBox = Self.parseViewBox(attributes, context: context) let par = Self.parsePreserveAspectRatio(string: attributes["preserveAspectRatio"], context: context) - let refX = Self.parseRefMagnitude(attributes["refX"]) - let refY = Self.parseRefMagnitude(attributes["refY"]) + let refX = Self.parseRefMagnitude(attributes, "refX") + let refY = Self.parseRefMagnitude(attributes, "refY") return SVGMarker(markerHeight: markerHeight, markerUnits: markerUnits, markerWidth: markerWidth, orient: orient, preserveAspectRatio: par, refX: refX, refY: refY, viewBox: viewBox, contents: parseContents(context: context, delegate: delegate)) } @@ -193,9 +193,9 @@ class SVGMarkerParser: SVGBaseElementParser { } } - static func parseRefMagnitude(_ value: String?) -> SVGMarker.RefMagnitude { - guard let value else { - return .coordinate(0) + static func parseRefMagnitude(_ attributes: [String: String], _ key: String) -> SVGMarker.RefMagnitude { + guard let value = attributes[key] else { + return .coordinate(.zero) } if value == "right" { return .right @@ -203,10 +203,10 @@ class SVGMarkerParser: SVGBaseElementParser { return .left } else if value == "center" { return .center - } else if let magnitude = Double(value) { + } else if let magnitude = Self.parseDimension(attributes, key) { return .coordinate(magnitude) } else { - return .coordinate(0) + return .coordinate(.zero) } } @@ -233,7 +233,7 @@ class SVGMarkerParser: SVGBaseElementParser { let scalingMode = parseScaling(strings[1]) return SVGPreserveAspectRatio(scaling: scalingMode, xAlign: xAligningMode, yAlign: yAligningMode) } - return SVGPreserveAspectRatio() + return SVGPreserveAspectRatio(scaling: parseScaling("xMidYMid")) } static func parseAlign(_ string: String) -> SVGPreserveAspectRatio.Align { From 7f9ba697625a25497d60062fc264dbf518f270de Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:16:52 +0800 Subject: [PATCH 13/25] Add .zero --- Source/Model/Primitives/SVGLength.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Model/Primitives/SVGLength.swift b/Source/Model/Primitives/SVGLength.swift index 466afb3..bcfc193 100644 --- a/Source/Model/Primitives/SVGLength.swift +++ b/Source/Model/Primitives/SVGLength.swift @@ -16,6 +16,8 @@ public enum SVGLength { case percent(CGFloat) case pixels(CGFloat) + static let zero: SVGLength = .pixels(0) + init(percent: CGFloat) { self = .percent(percent) } From 7b86c18b81a332002e9962a634691dccd96d91d7 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:17:15 +0800 Subject: [PATCH 14/25] Add new files --- SVGView.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SVGView.xcodeproj/project.pbxproj b/SVGView.xcodeproj/project.pbxproj index e798689..3a77930 100644 --- a/SVGView.xcodeproj/project.pbxproj +++ b/SVGView.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; }; + 0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; }; + 0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; }; + 0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; }; 5815294025B6C8F600E8D23A /* SVGPaint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815293F25B6C8F600E8D23A /* SVGPaint.swift */; }; 5815294425B6C90F00E8D23A /* SVGColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815294325B6C90F00E8D23A /* SVGColor.swift */; }; 5815298A25B752E600E8D23A /* SVGPreserveAspectRatio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */; }; @@ -134,6 +138,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGDefs.swift; sourceTree = ""; }; + 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGMarker.swift; sourceTree = ""; }; 5815293F25B6C8F600E8D23A /* SVGPaint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPaint.swift; sourceTree = ""; }; 5815294325B6C90F00E8D23A /* SVGColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGColor.swift; sourceTree = ""; }; 5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPreserveAspectRatio.swift; sourceTree = ""; }; @@ -372,6 +378,8 @@ 5BE3323924E144B200BB0D60 /* SVGText.swift */, 5B1018192536C64700105E9A /* SVGUserSpaceNode.swift */, 5B1017E625358E4400105E9A /* SVGViewport.swift */, + 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */, + 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */, ); path = Nodes; sourceTree = ""; @@ -601,6 +609,8 @@ 58A66522283E9A0100F1F6FD /* MBezierPath+Extension_macOS.swift in Sources */, 5B0BD94224EE66A400F23286 /* SVGView.swift in Sources */, 5BE3327124E144B200BB0D60 /* SVGFont.swift in Sources */, + 0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */, + 0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */, 5BE3326F24E144B200BB0D60 /* XMLNode.swift in Sources */, 5B1017E725358E4400105E9A /* SVGViewport.swift in Sources */, 582D0C262840189A00F945D8 /* SVGLinker.swift in Sources */, @@ -617,6 +627,8 @@ 582D0C2B28401A5600F945D8 /* SVGScreen.swift in Sources */, 58A66500283E999B00F1F6FD /* SVGGroup.swift in Sources */, 58A664F8283E977600F1F6FD /* SVGParserExtensions.swift in Sources */, + 0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */, + 0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */, 58A6650E283E99C100F1F6FD /* SVGDataImage.swift in Sources */, 582D0C272840189A00F945D8 /* SVGLinker.swift in Sources */, 585A5C2F25D007B6000E8B88 /* SVG11Tests.swift in Sources */, From 78a7b447fbd1e79d992ba20e14ac32c89199f199 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:17:35 +0800 Subject: [PATCH 15/25] Update coverage --- w3c-coverage.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/w3c-coverage.md b/w3c-coverage.md index 4946415..fa0af1c 100644 --- a/w3c-coverage.md +++ b/w3c-coverage.md @@ -2,7 +2,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG Test Suite](https://github.com/web-platform-tests/wpt/tree/master/svg) by this `SVGView` implementation. Currently there are two standards supported: [SVG 1.1 (Second Edition)](https://www.w3.org/TR/SVG11/) and [SVG Tiny 1.2](https://www.w3.org/TR/SVGTiny12/). - * [SVG 1.1 (Second Edition)](#svg-11-second-edition): `19.3%` + * [SVG 1.1 (Second Edition)](#svg-11-second-edition): `19.5%` * [Animate](#animate-1): `0.0%` * [Color](#color-1): `83.3%` * [Conform](#conform-1): `0.0%` @@ -15,7 +15,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T * [Linking](#linking-1): `0.0%` * [Masking](#masking-1): `5.2%` * [Metadata](#metadata-1): `0.0%` - * [Painting](#painting-1): `48.3%` + * [Painting](#painting-1): `51.6%` * [Paths](#paths-1): `90.4%` * [Pservers](#pservers-1): `18.1%` * [Render](#render-1): `37.5%` @@ -26,7 +26,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T * [Svgdom](#svgdom-1): `0.0%` * [Text](#text-1): `0.0%` * [Types](#types-1): `6.6%` - * [SVG Tiny 1.2](#svg-tiny-12): `4.5%` + * [SVG Tiny 1.2](#svg-tiny-12): `4.7%` * [Animate](#animate-2): `0.0%` * [Conf](#conf-2): `0.0%` * [Coords](#coords-2): `50.0%` @@ -38,7 +38,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T * [Linking](#linking-2): `0.0%` * [Media](#media-2): `0.0%` * [Metadata](#metadata-2): `0.0%` - * [Paint](#paint-2): `7.4%` + * [Paint](#paint-2): `9.0%` * [Paths](#paths-2): `15.3%` * [Render](#render-2): `37.5%` * [Script](#script-2): `0.0%` @@ -51,7 +51,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T ## [SVG 1.1 (Second Edition)](https://www.w3.org/TR/SVG11/) -`19.3%` of tests covered (101/522). They can be splitted into following categories: +`19.5%` of tests covered (102/522). They can be splitted into following categories: ### [Animate](https://www.w3.org/TR/SVG11/animate.html): `0.0%` @@ -398,10 +398,10 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T |❌|[metadata-example-01-t](SVGViewTests/w3c/1.1F2/svg/metadata-example-01-t.svg)| -### [Painting](https://www.w3.org/TR/SVG11/painting.html): `48.3%` +### [Painting](https://www.w3.org/TR/SVG11/painting.html): `51.6%`
- (15/31) tests covered... + (16/31) tests covered... |Status | Name| |------|-------| @@ -416,7 +416,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T |✅|[painting-fill-03-t](SVGViewTests/w3c/1.1F2/svg/painting-fill-03-t.svg)| |✅|[painting-fill-04-t](SVGViewTests/w3c/1.1F2/svg/painting-fill-04-t.svg)| |✅|[painting-fill-05-b](SVGViewTests/w3c/1.1F2/svg/painting-fill-05-b.svg)| -|❌|[painting-marker-01-f](SVGViewTests/w3c/1.1F2/svg/painting-marker-01-f.svg)| +|✅|[painting-marker-01-f](SVGViewTests/w3c/1.1F2/svg/painting-marker-01-f.svg)| |❌|[painting-marker-02-f](SVGViewTests/w3c/1.1F2/svg/painting-marker-02-f.svg)| |❌|[painting-marker-03-f](SVGViewTests/w3c/1.1F2/svg/painting-marker-03-f.svg)| |❌|[painting-marker-04-f](SVGViewTests/w3c/1.1F2/svg/painting-marker-04-f.svg)| @@ -785,7 +785,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T ## [SVG Tiny 1.2](https://www.w3.org/TR/SVGTiny12/) -`4.5%` of tests covered (27/590). They can be splitted into following categories: +`4.7%` of tests covered (28/591). They can be splitted into following categories: ### [Animate](https://www.w3.org/TR/SVGTiny12/animate.html): `0.0%` @@ -1135,10 +1135,10 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T |❌|[metadata-example-01-t](SVGViewTests/w3c/1.2T/svg/metadata-example-01-t.svg)|
-### [Paint](https://www.w3.org/TR/SVGTiny12/paint.html): `7.4%` +### [Paint](https://www.w3.org/TR/SVGTiny12/paint.html): `9.0%`
- (4/54) tests covered... + (5/55) tests covered... |Status | Name| |------|-------| @@ -1152,6 +1152,7 @@ This page is automatically generated and shows actual coverage of the [W3C SVG T |❌|[paint-fill-03-t](SVGViewTests/w3c/1.2T/svg/paint-fill-03-t.svg)| |✅|[paint-fill-04-t](SVGViewTests/w3c/1.2T/svg/paint-fill-04-t.svg)| |❌|[paint-fill-05-t](SVGViewTests/w3c/1.2T/svg/paint-fill-05-t.svg)| +|✅|[paint-fill-06-t](SVGViewTests/w3c/1.2T/svg/paint-fill-06-t.svg)| |❌|[paint-grad-04-t](SVGViewTests/w3c/1.2T/svg/paint-grad-04-t.svg)| |❌|[paint-grad-05-t](SVGViewTests/w3c/1.2T/svg/paint-grad-05-t.svg)| |❌|[paint-grad-07-t](SVGViewTests/w3c/1.2T/svg/paint-grad-07-t.svg)| From a1cffee1b09e7ef0e6214f720a4e6d3d8e9c4faf Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:39:41 +0800 Subject: [PATCH 16/25] Move code to SVGHelper --- Source/Model/Nodes/SVGMarker.swift | 10 +- .../SVG/Elements/SVGStructureParsers.swift | 142 ++---------------- Source/Parser/SVG/SVGContext.swift | 2 +- Source/Parser/SVG/SVGParserPrimitives.swift | 70 +++++++++ 4 files changed, 88 insertions(+), 136 deletions(-) diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index c7598d1..17b598f 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -65,7 +65,14 @@ public class SVGMarker: SVGNode { } #if os(WASI) || os(Linux) - // TODO + public var markerHeight: SVGLength + public var markerUnits: MarkerUnits + public var markerWidth: SVGLength + public var orient: Orient + public var preserveAspectRatio: SVGPreserveAspectRatio + public var refX: RefMagnitude + public var refY: RefMagnitude + public var viewBox: CGRect? public var contents: [SVGNode] = [] #else @Published public var markerHeight: SVGLength @@ -77,7 +84,6 @@ public class SVGMarker: SVGNode { @Published public var refY: RefMagnitude @Published public var viewBox: CGRect? @Published public var contents: [SVGNode] = [] -// @Published public var id: String? #endif public init(markerHeight: SVGLength, markerUnits: MarkerUnits, markerWidth: SVGLength, orient: Orient, preserveAspectRatio: SVGPreserveAspectRatio, refX: RefMagnitude, refY: RefMagnitude, viewBox: CGRect? = nil, contents: [SVGNode]) { diff --git a/Source/Parser/SVG/Elements/SVGStructureParsers.swift b/Source/Parser/SVG/Elements/SVGStructureParsers.swift index 4c4f692..366bc0d 100644 --- a/Source/Parser/SVG/Elements/SVGStructureParsers.swift +++ b/Source/Parser/SVG/Elements/SVGStructureParsers.swift @@ -12,67 +12,13 @@ class SVGViewportParser: SVGGroupParser { override func doParse(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> SVGNode? { let attributes = context.properties - let w = Self.parseDimension(attributes, "width") ?? SVGLength(percent: 100) - let h = Self.parseDimension(attributes, "height") ?? SVGLength(percent: 100) - let viewBox = Self.parseViewBox(attributes, context: context) - let par = Self.parsePreserveAspectRation(string: attributes["preserveAspectRatio"], context: context) + let w = SVGHelper.parseDimension(attributes, "width") ?? SVGLength(percent: 100) + let h = SVGHelper.parseDimension(attributes, "height") ?? SVGLength(percent: 100) + let viewBox = SVGHelper.parseViewBox(attributes, context: context) + let par = SVGHelper.parsePreserveAspectRatio(string: attributes["preserveAspectRatio"], context: context, defaultValue: SVGPreserveAspectRatio(scaling: SVGHelper.parseScaling("meet"), xAlign: .mid, yAlign: .mid)) return SVGViewport(width: w, height: h, viewBox: viewBox, preserveAspectRatio: par, contents: parseContents(context: context, delegate: delegate)) } - static func parseDimension(_ attributes: [String: String], _ key: String) -> SVGLength? { - guard let string = attributes[key] else { - return .none - } - if string.hasSuffix("%"), let value = Double(string.dropLast()) { - return SVGLength(percent: CGFloat(value)) - } - if let value = Double(string) { - return SVGLength(pixels: CGFloat(value)) - } - return .none - } - - static func parseViewBox(_ attributes: [String: String], context: SVGContext) -> CGRect? { - // TODO: temporary solution, all attributes should be case insensitive - if let string = attributes[ignoreCase: "viewBox"] { - let nums = string.components(separatedBy: .whitespaces) - if nums.count == 4, - let x = SVGLengthParser.xAxis.double(string: nums[0], context: context), - let y = SVGLengthParser.yAxis.double(string: nums[1], context: context), - let width = SVGLengthParser.xAxis.double(string: nums[2], context: context), - let height = SVGLengthParser.yAxis.double(string: nums[3], context: context) { - return CGRect(x: x, y: y, width: width, height: height) - } - } - return nil - } - - static func parsePreserveAspectRation(string: String?, context: SVGContext) -> SVGPreserveAspectRatio { - if let contentModeString = string { - let strings = contentModeString.components(separatedBy: CharacterSet(charactersIn: " ")) - if strings.count == 1 { // none - return SVGPreserveAspectRatio(scaling: parseScaling(strings[0])) - } - guard strings.count == 2 else { - context.log(message: "Invalid content mode \(contentModeString)") - return SVGPreserveAspectRatio() - } - - let alignString = strings[0] - var xAlign = alignString.prefix(4).lowercased() - xAlign.remove(at: xAlign.startIndex) - let xAligningMode = parseAlign(xAlign) - - var yAlign = alignString.suffix(4).lowercased() - yAlign.remove(at: yAlign.startIndex) - let yAligningMode = parseAlign(yAlign) - - let scalingMode = parseScaling(strings[1]) - return SVGPreserveAspectRatio(scaling: scalingMode, xAlign: xAligningMode, yAlign: yAligningMode) - } - return SVGPreserveAspectRatio() - } - static func parseAlign(_ string: String) -> SVGPreserveAspectRatio.Align { switch string { case "min": return .min @@ -137,12 +83,12 @@ class SVGMarkerParser: SVGBaseElementParser { override func doParse(context: SVGNodeContext, delegate: (XMLElement) -> SVGNode?) -> SVGNode? { let attributes = context.properties - let markerWidth = Self.parseDimension(attributes, "markerWidth") ?? SVGLength(percent: 100) - let markerHeight = Self.parseDimension(attributes, "markerHeight") ?? SVGLength(percent: 100) + let markerWidth = SVGHelper.parseDimension(attributes, "markerWidth") ?? SVGLength(percent: 100) + let markerHeight = SVGHelper.parseDimension(attributes, "markerHeight") ?? SVGLength(percent: 100) let markerUnits = Self.parseMarkerUnits(attributes["markerUnits"]) let orient = Self.parseOrient(attributes["orient"]) - let viewBox = Self.parseViewBox(attributes, context: context) - let par = Self.parsePreserveAspectRatio(string: attributes["preserveAspectRatio"], context: context) + let viewBox = SVGHelper.parseViewBox(attributes, context: context) + let par = SVGHelper.parsePreserveAspectRatio(string: attributes["preserveAspectRatio"], context: context, defaultValue: SVGPreserveAspectRatio(scaling: SVGHelper.parseScaling("meet"), xAlign: .mid, yAlign: .mid)) let refX = Self.parseRefMagnitude(attributes, "refX") let refY = Self.parseRefMagnitude(attributes, "refY") return SVGMarker(markerHeight: markerHeight, markerUnits: markerUnits, markerWidth: markerWidth, orient: orient, preserveAspectRatio: par, refX: refX, refY: refY, viewBox: viewBox, contents: parseContents(context: context, delegate: delegate)) @@ -154,19 +100,6 @@ class SVGMarkerParser: SVGBaseElementParser { .compactMap { delegate($0) } } - static func parseDimension(_ attributes: [String: String], _ key: String) -> SVGLength? { - guard let string = attributes[key] else { - return .none - } - if string.hasSuffix("%"), let value = Double(string.dropLast()) { - return SVGLength(percent: CGFloat(value)) - } - if let value = Double(string) { - return SVGLength(pixels: CGFloat(value)) - } - return .none - } - static func parseMarkerUnits(_ string: String?) -> SVGMarker.MarkerUnits { if let anchor = string { if anchor == "userSpaceOnUse" { @@ -203,67 +136,10 @@ class SVGMarkerParser: SVGBaseElementParser { return .left } else if value == "center" { return .center - } else if let magnitude = Self.parseDimension(attributes, key) { + } else if let magnitude = SVGHelper.parseDimension(attributes, key) { return .coordinate(magnitude) } else { return .coordinate(.zero) } } - - static func parsePreserveAspectRatio(string: String?, context: SVGContext) -> SVGPreserveAspectRatio { - if let contentModeString = string { - let strings = contentModeString.components(separatedBy: CharacterSet(charactersIn: " ")) - if strings.count == 1 { // none - return SVGPreserveAspectRatio(scaling: parseScaling(strings[0])) - } - guard strings.count == 2 else { - context.log(message: "Invalid content mode \(contentModeString)") - return SVGPreserveAspectRatio() - } - - let alignString = strings[0] - var xAlign = alignString.prefix(4).lowercased() - xAlign.remove(at: xAlign.startIndex) - let xAligningMode = parseAlign(xAlign) - - var yAlign = alignString.suffix(4).lowercased() - yAlign.remove(at: yAlign.startIndex) - let yAligningMode = parseAlign(yAlign) - - let scalingMode = parseScaling(strings[1]) - return SVGPreserveAspectRatio(scaling: scalingMode, xAlign: xAligningMode, yAlign: yAligningMode) - } - return SVGPreserveAspectRatio(scaling: parseScaling("xMidYMid")) - } - - static func parseAlign(_ string: String) -> SVGPreserveAspectRatio.Align { - switch string { - case "min": return .min - case "max": return .max - default: return .mid - } - } - - static func parseScaling(_ string: String) -> SVGPreserveAspectRatio.Scaling { - switch string { - case "meet": return .meet - case "slice": return .slice - default: return .none - } - } - - static func parseViewBox(_ attributes: [String: String], context: SVGContext) -> CGRect? { - // TODO: temporary solution, all attributes should be case insensitive - if let string = attributes[ignoreCase: "viewBox"] { - let nums = string.components(separatedBy: .whitespaces) - if nums.count == 4, - let x = SVGLengthParser.xAxis.double(string: nums[0], context: context), - let y = SVGLengthParser.yAxis.double(string: nums[1], context: context), - let width = SVGLengthParser.xAxis.double(string: nums[2], context: context), - let height = SVGLengthParser.yAxis.double(string: nums[3], context: context) { - return CGRect(x: x, y: y, width: width, height: height) - } - } - return nil - } } diff --git a/Source/Parser/SVG/SVGContext.swift b/Source/Parser/SVG/SVGContext.swift index 2bd58ea..5506fcc 100644 --- a/Source/Parser/SVG/SVGContext.swift +++ b/Source/Parser/SVG/SVGContext.swift @@ -115,7 +115,7 @@ class SVGNodeContext: SVGContext { private static func replaceRoot(element: XMLElement, context: SVGContext) -> SVGRootContext { if element.name == "svg" { - if let viewBox = SVGViewportParser.parseViewBox(element.attributes, context: context) { + if let viewBox = SVGHelper.parseViewBox(element.attributes, context: context) { let screen = SVGScreen(ppi: context.screen.ppi, width: viewBox.width, height: viewBox.height) return SVGRootContext(logger: context.logger, linker: context.linker, screen: screen, index: context.index, defaultFontSize: context.defaultFontSize) } diff --git a/Source/Parser/SVG/SVGParserPrimitives.swift b/Source/Parser/SVG/SVGParserPrimitives.swift index 1348699..7570527 100644 --- a/Source/Parser/SVG/SVGParserPrimitives.swift +++ b/Source/Parser/SVG/SVGParserPrimitives.swift @@ -188,4 +188,74 @@ public class SVGHelper: NSObject { let move = CGAffineTransform(translationX: absoluteBounds.minX, y: absoluteBounds.minY) return scale.concatenating(move) } + + static func parseViewBox(_ attributes: [String: String], context: SVGContext) -> CGRect? { + // TODO: temporary solution, all attributes should be case insensitive + if let string = attributes[ignoreCase: "viewBox"] { + let nums = string.components(separatedBy: .whitespaces) + if nums.count == 4, + let x = SVGLengthParser.xAxis.double(string: nums[0], context: context), + let y = SVGLengthParser.yAxis.double(string: nums[1], context: context), + let width = SVGLengthParser.xAxis.double(string: nums[2], context: context), + let height = SVGLengthParser.yAxis.double(string: nums[3], context: context) { + return CGRect(x: x, y: y, width: width, height: height) + } + } + return nil + } + + static func parseDimension(_ attributes: [String: String], _ key: String) -> SVGLength? { + guard let string = attributes[key] else { + return .none + } + if string.hasSuffix("%"), let value = Double(string.dropLast()) { + return SVGLength(percent: CGFloat(value)) + } + if let value = Double(string) { + return SVGLength(pixels: CGFloat(value)) + } + return .none + } + + static func parsePreserveAspectRatio(string: String?, context: SVGContext, defaultValue: SVGPreserveAspectRatio) -> SVGPreserveAspectRatio { + if let contentModeString = string { + let strings = contentModeString.components(separatedBy: CharacterSet(charactersIn: " ")) + if strings.count == 1 { // none + return SVGPreserveAspectRatio(scaling: parseScaling(strings[0])) + } + guard strings.count == 2 else { + context.log(message: "Invalid content mode \(contentModeString)") + return SVGPreserveAspectRatio() + } + + let alignString = strings[0] + var xAlign = alignString.prefix(4).lowercased() + xAlign.remove(at: xAlign.startIndex) + let xAligningMode = parseAlign(xAlign) + + var yAlign = alignString.suffix(4).lowercased() + yAlign.remove(at: yAlign.startIndex) + let yAligningMode = parseAlign(yAlign) + + let scalingMode = parseScaling(strings[1]) + return SVGPreserveAspectRatio(scaling: scalingMode, xAlign: xAligningMode, yAlign: yAligningMode) + } + return SVGPreserveAspectRatio(scaling: parseScaling("xMidYMid")) + } + + static func parseAlign(_ string: String) -> SVGPreserveAspectRatio.Align { + switch string { + case "min": return .min + case "max": return .max + default: return .mid + } + } + + static func parseScaling(_ string: String) -> SVGPreserveAspectRatio.Scaling { + switch string { + case "meet": return .meet + case "slice": return .slice + default: return .none + } + } } From 14fad59deb8e3465d11a486e921fb3c77d71089a Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 15:40:38 +0800 Subject: [PATCH 17/25] Remove PolyfillTests.swift --- .../PolyfillTests.swift | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 Tests/ExternalSVGSamplesTests/PolyfillTests.swift diff --git a/Tests/ExternalSVGSamplesTests/PolyfillTests.swift b/Tests/ExternalSVGSamplesTests/PolyfillTests.swift deleted file mode 100644 index 930091d..0000000 --- a/Tests/ExternalSVGSamplesTests/PolyfillTests.swift +++ /dev/null @@ -1,44 +0,0 @@ -// -// PolyfillTests.swift -// SVGView -// -// Tests for CoreGraphicsPolyfill.swift - comprehensive testing of the CoreGraphics -// polyfill implementation for WASI/Linux platforms where CoreGraphics is not available. -// -// These tests verify: -// - CGAffineTransform operations (identity, translation, scaling, rotation, concatenation) -// - CGPath functionality (basic operations, bounding box calculation, shape addition) -// - MBezierPath operations (initialization, path building, transformations, arc handling) -// - PathElement enum and extensions -// - Edge cases and error handling -// -// On platforms with native CoreGraphics (macOS, iOS), only a fallback test runs -// since the polyfill types are aliases to the native CoreGraphics types. -// - -import XCTest - -@testable import SVGView - -final class MermaidMindmapTests: XCTestCase { - let svgCode1 = """ - -
Tropical FruitsDurianJackfruitPapayaAvocadoBananaPineapple300+ varieties inThailandStrong odourThorn-covered rindLargest tree fruit200-500 fruits per yearTropical regionscultivation5-10m tallLarge palmately lobedleavesSingle stemMexico to Costa RicaoriginOily fruitAlligator pearElongated curved fruitStarchy fleshMultiple varieties1-1.5m tallUp to 200 flowersMultiple fruit formation - """ - - func testMermaidMindmap() { - let node = SVGParser.parse(contentsOf: svgCode1)! - let content = Serializer.serialize(node) - print(content) - } -} From bec2668d2d6404645c46ca3d750535ec41085098 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 16:53:34 +0800 Subject: [PATCH 18/25] Update test fixtures --- SVGViewTests/SVGRefGenerator.swift | 1 + .../w3c/1.1F2/refs/color-prop-01-b.ref | 11 +-- .../w3c/1.1F2/refs/color-prop-02-f.ref | 4 +- .../w3c/1.1F2/refs/color-prop-03-t.ref | 4 +- .../w3c/1.1F2/refs/color-prop-04-t.ref | 30 ++++---- .../w3c/1.1F2/refs/color-prop-05-t.ref | 4 +- .../w3c/1.1F2/refs/coords-coord-01-t.ref | 4 +- .../w3c/1.1F2/refs/coords-coord-02-t.ref | 4 +- .../w3c/1.1F2/refs/coords-trans-01-b.ref | 40 ++++++----- .../w3c/1.1F2/refs/coords-trans-02-t.ref | 20 +++--- .../w3c/1.1F2/refs/coords-trans-03-t.ref | 20 +++--- .../w3c/1.1F2/refs/coords-trans-04-t.ref | 14 ++-- .../w3c/1.1F2/refs/coords-trans-05-t.ref | 14 ++-- .../w3c/1.1F2/refs/coords-trans-06-t.ref | 16 +++-- .../w3c/1.1F2/refs/coords-trans-07-t.ref | 12 ++-- .../w3c/1.1F2/refs/coords-trans-08-t.ref | 12 ++-- .../w3c/1.1F2/refs/coords-trans-09-t.ref | 32 +++++---- .../w3c/1.1F2/refs/coords-trans-10-f.ref | 22 +++--- .../w3c/1.1F2/refs/coords-trans-11-f.ref | 22 +++--- .../w3c/1.1F2/refs/coords-trans-12-f.ref | 24 ++++--- .../w3c/1.1F2/refs/coords-trans-13-f.ref | 22 +++--- .../w3c/1.1F2/refs/coords-trans-14-f.ref | 24 ++++--- .../1.1F2/refs/coords-transformattr-01-f.ref | 28 ++++---- .../1.1F2/refs/coords-transformattr-02-f.ref | 24 ++++--- .../1.1F2/refs/coords-transformattr-03-f.ref | 12 ++-- .../1.1F2/refs/coords-transformattr-04-f.ref | 12 ++-- .../1.1F2/refs/coords-transformattr-05-f.ref | 18 ++--- .../w3c/1.1F2/refs/coords-units-02-b.ref | 24 ++++--- .../w3c/1.1F2/refs/coords-units-03-b.ref | 48 +++++++------ .../w3c/1.1F2/refs/masking-opacity-01-b.ref | 30 ++++---- .../w3c/1.1F2/refs/painting-control-02-f.ref | 4 +- .../w3c/1.1F2/refs/painting-control-03-f.ref | 4 +- .../w3c/1.1F2/refs/painting-fill-01-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-fill-02-t.ref | 12 ++-- .../w3c/1.1F2/refs/painting-fill-03-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-fill-04-t.ref | 6 +- .../w3c/1.1F2/refs/painting-fill-05-b.ref | 4 +- .../w3c/1.1F2/refs/painting-marker-01-f.ref | 1 + .../w3c/1.1F2/refs/painting-stroke-01-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-stroke-02-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-stroke-03-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-stroke-04-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-stroke-05-t.ref | 6 +- .../w3c/1.1F2/refs/painting-stroke-07-t.ref | 6 +- .../w3c/1.1F2/refs/painting-stroke-08-t.ref | 6 +- .../w3c/1.1F2/refs/painting-stroke-09-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-01-t.ref | 22 +++--- .../w3c/1.1F2/refs/paths-data-02-t.ref | 20 +++--- .../w3c/1.1F2/refs/paths-data-03-f.ref | 18 ++--- .../w3c/1.1F2/refs/paths-data-04-t.ref | 16 +++-- .../w3c/1.1F2/refs/paths-data-05-t.ref | 12 ++-- .../w3c/1.1F2/refs/paths-data-06-t.ref | 12 ++-- .../w3c/1.1F2/refs/paths-data-07-t.ref | 12 ++-- .../w3c/1.1F2/refs/paths-data-08-t.ref | 14 ++-- .../w3c/1.1F2/refs/paths-data-09-t.ref | 10 +-- .../w3c/1.1F2/refs/paths-data-10-t.ref | 70 ++++++++++--------- .../w3c/1.1F2/refs/paths-data-12-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-13-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-14-t.ref | 6 +- .../w3c/1.1F2/refs/paths-data-15-t.ref | 6 +- .../w3c/1.1F2/refs/paths-data-16-t.ref | 6 +- .../w3c/1.1F2/refs/paths-data-17-f.ref | 4 +- .../w3c/1.1F2/refs/paths-data-18-f.ref | 6 +- .../w3c/1.1F2/refs/paths-data-19-f.ref | 4 +- .../w3c/1.1F2/refs/paths-data-20-f.ref | 4 +- .../w3c/1.1F2/refs/pservers-grad-01-b.ref | 8 ++- .../w3c/1.1F2/refs/pservers-grad-02-b.ref | 8 ++- .../w3c/1.1F2/refs/pservers-grad-04-b.ref | 8 ++- .../w3c/1.1F2/refs/pservers-grad-05-b.ref | 8 ++- .../w3c/1.1F2/refs/pservers-grad-07-b.ref | 10 +-- .../w3c/1.1F2/refs/pservers-grad-09-b.ref | 12 +++- .../w3c/1.1F2/refs/render-elems-01-t.ref | 10 +-- .../w3c/1.1F2/refs/render-elems-02-t.ref | 10 +-- .../w3c/1.1F2/refs/render-elems-03-t.ref | 10 +-- .../w3c/1.1F2/refs/shapes-circle-01-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-circle-02-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-ellipse-01-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-ellipse-02-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-ellipse-03-f.ref | 8 ++- .../w3c/1.1F2/refs/shapes-grammar-01-f.ref | 6 +- .../w3c/1.1F2/refs/shapes-intro-01-t.ref | 20 +++--- .../w3c/1.1F2/refs/shapes-line-01-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-line-02-f.ref | 6 +- .../w3c/1.1F2/refs/shapes-polygon-01-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-polygon-02-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-polygon-03-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-polyline-01-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-polyline-02-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-rect-02-t.ref | 4 +- .../w3c/1.1F2/refs/shapes-rect-04-f.ref | 4 +- .../w3c/1.1F2/refs/shapes-rect-05-f.ref | 8 ++- .../w3c/1.1F2/refs/shapes-rect-06-f.ref | 4 +- .../w3c/1.1F2/refs/struct-defs-01-t.ref | 17 ++++- .../w3c/1.1F2/refs/struct-frag-01-t.ref | 2 + .../w3c/1.1F2/refs/struct-frag-06-t.ref | 23 +++--- .../w3c/1.1F2/refs/struct-group-01-t.ref | 6 +- .../w3c/1.1F2/refs/struct-image-01-t.ref | 4 +- .../w3c/1.1F2/refs/struct-image-04-t.ref | 4 +- .../w3c/1.1F2/refs/struct-use-03-t.ref | 25 +++++-- .../w3c/1.1F2/refs/styling-class-01-f.ref | 4 +- .../w3c/1.1F2/refs/styling-css-01-b.ref | 15 ++-- .../w3c/1.1F2/refs/styling-pres-01-t.ref | 4 +- .../w3c/1.1F2/refs/types-basic-01-f.ref | 12 ++-- .../w3c/1.2T/refs/coords-trans-01-t.ref | 40 ++++++----- .../w3c/1.2T/refs/coords-trans-02-t.ref | 20 +++--- .../w3c/1.2T/refs/coords-trans-03-t.ref | 20 +++--- .../w3c/1.2T/refs/coords-trans-04-t.ref | 14 ++-- .../w3c/1.2T/refs/coords-trans-05-t.ref | 14 ++-- .../w3c/1.2T/refs/coords-trans-06-t.ref | 16 +++-- .../w3c/1.2T/refs/coords-trans-07-t.ref | 12 ++-- .../w3c/1.2T/refs/coords-trans-08-t.ref | 12 ++-- .../w3c/1.2T/refs/coords-trans-09-t.ref | 32 +++++---- .../w3c/1.2T/refs/paint-color-03-t.ref | 4 +- .../w3c/1.2T/refs/paint-color-201-t.ref | 36 +++++----- .../w3c/1.2T/refs/paint-fill-04-t.ref | 6 +- .../w3c/1.2T/refs/paint-fill-06-t.ref | 6 +- .../w3c/1.2T/refs/paint-stroke-01-t.ref | 10 +-- .../w3c/1.2T/refs/paths-data-01-t.ref | 22 +++--- .../w3c/1.2T/refs/paths-data-02-t.ref | 20 +++--- .../w3c/1.2T/refs/render-elems-01-t.ref | 10 +-- .../w3c/1.2T/refs/render-elems-02-t.ref | 10 +-- .../w3c/1.2T/refs/render-elems-03-t.ref | 10 +-- .../w3c/1.2T/refs/shapes-circle-01-t.ref | 6 +- .../w3c/1.2T/refs/shapes-ellipse-01-t.ref | 6 +- .../w3c/1.2T/refs/shapes-line-01-t.ref | 6 +- .../w3c/1.2T/refs/shapes-polygon-01-t.ref | 6 +- .../w3c/1.2T/refs/shapes-polyline-01-t.ref | 6 +- .../w3c/1.2T/refs/shapes-rect-02-t.ref | 6 +- .../w3c/1.2T/refs/struct-defs-01-t.ref | 15 +++- .../w3c/1.2T/refs/struct-frag-01-t.ref | 2 + .../w3c/1.2T/refs/struct-use-03-t.ref | 25 +++++-- 131 files changed, 960 insertions(+), 647 deletions(-) diff --git a/SVGViewTests/SVGRefGenerator.swift b/SVGViewTests/SVGRefGenerator.swift index 6eceeaf..84c2381 100644 --- a/SVGViewTests/SVGRefGenerator.swift +++ b/SVGViewTests/SVGRefGenerator.swift @@ -130,6 +130,7 @@ class SVGRefGenerator: XCTestCase { createReference(name: "paint-color-03-t", version: v12) createReference(name: "paint-color-201-t", version: v12) createReference(name: "paint-fill-04-t", version: v12) + createReference(name: "paint-fill-06-t", version: v12) createReference(name: "paint-stroke-01-t", version: v12) createReference(name: "paths-data-01-t", version: v12) createReference(name: "paths-data-02-t", version: v12) diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref index 6fa6428..e115f98 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref @@ -1,10 +1,13 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ + SVGDefs { }, SVGGroup { contents: [ SVGGroup { @@ -35,19 +38,19 @@ SVGViewport { text: "fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 120, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 170.0000000000] }, SVGText { text: "stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 310, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 170.0000000000] }, SVGText { text: "stop-color", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 180, 205] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 205.0000000000] } ] } @@ -60,7 +63,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref index 12da7d2..ab4ce8c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -86,7 +88,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref index 1b2cfb9..3106dc6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -65,7 +67,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref index 0c8c283..34c339c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "Scene_1", - transform: [1, 0, 0, 1, 240, 180], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 180.0000000000], contents: [ SVGRect { x: -230, y: -170, width: 460, height: 300, fill: "#6363CE" }, SVGRect { x: -220, y: -160, width: 440, height: 280, fill: "white" }, @@ -26,43 +28,43 @@ SVGViewport { text: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 0.0000000000] }, SVGText { text: "Vestibulum pulvinar. Duis laoreet, nunc vitae facilisis", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 20.0000000000] }, SVGText { text: "tristique, pede sem iaculis mi, non consectetuer lorem", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 40.0000000000] }, SVGText { text: "libero et est. Donec imperdiet purus sed odio. Duis", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 60.0000000000] }, SVGText { text: "venenatis tortor eu lectus. Suspendisse sed metus at", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 80.0000000000] }, SVGText { text: "metus viverra ultricies. Mauris porttitor, justo a vulputate", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, -148, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 100.0000000000] } ] }, SVGGroup { id: "dropdown", - transform: [1, 0, 0, 1, 2, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 2.0000000000, 0.0000000000], contents: [ SVGRect { id: "drop-bg", @@ -77,14 +79,14 @@ SVGViewport { text: "Load", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1, 0, 0, 1, -138, 24] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -138.0000000000, 24.0000000000] }, SVGRect { x: -143, y: 40, width: 102, height: 34, fill: "silver" }, SVGText { text: "Save", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1, 0, 0, 1, -138, 64] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -138.0000000000, 64.0000000000] }, SVGPath { path: "M-149,83 h114 v-94", @@ -106,13 +108,13 @@ SVGViewport { text: "File", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1, 0, 0, 1, -141, -32] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -141.0000000000, -32.0000000000] }, SVGText { text: "Edit", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1, 0, 0, 1, -90, -32] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -32.0000000000] } ] }, @@ -133,7 +135,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 24, weight: "bold" }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 5, -78] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, -78.0000000000] }, SVGGroup { id: "button", @@ -157,7 +159,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref index 19141af..c5bbc06 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -19,7 +21,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref index 8c05b11..c2d20eb 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref index e3bea53..6065b02 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref index 0441491..d25270d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "test-grid", @@ -599,41 +601,41 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 50, 50], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0, -1, 1, 0, 150, 70], + transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 1, 1, 250, 50], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 350, 50], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [2, 0, 0, 2, 210, 120], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 210.0000000000, 120.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -648,7 +650,7 @@ SVGViewport { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 40, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -657,7 +659,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 140, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -666,7 +668,7 @@ SVGViewport { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 240, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -675,7 +677,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 340, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -684,7 +686,7 @@ SVGViewport { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 200, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -700,20 +702,20 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3, 0, 0, 2, 50.000001, 210], + transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 50.0000010000, 210.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [3, 0, 0, 2, 0, 0], + transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16.666667, 105], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -732,7 +734,7 @@ SVGViewport { text: "scale(25, 95) and translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 40, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -741,7 +743,7 @@ SVGViewport { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 240, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 200.0000000000] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -761,7 +763,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref index 9a763c8..0e8beb6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, -30, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 50, 50], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0, -1, 1, 0, 150, 70], + transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -34,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -30, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], contents: [ SVGText { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -49,7 +51,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 140, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -69,7 +71,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref index a540963..040965d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, -560, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 1, 1, 250, 50], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 350, 50], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -34,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -560, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], contents: [ SVGText { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 240, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -49,7 +51,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 340, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -69,7 +71,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref index 2b88abe..4ed6207 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref @@ -1,22 +1,24 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, 60, 45], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, 60.0000000000, 45.0000000000], contents: [ SVGGroup { - transform: [2, 0, 0, 2, 40, 10], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 40.0000000000, 10.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -26,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -364, -230], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -364.0000000000, -230.0000000000], contents: [ SVGText { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 200, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -52,7 +54,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref index d611929..10aa942 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref @@ -1,22 +1,24 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "nested-transforms-test", contents: [ SVGGroup { id: "nested-transforms", - transform: [1, 0, 0, 1, -90, -450], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -450.0000000000], contents: [ SVGGroup { - transform: [7.5, 0, 0, 5, 125.0000025, 525], + transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 125.0000025000, 525.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -26,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -90, -450], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -90.0000000000, -450.0000000000], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -52,7 +54,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref index f5ae544..b530445 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "nested-transforms-test", @@ -15,13 +17,13 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [1, 0, 0, 1, -102, -450], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -102.0000000000, -450.0000000000], contents: [ SVGGroup { - transform: [7.5, 0, 0, 5, 0, 0], + transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16.666667, 105], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -35,13 +37,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -600, -450], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -600.0000000000, -450.0000000000], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 248, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 248.0000000000, 200.0000000000] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -61,7 +63,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref index 6f588a2..daca048 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 123.2050807569, 186.6025403784], + transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 123.2050807569, 186.6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -20,11 +22,11 @@ SVGViewport { text: "rotate+translate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 65, 185] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 185.0000000000] }, SVGGroup { id: "object_2", - transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 200, 100], + transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 200.0000000000, 100.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -34,7 +36,7 @@ SVGViewport { text: "translate+rotate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 150, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 100.0000000000] } ] } @@ -47,7 +49,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref index 4ff220c..09ee367 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [2, 1, 1, 1, 0, 0], + transform: [2.0000000000, 1.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -23,11 +25,11 @@ SVGViewport { text: "skewX(45)+skewY(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 30, 16] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 16.0000000000] }, SVGGroup { id: "object_2", - transform: [1, 1, 1, 2, 200, 0], + transform: [1.0000000000, 1.0000000000, 1.0000000000, 2.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -40,7 +42,7 @@ SVGViewport { text: "skewY(45)+skewX(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 230, 16] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 16.0000000000] } ] } @@ -53,7 +55,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref index 92c216a..7cfc994 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { id: "elementary-transforms-test", contents: [ SVGGroup { - transform: [0, 0, 0, 0, 0, 0], + transform: [0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -19,10 +21,10 @@ SVGViewport { text: "matrix(0 0 0 0 0 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 6, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 6.0000000000, 20.0000000000] }, SVGGroup { - transform: [1, 0, 0, 1, 100, 100], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -32,10 +34,10 @@ SVGViewport { text: "matrix(1 0 0 1 100 100)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 100, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000] }, SVGGroup { - transform: [1.5, 0, 0, 1.5, 70, 60], + transform: [1.5000000000, 0.0000000000, 0.0000000000, 1.5000000000, 70.0000000000, 60.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -45,10 +47,10 @@ SVGViewport { text: "matrix(1.5 0 0 1.5 70 60)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 70, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 60.0000000000] }, SVGGroup { - transform: [1, 0, 0.5, 1, 30, 170], + transform: [1.0000000000, 0.0000000000, 0.5000000000, 1.0000000000, 30.0000000000, 170.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -58,10 +60,10 @@ SVGViewport { text: "matrix(1 0 0.5 1 30 170)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 30, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 170.0000000000] }, SVGGroup { - transform: [1, 0.5, 0, 1, 100, 200], + transform: [1.0000000000, 0.5000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -71,10 +73,10 @@ SVGViewport { text: "matrix(1 0.5 0 1 100 200)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 100, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000] }, SVGGroup { - transform: [0, 1, -1, 0, 450, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 450.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -84,10 +86,10 @@ SVGViewport { text: "matrix(0 1 -1 0 450 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 275, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 30.0000000000] }, SVGGroup { - transform: [1, 0.8, 0.8, 1, 300, 220], + transform: [1.0000000000, 0.8000000000, 0.8000000000, 1.0000000000, 300.0000000000, 220.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -97,7 +99,7 @@ SVGViewport { text: "matrix(1 0.8 0.8 1 300 220)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 230, 220] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 220.0000000000] } ] } @@ -110,7 +112,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref index d270387..8453492 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 40, 20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -14,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 0, 1, 40, 20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -41,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -62,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 0, 100], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 100.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 40, 20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -73,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 0, 1, 40, 20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -100,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -131,7 +133,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref index 021ca5c..6f69913 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.2, 0, 0, 2.5, 0, 0], + transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -14,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.2, 0, 0, 2.5, 0, 0], + transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -41,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -62,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 0, 150], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], contents: [ SVGGroup { - transform: [1.2, 0, 0, 2.5, 0, 0], + transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -73,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.2, 0, 0, 2.5, 0, 0], + transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -100,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -131,7 +133,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref index 437c260..ee689ab 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref @@ -1,15 +1,17 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [0, 1, -1, 0, 0, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -17,14 +19,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [0, 1, -1, 0, 0, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -44,7 +46,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -67,10 +69,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 310, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [0, 1, -1, 0, 0, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -78,14 +80,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [0, 1, -1, 0, 0, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -105,7 +107,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -136,7 +138,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref index be8ef6b..d5b6192 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 1, 1, 0, 0], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -14,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 1, 1, 0, 0], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -41,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -62,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 0, 150], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], contents: [ SVGGroup { - transform: [1, 0, 1, 1, 0, 0], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -73,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 1, 1, 0, 0], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -100,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -131,7 +133,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref index bccdf1a..f76f2b9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref @@ -1,15 +1,17 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [0.7047694656, -0.2565151075, 0.2565151075, 0.7047694656, 0, 0], + transform: [0.7047694656, -0.2565151075, 0.2565151075, 0.7047694656, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 1, 0, 1, 0, 0], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -17,14 +19,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 0, 0], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -44,7 +46,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -65,10 +67,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 0, 150], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], contents: [ SVGGroup { - transform: [1, 1, 0, 1, 0, 0], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -76,14 +78,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 0, 0], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -103,7 +105,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1, 0, 0, 1, 160, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] }, SVGRect { x: 250, @@ -136,7 +138,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref index 5bc5ed8..d64b659 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref @@ -1,18 +1,20 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 100, @@ -23,13 +25,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 125, y: 125, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 125, @@ -42,13 +44,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 150, y: -75, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 150, @@ -61,13 +63,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 300, y: -150, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 300, @@ -80,13 +82,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 400, y: -325, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 400, @@ -99,13 +101,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 500, y: -200, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], contents: [ SVGRect { x: 500, @@ -126,7 +128,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref index 8e0e12f..32712ed 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 150, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 0.0000000000], contents: [ SVGGroup { transform: [1.4142135624, 1.4142135624, -1.4142135624, 1.4142135624, -17.0710678119, 1.2132034356], @@ -24,16 +26,16 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, -10, -20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -10.0000000000, -20.0000000000], contents: [ SVGGroup { - transform: [2, 0, 0, 2, 0, 0], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0, 0], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 5, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 10.0000000000], contents: [ SVGRect { width: 50, height: 50, fill: "black" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "black" }, @@ -54,19 +56,19 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, -10, -20], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -10.0000000000, -20.0000000000], contents: [ SVGGroup { - transform: [2, 0, 0, 2, 0, 0], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0, 0], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 5, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 10.0000000000], contents: [ SVGRect { width: 50, height: 50, fill: "red" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "red" }, @@ -114,7 +116,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref index 6f99e13..c82fbac 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { width: 100, height: 200, fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGEllipse { cx: 170, cy: 100, rx: 50, ry: 100, fill: "red" }, SVGEllipse { @@ -19,7 +21,7 @@ SVGViewport { rx: 50, ry: 100, fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGLine { x1: 230, @@ -36,13 +38,13 @@ SVGViewport { y2: 200, fill: "black", stroke: { fill: "black", width: 10 }, - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGPath { path: "M340,0 L440,0 L390,200 z", fill: "red" }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] } ] }, @@ -53,7 +55,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref index e45a281..a0d682d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { width: 50, height: 100, fill: "black", - transform: [2, 0, 0, 2, 0, 0] + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] }, SVGEllipse { cx: 160, cy: 100, rx: 50, ry: 100, fill: "red" }, SVGEllipse { @@ -19,7 +21,7 @@ SVGViewport { rx: 25, ry: 50, fill: "black", - transform: [2, 0, 0, 2, 0, 0] + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] }, SVGLine { x1: 220, @@ -36,13 +38,13 @@ SVGViewport { y2: 100, fill: "black", stroke: { fill: "black", width: 5 }, - transform: [2, 0, 0, 2, 0, 0] + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "red" }, SVGPath { path: "M165,0 L215,0 L190,100 z", fill: "black", - transform: [2, 0, 0, 2, 0, 0] + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] } ] }, @@ -53,7 +55,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref index c778a43..f0d5754 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref @@ -1,15 +1,17 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 50, 15], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 15.0000000000], contents: [ SVGGroup { - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0], + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000], contents: [ SVGRect { x: 10, width: 100, height: 200, fill: "red" }, SVGEllipse { cx: 170, cy: 100, rx: 50, ry: 100, fill: "red" }, @@ -25,13 +27,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0], + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000], contents: [ SVGRect { width: 100, height: 200, fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGEllipse { cx: 160, @@ -39,7 +41,7 @@ SVGViewport { rx: 50, ry: 100, fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGLine { x1: 220, @@ -48,12 +50,12 @@ SVGViewport { y2: 200, fill: "black", stroke: { fill: "black", width: 10 }, - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "black", - transform: [1, 0, 0, 1, 10, 0] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] } ] } @@ -68,7 +70,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref index aafa245..6391152 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -11,10 +13,10 @@ SVGViewport { text: "CSS pixel coordinate to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1, 0, 0, 1, 60, 35] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 35.0000000000] }, SVGGroup { - transform: [4, 0, 0, 4, 5, 0], + transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 5.0000000000, 0.0000000000], contents: [ SVGCircle { cx: 7.5, cy: 7.5, r: 2.5, fill: "black" }, SVGCircle { cx: 7.5, cy: 7.5, r: 1.5, fill: "fuchsia" } @@ -24,10 +26,10 @@ SVGViewport { text: "Percentage coordinates to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1, 0, 0, 1, 60, 85] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 85.0000000000] }, SVGGroup { - transform: [4, 0, 0, 4, 5, 50], + transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 5.0000000000, 50.0000000000], contents: [ SVGCircle { cx: 7.5, cy: 7.5, r: 2.5, fill: "black" }, SVGCircle { @@ -42,10 +44,10 @@ SVGViewport { text: "CSS width/height to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1, 0, 0, 1, 60, 140] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 140.0000000000] }, SVGGroup { - transform: [4, 0, 0, 4, 30, 115], + transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 30.0000000000, 115.0000000000], contents: [ SVGRect { x: -5, width: 10, height: 5, fill: "black" }, SVGRect { x: -5, y: 5, width: 10, height: 5, fill: "fuchsia" } @@ -55,10 +57,10 @@ SVGViewport { text: "Percentage width/height to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1, 0, 0, 1, 60, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 200.0000000000] }, SVGGroup { - transform: [4, 0, 0, 4, 30, 175], + transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 30.0000000000, 175.0000000000], contents: [ SVGRect { x: -5, width: 10, height: 5, fill: "black" }, SVGRect { x: -5, y: 5, width: 9.9984, height: 5.0004, fill: "fuchsia" } @@ -68,10 +70,10 @@ SVGViewport { text: "CSS and percentage length conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1, 0, 0, 1, 140, 265] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 265.0000000000] }, SVGGroup { - transform: [4, 0, 4, 4, 30, 260], + transform: [4.0000000000, 0.0000000000, 4.0000000000, 4.0000000000, 30.0000000000, 260.0000000000], contents: [ SVGCircle { r: 3.536, fill: "black" }, SVGCircle { cx: 10, r: 3.536, fill: "fuchsia" }, @@ -103,7 +105,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref index eb573b8..e2b38a6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -16,49 +18,49 @@ SVGViewport { text: "Initial viewport and CSS units test", font: { name: "Arial", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 125, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] }, SVGGroup { id: "units-test", - transform: [1, 0, 0, 1, 0, 60], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 60.0000000000], contents: [ SVGText { text: "200", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 18] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 18.0000000000] }, SVGText { text: "User space units (no specifier)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 20.0000000000] }, SVGRect { x: 20, y: 20, width: 200, height: 1, fill: "black" }, SVGText { text: "200 px", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 38.0000000000] }, SVGText { text: "Pixels (px)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 40.0000000000] }, SVGRect { x: 20, y: 40, width: 200, height: 1, fill: "black" }, SVGText { text: "20 em = 200 px (font-size=10px)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 58] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 58.0000000000] }, SVGText { text: "Relative to font size (em)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 60.0000000000] }, SVGGroup { contents: [ @@ -69,13 +71,13 @@ SVGViewport { text: "40 ex", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 78] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 78.0000000000] }, SVGText { text: "Relative to font x-height (ex)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 80.0000000000] }, SVGGroup { contents: [ @@ -86,78 +88,78 @@ SVGViewport { text: "41.67% = 200 px", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 98] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 98.0000000000] }, SVGText { text: "Percentage (%)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 100.0000000000] }, SVGRect { x: 20, y: 100, width: 200.01600000000002, height: 1, fill: "black" }, SVGText { text: "1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 118] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 118.0000000000] }, SVGText { text: "Inches (in)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 120] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 120.0000000000] }, SVGRect { x: 20, y: 120, width: 96, height: 1, fill: "black" }, SVGText { text: "2.54 cm = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 138] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 138.0000000000] }, SVGText { text: "Centimeters (cm)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 140] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 140.0000000000] }, SVGRect { x: 20, y: 140, width: 96, height: 1, fill: "black" }, SVGText { text: "25.4 mm = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 158] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 158.0000000000] }, SVGText { text: "Millimeters (mm)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 160] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 160.0000000000] }, SVGRect { x: 20, y: 160, width: 95.99999999999999, height: 1, fill: "black" }, SVGText { text: "72pt = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 178] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 178.0000000000] }, SVGText { text: "Points (pt)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 180] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 180.0000000000] }, SVGRect { x: 20, y: 180, width: 96, height: 1, fill: "black" }, SVGText { text: "6pc = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 20, 198] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 198.0000000000] }, SVGText { text: "Picas (pc)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1, 0, 0, 1, 230, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 200.0000000000] }, SVGRect { x: 20, y: 200, width: 96, height: 1, fill: "black" } ] @@ -171,7 +173,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref index 5e24d45..6ab2dc2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Test for opacity property on a group.", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 50, 27] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 27.0000000000] }, SVGRect { x: 10, y: 30, width: 100, height: 260, fill: "red" }, SVGGroup { @@ -22,19 +24,19 @@ SVGViewport { text: "Group opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 62] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 62.0000000000] }, SVGText { text: "Blue rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 80.0000000000] }, SVGText { text: "Green rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 98] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 98.0000000000] }, SVGGroup { opacity: 0.5, @@ -47,19 +49,19 @@ SVGViewport { text: "Group opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 122] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 122.0000000000] }, SVGText { text: "Blue rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 140] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 140.0000000000] }, SVGText { text: "Green rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 158] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 158.0000000000] }, SVGGroup { contents: [ @@ -71,19 +73,19 @@ SVGViewport { text: "Group opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 182] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 182.0000000000] }, SVGText { text: "Blue rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 200.0000000000] }, SVGText { text: "Green rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 218] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 218.0000000000] }, SVGGroup { opacity: 0.5, @@ -96,19 +98,19 @@ SVGViewport { text: "Group opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 242] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 242.0000000000] }, SVGText { text: "Blue rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 260.0000000000] }, SVGText { text: "Green rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 200, 278] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 278.0000000000] } ] }, @@ -119,7 +121,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref index 438d779..df41474 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -30,7 +32,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref index 575468f..c2232e5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -32,7 +34,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref index a3083bd..be2aa67 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 40, 42] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 42.0000000000] }, SVGRect { id: "fill-01", @@ -32,13 +34,13 @@ SVGViewport { text: "fill=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 75, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 280.0000000000] }, SVGText { text: "fill=\"green\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 275, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 280.0000000000] } ] }, @@ -49,7 +51,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref index abc7257..acb66d1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -11,13 +13,13 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 30, 42] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 42.0000000000] }, SVGText { text: "fill=\"currentColor\"", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 100, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 80.0000000000] }, SVGRect { id: "fill-03", @@ -41,13 +43,13 @@ SVGViewport { text: "green", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 80, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 280.0000000000] }, SVGText { text: "blue", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 290, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 280.0000000000] } ] } @@ -60,7 +62,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref index 4adb331..fa9d405 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 30, 42] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 42.0000000000] }, SVGPath { path: "M110,75 l50,160 l-130,-100 l160,0 l-130,100 z", @@ -24,13 +26,13 @@ SVGViewport { text: "fill-rule=\"evenodd\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 10, 282] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 282.0000000000] }, SVGText { text: "fill-rule=\"nonzero\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 260, 282] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 260.0000000000, 282.0000000000] } ] }, @@ -41,7 +43,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref index 3279865..8ed7a80 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "G1", - transform: [1, 0, 0, 1, 120, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], contents: [ SVGRect { width: 90, @@ -68,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref index 7e57753..c85820c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -110,7 +112,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref index 55977d0..48f2544 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref @@ -1,6 +1,7 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ SVGDefs { }, SVGGroup { diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref index e8d1187..fbffc0b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 10, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] }, SVGRect { id: "stroke-01", x: 90, y: 70, width: 300, height: 50, fill: "blue" }, SVGRect { @@ -25,13 +27,13 @@ SVGViewport { text: "stroke=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 140, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 150.0000000000] }, SVGText { text: "stroke=\"green\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 148, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 148.0000000000, 280.0000000000] } ] }, @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref index c2f1f3c..132be98 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 10, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] }, SVGRect { id: "stroke-01", @@ -31,13 +33,13 @@ SVGViewport { text: "stroke-width=\"20\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 120, 160] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 160.0000000000] }, SVGText { text: "stroke-linejoin=\"round\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 58, 290] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 58.0000000000, 290.0000000000] } ] }, @@ -48,7 +50,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref index ab5c8ca..e86d5e1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 10, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] }, SVGPath { path: "M160,70 l200,20 l-200,20", @@ -23,13 +25,13 @@ SVGViewport { text: "stroke-linecap=\"round\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 60, 160] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 160.0000000000] }, SVGText { text: "stroke-miterlimit=\"1\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 130, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, 280.0000000000] } ] }, @@ -40,7 +42,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref index 160b4fd..c166433 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 10, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 60.0000000000] }, SVGPath { id: "stroke-7b", @@ -25,13 +27,13 @@ SVGViewport { text: "stroke-dasharray=\"10, 10\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 65, 210] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 210.0000000000] }, SVGText { text: "stroke-dashoffset=\"10\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 75, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 260.0000000000] } ] }, @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref index c60eeae..128e646 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 30.0000000000] }, SVGPolyline { points: [30, 50, 30, 300], @@ -163,7 +165,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref index addeb94..a7b70d5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.2, 0, 0, 1.2, 72, 36], + transform: [1.2000000000, 0.0000000000, 0.0000000000, 1.2000000000, 72.0000000000, 36.0000000000], contents: [ SVGPath { path: "M20,20 L200,30 L20,40", @@ -43,7 +45,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref index 6ed673b..e0845d1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.7, 0, 0, 1.7, 50, 0], + transform: [1.7000000000, 0.0000000000, 0.0000000000, 1.7000000000, 50.0000000000, 0.0000000000], contents: [ SVGCircle { cx: 200, cy: 20, r: 5, fill: "#FF6666" }, SVGCircle { cx: 200, cy: 40, r: 5, fill: "#FF6666" }, @@ -70,7 +72,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref index cc3d185..4034fc6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -18,7 +20,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref index 61bf2c7..80ee8f0 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Cubic bezier curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 100, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 14.0000000000] }, SVGPath { id: "X_curve_MCSmcs", @@ -27,7 +29,7 @@ SVGViewport { text: "M, C, S, m, c, s", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 5, 82] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 82.0000000000] }, SVGPath { id: "Infinity_McccCz", @@ -42,7 +44,7 @@ SVGViewport { text: "M, c, c, c, C, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 253, 50] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 253.0000000000, 50.0000000000] }, SVGPath { id: "Line_MCZ", @@ -55,7 +57,7 @@ SVGViewport { text: "M, C, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 110, 190] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, 190.0000000000] }, SVGPath { id: "Inv_V_MCcZ", @@ -69,7 +71,7 @@ SVGViewport { text: "M, C, c, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 85, 220] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 85.0000000000, 220.0000000000] }, SVGPath { id: "Rem_Rib_mcs", @@ -83,7 +85,7 @@ SVGViewport { text: "m, c, s", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 165, 210] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 165.0000000000, 210.0000000000] }, SVGPath { id: "Arc_MC", @@ -97,7 +99,7 @@ SVGViewport { text: "M, C", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 360, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 150.0000000000] }, SVGPath { id: "Circle_Mcssz", @@ -113,7 +115,7 @@ SVGViewport { text: "M, c, s, s, s, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 290, 265] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 265.0000000000] }, SVGPath { id: "Horseshoe_Mcs", @@ -127,7 +129,7 @@ SVGViewport { text: "m, c, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 380, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 340.0000000000] } ] }, @@ -138,7 +140,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref index fb06a5b..88e770f 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Quadric bezier curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 120, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 14.0000000000] }, SVGPath { id: "Bez_MQMqz", @@ -20,7 +22,7 @@ SVGViewport { text: "M, Q, M, q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 80, 86] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 86.0000000000] }, SVGRect { x: 13, y: 18, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 128, y: 28, width: 4, height: 4, fill: "#00C000" }, @@ -36,7 +38,7 @@ SVGViewport { text: "m, q, z, m, q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 352, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 352.0000000000, 150.0000000000] }, SVGRect { x: 370, y: 128, width: 4, height: 4, fill: "blue" }, SVGRect { x: 420, y: 8, width: 4, height: 4, fill: "blue" }, @@ -51,7 +53,7 @@ SVGViewport { text: "M, Q, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 192, 36] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 192.0000000000, 36.0000000000] }, SVGRect { x: 222, y: 101, width: 4, height: 4, fill: "blue" }, SVGRect { x: 302, y: 31, width: 4, height: 4, fill: "blue" }, @@ -65,7 +67,7 @@ SVGViewport { text: "M, Q, T, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 308, 188] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 308.0000000000, 188.0000000000] }, SVGRect { x: 206, y: 166, width: 4, height: 4, fill: "blue" }, SVGRect { x: 306, y: 166, width: 4, height: 4, fill: "blue" }, @@ -80,7 +82,7 @@ SVGViewport { text: "M, Q, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 80, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 200.0000000000] }, SVGRect { x: 58, y: 98, width: 4, height: 4, fill: "blue" }, SVGRect { x: 58, y: 198, width: 4, height: 4, fill: "blue" }, @@ -94,7 +96,7 @@ SVGViewport { text: "M, q, t, t, t, t, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 380, 236] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 236.0000000000] }, SVGRect { x: 238, y: 294, width: 4, height: 4, fill: "blue" }, SVGRect { x: 285, y: 294, width: 4, height: 4, fill: "blue" }, @@ -112,7 +114,7 @@ SVGViewport { text: "M, q, Q, q, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 48, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 280.0000000000] }, SVGRect { x: 170, y: 191, width: 4, height: 4, fill: "#40DD20" }, SVGRect { x: 170, y: 241, width: 4, height: 4, fill: "#40DD20" }, @@ -128,7 +130,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref index 4795d08..a2eae8d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Elliptical arc curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 120, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 14.0000000000] }, SVGPath { id: "Arc_MAZ", @@ -20,7 +22,7 @@ SVGViewport { text: "M, A, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 48, 70] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 70.0000000000] }, SVGRect { x: 23, y: 68, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 23, y: 67, width: 4, height: 4, fill: "#00C000" }, @@ -34,7 +36,7 @@ SVGViewport { text: "m, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 124, 45] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 124.0000000000, 45.0000000000] }, SVGRect { x: 148, y: 98, width: 4, height: 4, fill: "#CF0000" }, SVGRect { x: 173, y: 28, width: 4, height: 4, fill: "#CF0000" }, @@ -47,7 +49,7 @@ SVGViewport { text: "M, a", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 390, 300] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 390.0000000000, 300.0000000000] }, SVGRect { x: 348, y: 243, width: 4, height: 4, fill: "blue" }, SVGRect { x: 428, y: 303, width: 4, height: 4, fill: "blue" }, @@ -61,7 +63,7 @@ SVGViewport { text: "M, A, a, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 280, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 280.0000000000, 135.0000000000] }, SVGRect { x: 268, y: 28, width: 4, height: 4, fill: "blue" }, SVGRect { x: 343, y: 28, width: 4, height: 4, fill: "blue" }, @@ -77,7 +79,7 @@ SVGViewport { text: "M, a, Z, m, A, Z, m, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 25, 270] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 25.0000000000, 270.0000000000] }, SVGRect { x: 28, y: 148, width: 4, height: 4, fill: "blue" }, SVGRect { x: 93, y: 198, width: 4, height: 4, fill: "blue" }, @@ -94,7 +96,7 @@ SVGViewport { text: "M, A, A, A, A", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 215, 246] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 215.0000000000, 246.0000000000] }, SVGRect { x: 213, y: 188, width: 4, height: 4, fill: "blue" }, SVGRect { x: 263, y: 188, width: 4, height: 4, fill: "blue" }, @@ -111,7 +113,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref index c27c468..41b518e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, 0, 0], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], contents: [ SVGText { text: "M, L, L, L, Z,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 88, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 88.0000000000, 30.0000000000] }, SVGText { text: "subpath", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 98, 46] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 98.0000000000, 46.0000000000] }, SVGText { text: "M, L, L, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 88, 61] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 88.0000000000, 61.0000000000] }, SVGPath { id: "Triangle_stroke_MLZ", @@ -41,7 +43,7 @@ SVGViewport { text: "stroked", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 42, 162] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 42.0000000000, 162.0000000000] }, SVGPath { id: "Triangle_fill_MLZ", @@ -59,7 +61,7 @@ SVGViewport { text: "filled", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 162, 162] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 162.0000000000, 162.0000000000] } ] } @@ -72,7 +74,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref index 124525d..77a5e31 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, 0, -270], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, -270.0000000000], contents: [ SVGText { text: "m, l, l, l, z,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 96, 180] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 96.0000000000, 180.0000000000] }, SVGText { text: "subpath", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 100, 194] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 194.0000000000] }, SVGText { text: "m, l, l, l, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 97, 208] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 97.0000000000, 208.0000000000] }, SVGPath { id: "Triangle_stroke_mlz", @@ -60,7 +62,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref index 6ec79cc..825ff59 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, -360, 0], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, -360.0000000000, 0.0000000000], contents: [ SVGText { text: "M, H, V, H,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 288, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 30.0000000000] }, SVGText { text: "V. H, V, H,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 288, 46] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 46.0000000000] }, SVGText { text: "V, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 304, 62] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 304.0000000000, 62.0000000000] }, SVGPath { id: "Stairs_stroke_MHVZ", @@ -63,7 +65,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref index 60e1159..3dbb181 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, -360, -270], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, -360.0000000000, -270.0000000000], contents: [ SVGText { text: "m, h, v, h", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 288, 180] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 180.0000000000] }, SVGText { text: "v, h, v, h", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 288, 194] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 194.0000000000] }, SVGText { text: "v, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 304, 208] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 304.0000000000, 208.0000000000] }, SVGPath { id: "Stairs_stroke_mhvz", @@ -63,7 +65,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref index a651ecd..2a9900f 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,16 +11,16 @@ SVGViewport { text: "Lines drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 75, 34] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 34.0000000000] }, SVGText { text: "M and Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 180, 64] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 64.0000000000] }, SVGGroup { - transform: [1.8, 0, 0, 1.8, 0, 0], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { id: "Triangle_stroke_MZ", @@ -35,7 +37,7 @@ SVGViewport { text: "stroked", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 42, 162] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 42.0000000000, 162.0000000000] }, SVGPath { id: "Triangle_fill_MZ", @@ -53,7 +55,7 @@ SVGViewport { text: "filled", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 162, 162] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 162.0000000000, 162.0000000000] } ] } @@ -66,7 +68,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref index e40f4c9..b8d0b89 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,16 +11,16 @@ SVGViewport { text: "Lines drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 75, 34] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 34.0000000000] }, SVGText { text: "m and z", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 180, 64] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 64.0000000000] }, SVGGroup { - transform: [1.8, 0, 0, 1.8, 0, -270], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, -270.0000000000], contents: [ SVGPath { id: "Triangle_stroke_mz", @@ -54,7 +56,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref index 50ca797..4767e69 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref @@ -1,39 +1,41 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 10, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 10.0000000000], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] }, SVGText { text: "join=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] }, SVGText { text: "cap=butt", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] }, SVGText { text: "M, L", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] }, SVGGroup { - transform: [1, 0, 0, 1, 115, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], contents: [ SVGPath { id: "triangle-01", @@ -46,34 +48,34 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 10, 115], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 115.0000000000], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] }, SVGText { text: "join=bevel", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] }, SVGText { text: "cap=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] }, SVGText { text: "m, l", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] }, SVGGroup { - transform: [1, 0, 0, 1, 115, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], contents: [ SVGPath { id: "triangle-02", @@ -86,34 +88,34 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 10, 220], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 220.0000000000], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] }, SVGText { text: "join=miter", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] }, SVGText { text: "cap=square", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] }, SVGText { text: "M, L", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 10, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] }, SVGGroup { - transform: [1, 0, 0, 1, 115, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], contents: [ SVGPath { id: "triangle-03", @@ -126,31 +128,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 250, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 10.0000000000], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] }, SVGText { text: "join=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] }, SVGText { text: "cap=butt", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] }, SVGText { text: "M, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] }, SVGGroup { contents: [ @@ -165,31 +167,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 250, 115], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 115.0000000000], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] }, SVGText { text: "join=bevel", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] }, SVGText { text: "cap=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] }, SVGText { text: "m, l, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] }, SVGGroup { contents: [ @@ -204,31 +206,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 250, 220], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 220.0000000000], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] }, SVGText { text: "join=miter", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 38] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] }, SVGText { text: "cap=square", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 56] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] }, SVGText { text: "M, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 125, 74] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] }, SVGGroup { contents: [ @@ -251,7 +253,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref index fd0d7b5..29503e0 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -31,7 +33,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref index 95aa311..1081cc1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -24,7 +26,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref index 900a2be..662de51 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, 0, 0], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], contents: [ SVGPath { path: "m62,56 l51.96152,90 l-103.92304,0 l51.96152,-90 z m0,15 l38.97114,67.5 l-77.91228,0 l38.97114,-67.5 z", @@ -28,7 +30,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref index 9d36c2a..c4e232b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8, 0, 0, 1.8, 36, 90], + transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 36.0000000000, 90.0000000000], contents: [ SVGPath { path: "M20,20 Q50,10,80,20 Q110,30,140,20 Q170,10,200,20", @@ -30,7 +32,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref index cdd6f63..70d2b19 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Test relative-ness of implicit lineto path commands", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 10, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] }, SVGGroup { contents: [ @@ -48,7 +50,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref index a0d5da5..de84bce 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -30,7 +32,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref index 5ca86c2..bfe37c8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -17,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [8, 0, 0, 2, 60, -30], + transform: [8.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 60.0000000000, -30.0000000000], contents: [ SVGPath { path: "M20,40 H40", @@ -100,7 +102,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref index df05762..ea5d5a7 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -142,7 +144,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref index bace40f..79ce39e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -62,7 +64,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref index af9c1b6..28e0e0d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,14 +12,14 @@ SVGViewport { text: "Linear gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 130] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Referencing gradient below.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] } ] }, @@ -28,7 +30,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref index 363a4e0..7828b05 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,14 +12,14 @@ SVGViewport { text: "Radial gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 130] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Referencing gradient below.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] } ] }, @@ -28,7 +30,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref index 30dbefa..3a792b8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,14 +12,14 @@ SVGViewport { text: "Multi-color linear gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 130] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Multi-color radial gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1, 0, 0, 1, 20, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] } ] }, @@ -28,7 +30,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref index ffafc11..09a8867 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,14 +11,14 @@ SVGViewport { text: "Background", font: { name: "SVGFreeSansASCII,sans-serif", size: 60 }, fill: "aqua", - transform: [1, 0, 0, 1, 70, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 80.0000000000] }, SVGRect { x: 20, y: 20, width: 440, height: 80 }, SVGText { text: "Background", font: { name: "SVGFreeSansASCII,sans-serif", size: 60 }, fill: "aqua", - transform: [1, 0, 0, 1, 70, 210] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 210.0000000000] }, SVGRect { x: 20, y: 150, width: 440, height: 80 } ] @@ -28,7 +30,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref index 21caf6b..841ecd8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref @@ -1,19 +1,21 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1.5, 0, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.5000000000, 0.0000000000, 0.0000000000], contents: [ SVGRect { x: 10, y: 10, width: 430, height: 60 }, SVGText { text: "Linear gradient filled rectangle", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 10, 90] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 90.0000000000] }, SVGRect { x: 25, @@ -26,7 +28,7 @@ SVGViewport { text: "Linear gradient on stroke of rectangle", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1, 0, 0, 1, 10, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 170.0000000000] } ] } @@ -39,7 +41,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref index 05a789f..071cd02 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,11 +11,15 @@ SVGViewport { text: "Testing gradientUnits attribute", font: { name: "SVGFreeSansASCII,sans-serif", size: 15 }, fill: "black", - transform: [1, 0, 0, 1, 10, 25] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 25.0000000000] }, SVGRect { x: 125, y: 35, width: 200, height: 50 }, SVGRect { x: 10, y: 125, width: 430, height: 50 }, - SVGRect { width: 50, height: 430, transform: [0, -1, 1, 0, 10, 260] } + SVGRect { + width: 50, + height: 430, + transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 10.0000000000, 260.0000000000] + } ] }, SVGGroup { @@ -23,7 +29,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref index 99fb6e1..c8c992e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -17,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -29,7 +31,7 @@ SVGViewport { text: "Shape fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 130, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, -30.0000000000] } ] } @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref index 8d2f4ea..df93fe4 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -17,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -29,7 +31,7 @@ SVGViewport { text: "Shape stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 110, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, -30.0000000000] } ] } @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref index 532bbce..8493143 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -18,7 +20,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +33,7 @@ SVGViewport { text: "Shape fill and stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 70, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, -30.0000000000] } ] } @@ -44,7 +46,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref index 7eb9f99..71f63a6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -48,7 +50,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref index bc1be4d..9417d26 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -48,7 +50,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref index 8bea217..410a590 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -58,7 +60,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref index c5e8d7e..5130ebc 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -46,7 +48,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref index 3fa2b0c..25ee29d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 150, 150], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 150.0000000000], contents: [ SVGLine { y1: -100, @@ -28,7 +30,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0.8660254038, -0.5, 0.5, 0.8660254038, 350, 150], + transform: [0.8660254038, -0.5000000000, 0.5000000000, 0.8660254038, 350.0000000000, 150.0000000000], contents: [ SVGLine { y1: -100, @@ -58,7 +60,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref index cd378bc..fb334e3 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 400], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 400.0000000000], contents: [ SVGGroup { contents: [ @@ -45,7 +47,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref index 65d03b6..2b3a44a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -92,49 +94,49 @@ SVGViewport { text: "Stroked", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 5, 90] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 90.0000000000] }, SVGText { text: "Unstroked", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 5, 195] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 195.0000000000] }, SVGText { text: "Zero width rect", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 50, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 135.0000000000] }, SVGText { text: "Zero height rect", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 130, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, 135.0000000000] }, SVGText { text: "Zero radius circle", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 210, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 210.0000000000, 135.0000000000] }, SVGText { text: "Zero x radius ellipse", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 315, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 315.0000000000, 135.0000000000] }, SVGText { text: "Zero y radius ellipse", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 394, 135] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 394.0000000000, 135.0000000000] }, SVGText { text: "Zero length line", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1, 0, 0, 1, 235, 290] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 235.0000000000, 290.0000000000] } ] }, @@ -215,7 +217,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref index 3a49e4c..2d03380 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -189,7 +191,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref index 1374d34..540e29a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -20,7 +22,7 @@ SVGViewport { y2: 100, fill: "red", stroke: { fill: "black", width: 10 }, - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0] + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000] } ] }, @@ -31,7 +33,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref index 3cdabe7..cef8928 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -46,7 +48,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref index 1724970..16503ef 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -79,7 +81,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref index 02b5af7..b9cec4e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -22,7 +24,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref index 1eb54b9..6c141c9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -46,7 +48,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref index e219c68..6676733 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -79,7 +81,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref index 32db594..f7e10f8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -66,7 +68,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref index c851658..89fa005 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -19,7 +21,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref index 9781b63..8017c3c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 100, 100], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], contents: [ SVGRect { width: 75, @@ -26,7 +28,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0.8660254038, -0.5, 0.8152074691, 0.6840402867, 100, 100], + transform: [0.8660254038, -0.5000000000, 0.8152074691, 0.6840402867, 100.0000000000, 100.0000000000], contents: [ SVGRect { x: 100, @@ -62,7 +64,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref index d75c1bb..56cf565 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -22,7 +24,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref index 85e5c2e..dc33e01 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref @@ -1,11 +1,24 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ - SVGRect { x: 140, y: 80, width: 200, height: 200, fill: "lime" } + SVGDefs { + id: "references", + contents: [ + SVGRect { id: "rect11", width: 480, height: 360, fill: "black" } + ] + }, + SVGRect { x: 140, y: 80, width: 200, height: 200, fill: "lime" }, + SVGDefs { + contents: [ + SVGRect { x: 160, y: 100, width: 160, height: 160, fill: "red" } + ] + } ] }, SVGGroup { @@ -15,7 +28,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-frag-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-frag-01-t.ref index 838e9d0..afae494 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-frag-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-frag-01-t.ref @@ -1,6 +1,8 @@ SVGViewport { id: "svg-root", + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content" } ] } diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref index 2342b41..5cebd7c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref @@ -2,6 +2,7 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,47 +10,47 @@ SVGViewport { text: "Default entities: amp, lt, gt, apos, quot:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 30, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 30.0000000000] }, SVGText { text: "&, <, >, ', \"", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1, 0, 0, 1, 90, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 60.0000000000] }, SVGText { text: "Character references:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 30, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 100.0000000000] }, SVGText { text: "A hexadecimal (A)= A", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1, 0, 0, 1, 90, 130] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 130.0000000000] }, SVGText { text: "A decimal (A)= A", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1, 0, 0, 1, 90, 160] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 160.0000000000] }, SVGText { text: "Entity references:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 30, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 200.0000000000] }, SVGText { text: "gray", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 105, 228] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 105.0000000000, 228.0000000000] }, SVGGroup { - transform: [0.2, 0, 0, 0.2, 90, 235], + transform: [0.2000000000, 0.0000000000, 0.0000000000, 0.2000000000, 90.0000000000, 235.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -62,10 +63,10 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 205, 228] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 205.0000000000, 228.0000000000] }, SVGGroup { - transform: [0.2, 0, 0, 0.2, 190, 235], + transform: [0.2000000000, 0.0000000000, 0.0000000000, 0.2000000000, 190.0000000000, 235.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -82,7 +83,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref index 221d508..2541037 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -24,7 +26,7 @@ SVGViewport { contents: [ SVGGroup { id: "yellowNrotate", - transform: [0.9396926208, -0.3420201433, 0.3420201433, 0.9396926208, 0, 0], + transform: [0.9396926208, -0.3420201433, 0.3420201433, 0.9396926208, 0.0000000000, 0.0000000000], contents: [ SVGRect { y: 224, width: 40, height: 40, fill: "yellow" }, SVGRect { y: 280, width: 40, height: 40, fill: "yellow" } @@ -41,7 +43,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref index 1ab27ac..38ba77c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -29,7 +31,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref index 33ad043..2590c1e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -29,7 +31,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref index 63d5e38..9d07c8b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref @@ -1,27 +1,40 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ + SVGDefs { + contents: [ + SVGRect { + id: "usedRect", + width: 100, + height: 100, + fill: "aqua", + stroke: { fill: "blue", width: 20 } + } + ] + }, SVGText { text: "Reference", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 120, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 60.0000000000] }, SVGText { text: "", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 360, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 60.0000000000] }, SVGGroup { id: "reference", - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813], contents: [ SVGRect { width: 100, @@ -32,14 +45,14 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 240, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 0.0000000000], contents: [ SVGRect { width: 100, height: 100, fill: "aqua", stroke: { fill: "blue", width: 20 }, - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813] + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813] } ] } @@ -52,7 +65,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref index 5ac1e34..6153107 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -27,7 +29,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref index e93be1b..044af2a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref @@ -1,15 +1,22 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ + SVGDefs { + contents: [ + SVGDefs { } + ] + }, SVGText { text: "element selectors:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 36] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 36.0000000000] }, SVGCircle { cx: 160, cy: 100, r: 30, fill: "green" }, SVGGroup { @@ -22,13 +29,13 @@ SVGViewport { fill: "green" }, SVGGroup { - transform: [1, 0, 0, 1, 0, 150], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], contents: [ SVGText { text: "class selectors:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 36] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 36.0000000000] }, SVGGroup { contents: [ @@ -51,7 +58,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref index 9a54752..5ce40b3 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -23,7 +25,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref index f6cd430..329035e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -35,7 +37,7 @@ SVGViewport { text: "Different forms of the type", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 50, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 200.0000000000] }, SVGGroup { contents: [ @@ -44,21 +46,21 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1, 0, 0, 1, 100, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 110.0000000000] }, SVGText { text: "5e1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1, 0, 0, 1, 200, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] }, SVGText { text: ".5e2", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1, 0, 0, 1, 300, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 300.0000000000, 110.0000000000] } ] } @@ -71,7 +73,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref index 88f5029..dae07c2 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "test-grid", @@ -599,41 +601,41 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 50, 50], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0, -1, 1, 0, 150, 70], + transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 1, 1, 250, 50], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 350, 50], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [2, 0, 0, 2, 210, 120], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 210.0000000000, 120.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -648,7 +650,7 @@ SVGViewport { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 40, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -657,7 +659,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 140, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -666,7 +668,7 @@ SVGViewport { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 240, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -675,7 +677,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 340, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -684,7 +686,7 @@ SVGViewport { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 200, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -700,20 +702,20 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3, 0, 0, 2, 50.000001, 210], + transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 50.0000010000, 210.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [3, 0, 0, 2, 0, 0], + transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16.666667, 105], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -732,7 +734,7 @@ SVGViewport { text: "scale(25, 95) and translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 40, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -741,7 +743,7 @@ SVGViewport { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1, 0, 0, 1, 240, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 200.0000000000] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -761,7 +763,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref index 6378b1c..615e70f 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, -30, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 50, 50], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0, -1, 1, 0, 150, 70], + transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -34,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -30, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], contents: [ SVGText { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -49,7 +51,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 140, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -69,7 +71,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref index b3cf351..1187e42 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref @@ -1,30 +1,32 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1, 0, 0, 1, 0, 10], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, -560, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 1, 1, 250, 50], + transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1, 1, 0, 1, 350, 50], + transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -34,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -560, 0], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], contents: [ SVGText { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 240, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -49,7 +51,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 340, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -69,7 +71,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref index 48d3338..1873e96 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref @@ -1,22 +1,24 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "elementary-transforms-test", contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5, 0, 0, 2.5, 60, 45], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, 60.0000000000, 45.0000000000], contents: [ SVGGroup { - transform: [2, 0, 0, 2, 40, 10], + transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 40.0000000000, 10.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -26,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -364, -230], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -364.0000000000, -230.0000000000], contents: [ SVGText { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 200, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -52,7 +54,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref index fb2563c..fb21209 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref @@ -1,22 +1,24 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "nested-transforms-test", contents: [ SVGGroup { id: "nested-transforms", - transform: [1, 0, 0, 1, -90, -450], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -450.0000000000], contents: [ SVGGroup { - transform: [7.5, 0, 0, 5, 125.0000025, 525], + transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 125.0000025000, 525.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -26,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -90, -450], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -90.0000000000, -450.0000000000], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 40, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -52,7 +54,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref index 9d50a8b..5baef2e 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 0, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], contents: [ SVGGroup { id: "nested-transforms-test", @@ -15,13 +17,13 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [1, 0, 0, 1, -102, -450], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -102.0000000000, -450.0000000000], contents: [ SVGGroup { - transform: [7.5, 0, 0, 5, 0, 0], + transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16.666667, 105], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -35,13 +37,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5, 0, 0, 2.5, -600, -450], + transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -600.0000000000, -450.0000000000], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 248, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 248.0000000000, 200.0000000000] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -61,7 +63,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref index 77452e6..ab2ec47 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "object_1", - transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 123.2050807569, 186.6025403784], + transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 123.2050807569, 186.6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -17,11 +19,11 @@ SVGViewport { text: "rotate+translate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 65, 185] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 185.0000000000] }, SVGGroup { id: "object_2", - transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 200, 100], + transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 200.0000000000, 100.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -31,7 +33,7 @@ SVGViewport { text: "translate+rotate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 150, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 100.0000000000] } ] }, @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref index 3921008..79a0839 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "object_1", - transform: [2, 1, 1, 1, 0, 0], + transform: [2.0000000000, 1.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -20,11 +22,11 @@ SVGViewport { text: "skewX(45)+skewY(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 30, 16] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 16.0000000000] }, SVGGroup { id: "object_2", - transform: [1, 1, 1, 2, 200, 0], + transform: [1.0000000000, 1.0000000000, 1.0000000000, 2.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -37,7 +39,7 @@ SVGViewport { text: "skewY(45)+skewX(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 230, 16] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 16.0000000000] } ] }, @@ -48,7 +50,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref index e6ff258..e02010f 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [0, 0, 0, 0, 0, 0], + transform: [0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -16,10 +18,10 @@ SVGViewport { text: "matrix(0 0 0 0 0 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 6, 20] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 6.0000000000, 20.0000000000] }, SVGGroup { - transform: [1, 0, 0, 1, 100, 100], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -29,10 +31,10 @@ SVGViewport { text: "matrix(1 0 0 1 100 100)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 100, 100] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000] }, SVGGroup { - transform: [1.5, 0, 0, 1.5, 70, 60], + transform: [1.5000000000, 0.0000000000, 0.0000000000, 1.5000000000, 70.0000000000, 60.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -42,10 +44,10 @@ SVGViewport { text: "matrix(1.5 0 0 1.5 70 60)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 70, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 60.0000000000] }, SVGGroup { - transform: [1, 0, 0.5, 1, 30, 170], + transform: [1.0000000000, 0.0000000000, 0.5000000000, 1.0000000000, 30.0000000000, 170.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -55,10 +57,10 @@ SVGViewport { text: "matrix(1 0 0.5 1 30 170)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 30, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 170.0000000000] }, SVGGroup { - transform: [1, 0.5, 0, 1, 100, 200], + transform: [1.0000000000, 0.5000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -68,10 +70,10 @@ SVGViewport { text: "matrix(1 0.5 0 1 100 200)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 100, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000] }, SVGGroup { - transform: [0, 1, -1, 0, 450, 0], + transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 450.0000000000, 0.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -81,10 +83,10 @@ SVGViewport { text: "matrix(0 1 -1 0 450 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 275, 30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 30.0000000000] }, SVGGroup { - transform: [1, 0.8, 0.8, 1, 300, 220], + transform: [1.0000000000, 0.8000000000, 0.8000000000, 1.0000000000, 300.0000000000, 220.0000000000], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -94,7 +96,7 @@ SVGViewport { text: "matrix(1 0.8 0.8 1 300 220)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1, 0, 0, 1, 230, 220] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 220.0000000000] } ] }, @@ -105,7 +107,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref index 5831043..85be17a 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -65,7 +67,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref index 23481fb..0d0e788 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -32,49 +34,49 @@ SVGViewport { text: "black", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 50] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 50.0000000000] }, SVGText { text: "silver", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 80.0000000000] }, SVGText { text: "gray", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 110.0000000000] }, SVGText { text: "white", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 140] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 140.0000000000] }, SVGText { text: "maroon", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 170.0000000000] }, SVGText { text: "red", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 200.0000000000] }, SVGText { text: "purple", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 230] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 230.0000000000] }, SVGText { text: "fuchsia", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 70, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 260.0000000000] }, SVGRect { x: 275, y: 30, width: 25, height: 25, fill: "green" }, SVGRect { x: 275, y: 60, width: 25, height: 25, fill: "lime" }, @@ -96,49 +98,49 @@ SVGViewport { text: "green", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 50] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 50.0000000000] }, SVGText { text: "lime", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 80] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 80.0000000000] }, SVGText { text: "olive", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 110] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 110.0000000000] }, SVGText { text: "yellow", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 140] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 140.0000000000] }, SVGText { text: "navy", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 170] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 170.0000000000] }, SVGText { text: "blue", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 200.0000000000] }, SVGText { text: "teal", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 230] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 230.0000000000] }, SVGText { text: "aqua", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1, 0, 0, 1, 310, 260] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 260.0000000000] } ] }, @@ -149,7 +151,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref index 93f2b48..9236751 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "G1", - transform: [1, 0, 0, 1, 120, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], contents: [ SVGRect { width: 90, @@ -68,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref index b601685..61aac6d 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref @@ -1,13 +1,15 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { id: "G1", - transform: [1, 0, 0, 1, 120, 30], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], contents: [ SVGRect { width: 90, @@ -68,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref index 1adc022..87be3a3 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -9,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1, 0, 0, 1, 10, 40] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] }, SVGRect { id: "stroke-01", x: 90, y: 70, width: 300, height: 50, fill: "blue" }, SVGRect { @@ -25,13 +27,13 @@ SVGViewport { text: "stroke=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 140, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 150.0000000000] }, SVGText { text: "stroke=\"red\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1, 0, 0, 1, 148, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 148.0000000000, 280.0000000000] } ] }, @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref b/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref index 4cd7348..9cd7c44 100644 --- a/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGPath { id: "X_curve_MCSmcs", @@ -28,7 +30,7 @@ SVGViewport { text: "M,C,S,m,c,s", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 5, 82] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 82.0000000000] }, SVGPath { id: "Infinity_McccCz", @@ -43,7 +45,7 @@ SVGViewport { text: "M,c,c,c,C,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 253, 50] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 253.0000000000, 50.0000000000] }, SVGPath { id: "Line_MCZ", @@ -56,7 +58,7 @@ SVGViewport { text: "M,C,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 110, 190] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, 190.0000000000] }, SVGPath { id: "Inv_V_MCcZ", @@ -70,7 +72,7 @@ SVGViewport { text: "M,C,c,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 85, 220] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 85.0000000000, 220.0000000000] }, SVGPath { id: "Rem_Rib_mcs", @@ -84,7 +86,7 @@ SVGViewport { text: "m,c,s", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 165, 210] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 165.0000000000, 210.0000000000] }, SVGPath { id: "Arc_MC", @@ -98,7 +100,7 @@ SVGViewport { text: "M,C", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 360, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 150.0000000000] }, SVGPath { id: "Circle_Mcssz", @@ -114,7 +116,7 @@ SVGViewport { text: "M,c,s,s,s,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 290, 265] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 265.0000000000] }, SVGPath { id: "Horseshoe_Mcs", @@ -128,7 +130,7 @@ SVGViewport { text: "m,c,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 380, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 340.0000000000] } ] }, @@ -139,7 +141,7 @@ SVGViewport { text: "$Revision: 1.13 $", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref b/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref index 0ca0d21..1d845ee 100644 --- a/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGPath { id: "Bez_MQMqz", @@ -21,7 +23,7 @@ SVGViewport { text: "M,Q,M,q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 80, 86] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 86.0000000000] }, SVGRect { x: 13, y: 18, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 128, y: 28, width: 4, height: 4, fill: "#00C000" }, @@ -37,7 +39,7 @@ SVGViewport { text: "m,q,z,m,q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 352, 150] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 352.0000000000, 150.0000000000] }, SVGRect { x: 370, y: 128, width: 4, height: 4, fill: "blue" }, SVGRect { x: 420, y: 8, width: 4, height: 4, fill: "blue" }, @@ -52,7 +54,7 @@ SVGViewport { text: "M,Q,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 192, 36] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 192.0000000000, 36.0000000000] }, SVGRect { x: 222, y: 101, width: 4, height: 4, fill: "blue" }, SVGRect { x: 302, y: 31, width: 4, height: 4, fill: "blue" }, @@ -66,7 +68,7 @@ SVGViewport { text: "M,Q,T,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 308, 188] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 308.0000000000, 188.0000000000] }, SVGRect { x: 206, y: 166, width: 4, height: 4, fill: "blue" }, SVGRect { x: 306, y: 166, width: 4, height: 4, fill: "blue" }, @@ -81,7 +83,7 @@ SVGViewport { text: "M,Q,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 80, 200] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 200.0000000000] }, SVGRect { x: 58, y: 98, width: 4, height: 4, fill: "blue" }, SVGRect { x: 58, y: 198, width: 4, height: 4, fill: "blue" }, @@ -95,7 +97,7 @@ SVGViewport { text: "M,q,t,t,t,t,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 380, 236] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 236.0000000000] }, SVGRect { x: 238, y: 294, width: 4, height: 4, fill: "blue" }, SVGRect { x: 285, y: 294, width: 4, height: 4, fill: "blue" }, @@ -113,7 +115,7 @@ SVGViewport { text: "M,q,Q,q,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1, 0, 0, 1, 48, 280] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 280.0000000000] }, SVGRect { x: 170, y: 191, width: 4, height: 4, fill: "red" }, SVGRect { x: 170, y: 241, width: 4, height: 4, fill: "red" }, @@ -129,7 +131,7 @@ SVGViewport { text: "$Revision: 1.13 $", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref index ed092af..3729de7 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -17,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -29,7 +31,7 @@ SVGViewport { text: "Shape fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 130, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, -30.0000000000] } ] } @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref index 3455de3..ace5637 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -17,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -29,7 +31,7 @@ SVGViewport { text: "Shape stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 110, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, -30.0000000000] } ] } @@ -42,7 +44,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref index 2540f88..3558b73 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref @@ -1,12 +1,14 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1, 30, 80], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], contents: [ SVGGroup { contents: [ @@ -18,7 +20,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 200, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +33,7 @@ SVGViewport { text: "Shape fill and stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1, 0, 0, 1, 70, -30] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, -30.0000000000] } ] } @@ -44,7 +46,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref index 2a207c9..b13b825 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGCircle { cx: 100, @@ -55,7 +57,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref index 684e985..caf5ac7 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGEllipse { id: "ellipse-01", @@ -65,7 +67,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref index 7c15c3f..d19ebfb 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGGroup { id: "diagonal-line-set", @@ -196,7 +198,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref index 032d049..de38aa1 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGPolygon { id: "polygon-01", @@ -53,7 +55,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref index 544e1df..cb6e379 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGPolyline { id: "polyline-01", @@ -53,7 +55,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref index b8edbc1..99cbce2 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref @@ -1,7 +1,9 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ @@ -10,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 240, 14] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] }, SVGGroup { contents: [ @@ -73,7 +75,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref index 2b5904d..f8b0eb7 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref @@ -1,10 +1,23 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ + SVGDefs { + id: "references", + contents: [ + SVGRect { id: "rect11", width: 480, height: 360, fill: "black" } + ] + }, + SVGDefs { + contents: [ + SVGRect { x: 160, y: 100, width: 160, height: 160, fill: "green" } + ] + }, SVGRect { x: 140, y: 80, width: 200, height: 200, fill: "red" } ] }, @@ -15,7 +28,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/struct-frag-01-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-frag-01-t.ref index 838e9d0..afae494 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-frag-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-frag-01-t.ref @@ -1,6 +1,8 @@ SVGViewport { id: "svg-root", + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content" } ] } diff --git a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref index e60b944..2b706b4 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref @@ -1,27 +1,40 @@ SVGViewport { id: "svg-root", viewBox: { width: 480, height: 360 }, + scaling: "none", contents: [ + SVGDefs { }, SVGGroup { id: "test-body-content", contents: [ + SVGDefs { + contents: [ + SVGRect { + id: "usedRect", + width: 100, + height: 100, + fill: "#FADC00", + stroke: { fill: "#C82828", width: 20 } + } + ] + }, SVGText { text: "Reference", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 120, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 60.0000000000] }, SVGText { text: "", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1, 0, 0, 1, 360, 60] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 60.0000000000] }, SVGGroup { id: "reference", - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813], contents: [ SVGRect { width: 100, @@ -32,14 +45,14 @@ SVGViewport { ] }, SVGGroup { - transform: [1, 0, 0, 1, 240, 0], + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 0.0000000000], contents: [ SVGRect { width: 100, height: 100, fill: "#FADC00", stroke: { fill: "#C82828", width: 20 }, - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813] + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813] } ] } @@ -52,7 +65,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1, 0, 0, 1, 10, 340] + transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] } ] }, From ada46ea5674beee653087b7da6d688cde931121a Mon Sep 17 00:00:00 2001 From: khoi Date: Tue, 27 May 2025 16:32:18 +0700 Subject: [PATCH 19/25] Restore the original logic of serialization --- Source/Serialization/Serializations.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/Serialization/Serializations.swift b/Source/Serialization/Serializations.swift index ca5e652..1b45d67 100644 --- a/Source/Serialization/Serializations.swift +++ b/Source/Serialization/Serializations.swift @@ -47,7 +47,18 @@ extension Double: SerializableAtom { extension CGAffineTransform: SerializableAtom { func serialize() -> String { - return String(format: "[%.10f, %.10f, %.10f, %.10f, %.10f, %.10f]", a, b, c, d, tx, ty) + let formatter = NumberFormatter() + formatter.minimumFractionDigits = 0 + formatter.maximumFractionDigits = 10 + + let nums = [a, b, c, d, tx, ty] + + var result = "" + for num in nums { + result += formatter.string(for: num) ?? "n/a" + result += ", " + } + return "[\(result.dropLast(2))]" } } From 0f8fd8f2da452427515ae500efc1b89bbb32dc07 Mon Sep 17 00:00:00 2001 From: khoi Date: Tue, 27 May 2025 20:17:44 +0700 Subject: [PATCH 20/25] Update test fixtures --- .../w3c/1.1F2/refs/color-prop-01-b.ref | 8 +-- .../w3c/1.1F2/refs/color-prop-02-f.ref | 2 +- .../w3c/1.1F2/refs/color-prop-03-t.ref | 2 +- .../w3c/1.1F2/refs/color-prop-04-t.ref | 28 ++++---- .../w3c/1.1F2/refs/color-prop-05-t.ref | 2 +- .../w3c/1.1F2/refs/coords-coord-01-t.ref | 2 +- .../w3c/1.1F2/refs/coords-coord-02-t.ref | 2 +- .../w3c/1.1F2/refs/coords-trans-01-b.ref | 38 +++++------ .../w3c/1.1F2/refs/coords-trans-02-t.ref | 18 ++--- .../w3c/1.1F2/refs/coords-trans-03-t.ref | 18 ++--- .../w3c/1.1F2/refs/coords-trans-04-t.ref | 12 ++-- .../w3c/1.1F2/refs/coords-trans-05-t.ref | 12 ++-- .../w3c/1.1F2/refs/coords-trans-06-t.ref | 14 ++-- .../w3c/1.1F2/refs/coords-trans-07-t.ref | 10 +-- .../w3c/1.1F2/refs/coords-trans-08-t.ref | 10 +-- .../w3c/1.1F2/refs/coords-trans-09-t.ref | 30 ++++---- .../w3c/1.1F2/refs/coords-trans-10-f.ref | 20 +++--- .../w3c/1.1F2/refs/coords-trans-11-f.ref | 20 +++--- .../w3c/1.1F2/refs/coords-trans-12-f.ref | 22 +++--- .../w3c/1.1F2/refs/coords-trans-13-f.ref | 20 +++--- .../w3c/1.1F2/refs/coords-trans-14-f.ref | 22 +++--- .../1.1F2/refs/coords-transformattr-01-f.ref | 26 +++---- .../1.1F2/refs/coords-transformattr-02-f.ref | 26 +++---- .../1.1F2/refs/coords-transformattr-03-f.ref | 10 +-- .../1.1F2/refs/coords-transformattr-04-f.ref | 10 +-- .../1.1F2/refs/coords-transformattr-05-f.ref | 16 ++--- .../w3c/1.1F2/refs/coords-units-02-b.ref | 22 +++--- .../w3c/1.1F2/refs/coords-units-03-b.ref | 46 ++++++------- .../w3c/1.1F2/refs/masking-opacity-01-b.ref | 28 ++++---- .../w3c/1.1F2/refs/painting-control-02-f.ref | 2 +- .../w3c/1.1F2/refs/painting-control-03-f.ref | 2 +- .../w3c/1.1F2/refs/painting-fill-01-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-fill-02-t.ref | 10 +-- .../w3c/1.1F2/refs/painting-fill-03-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-fill-04-t.ref | 4 +- .../w3c/1.1F2/refs/painting-fill-05-b.ref | 2 +- .../w3c/1.1F2/refs/painting-marker-01-f.ref | 32 ++++----- .../w3c/1.1F2/refs/painting-stroke-01-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-stroke-02-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-stroke-03-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-stroke-04-t.ref | 8 +-- .../w3c/1.1F2/refs/painting-stroke-05-t.ref | 4 +- .../w3c/1.1F2/refs/painting-stroke-07-t.ref | 4 +- .../w3c/1.1F2/refs/painting-stroke-08-t.ref | 4 +- .../w3c/1.1F2/refs/painting-stroke-09-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-01-t.ref | 20 +++--- .../w3c/1.1F2/refs/paths-data-02-t.ref | 18 ++--- .../w3c/1.1F2/refs/paths-data-03-f.ref | 16 ++--- .../w3c/1.1F2/refs/paths-data-04-t.ref | 14 ++-- .../w3c/1.1F2/refs/paths-data-05-t.ref | 10 +-- .../w3c/1.1F2/refs/paths-data-06-t.ref | 10 +-- .../w3c/1.1F2/refs/paths-data-07-t.ref | 10 +-- .../w3c/1.1F2/refs/paths-data-08-t.ref | 12 ++-- .../w3c/1.1F2/refs/paths-data-09-t.ref | 8 +-- .../w3c/1.1F2/refs/paths-data-10-t.ref | 68 +++++++++---------- .../w3c/1.1F2/refs/paths-data-12-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-13-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-14-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-15-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-16-t.ref | 4 +- .../w3c/1.1F2/refs/paths-data-17-f.ref | 2 +- .../w3c/1.1F2/refs/paths-data-18-f.ref | 4 +- .../w3c/1.1F2/refs/paths-data-19-f.ref | 2 +- .../w3c/1.1F2/refs/paths-data-20-f.ref | 2 +- .../w3c/1.1F2/refs/pservers-grad-01-b.ref | 6 +- .../w3c/1.1F2/refs/pservers-grad-02-b.ref | 6 +- .../w3c/1.1F2/refs/pservers-grad-04-b.ref | 6 +- .../w3c/1.1F2/refs/pservers-grad-05-b.ref | 6 +- .../w3c/1.1F2/refs/pservers-grad-07-b.ref | 8 +-- .../w3c/1.1F2/refs/pservers-grad-09-b.ref | 10 +-- .../w3c/1.1F2/refs/render-elems-01-t.ref | 8 +-- .../w3c/1.1F2/refs/render-elems-02-t.ref | 8 +-- .../w3c/1.1F2/refs/render-elems-03-t.ref | 8 +-- .../w3c/1.1F2/refs/shapes-circle-01-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-circle-02-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-ellipse-01-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-ellipse-02-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-ellipse-03-f.ref | 6 +- .../w3c/1.1F2/refs/shapes-grammar-01-f.ref | 4 +- .../w3c/1.1F2/refs/shapes-intro-01-t.ref | 18 ++--- .../w3c/1.1F2/refs/shapes-line-01-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-line-02-f.ref | 4 +- .../w3c/1.1F2/refs/shapes-polygon-01-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-polygon-02-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-polygon-03-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-polyline-01-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-polyline-02-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-rect-02-t.ref | 2 +- .../w3c/1.1F2/refs/shapes-rect-04-f.ref | 2 +- .../w3c/1.1F2/refs/shapes-rect-05-f.ref | 6 +- .../w3c/1.1F2/refs/shapes-rect-06-f.ref | 2 +- .../w3c/1.1F2/refs/struct-defs-01-t.ref | 2 +- .../w3c/1.1F2/refs/struct-frag-06-t.ref | 22 +++--- .../w3c/1.1F2/refs/struct-group-01-t.ref | 4 +- .../w3c/1.1F2/refs/struct-image-01-t.ref | 2 +- .../w3c/1.1F2/refs/struct-image-04-t.ref | 2 +- .../w3c/1.1F2/refs/struct-use-03-t.ref | 12 ++-- .../w3c/1.1F2/refs/styling-class-01-f.ref | 2 +- .../w3c/1.1F2/refs/styling-css-01-b.ref | 8 +-- .../w3c/1.1F2/refs/styling-pres-01-t.ref | 2 +- .../w3c/1.1F2/refs/types-basic-01-f.ref | 10 +-- .../w3c/1.2T/refs/coords-trans-01-t.ref | 38 +++++------ .../w3c/1.2T/refs/coords-trans-02-t.ref | 18 ++--- .../w3c/1.2T/refs/coords-trans-03-t.ref | 18 ++--- .../w3c/1.2T/refs/coords-trans-04-t.ref | 12 ++-- .../w3c/1.2T/refs/coords-trans-05-t.ref | 12 ++-- .../w3c/1.2T/refs/coords-trans-06-t.ref | 14 ++-- .../w3c/1.2T/refs/coords-trans-07-t.ref | 10 +-- .../w3c/1.2T/refs/coords-trans-08-t.ref | 10 +-- .../w3c/1.2T/refs/coords-trans-09-t.ref | 30 ++++---- .../w3c/1.2T/refs/paint-color-03-t.ref | 2 +- .../w3c/1.2T/refs/paint-color-201-t.ref | 34 +++++----- .../w3c/1.2T/refs/paint-fill-04-t.ref | 4 +- .../w3c/1.2T/refs/paint-fill-06-t.ref | 4 +- .../w3c/1.2T/refs/paint-stroke-01-t.ref | 8 +-- .../w3c/1.2T/refs/paths-data-01-t.ref | 20 +++--- .../w3c/1.2T/refs/paths-data-02-t.ref | 18 ++--- .../w3c/1.2T/refs/render-elems-01-t.ref | 8 +-- .../w3c/1.2T/refs/render-elems-02-t.ref | 8 +-- .../w3c/1.2T/refs/render-elems-03-t.ref | 8 +-- .../w3c/1.2T/refs/shapes-circle-01-t.ref | 4 +- .../w3c/1.2T/refs/shapes-ellipse-01-t.ref | 4 +- .../w3c/1.2T/refs/shapes-line-01-t.ref | 4 +- .../w3c/1.2T/refs/shapes-polygon-01-t.ref | 4 +- .../w3c/1.2T/refs/shapes-polyline-01-t.ref | 4 +- .../w3c/1.2T/refs/shapes-rect-02-t.ref | 4 +- .../w3c/1.2T/refs/struct-defs-01-t.ref | 2 +- .../w3c/1.2T/refs/struct-use-03-t.ref | 12 ++-- 128 files changed, 664 insertions(+), 668 deletions(-) diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref index e115f98..539735a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref @@ -38,19 +38,19 @@ SVGViewport { text: "fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 120, 170] }, SVGText { text: "stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 310, 170] }, SVGText { text: "stop-color", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 205.0000000000] + transform: [1, 0, 0, 1, 180, 205] } ] } @@ -63,7 +63,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref index ab4ce8c..4b7921d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref @@ -88,7 +88,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref index 3106dc6..f8a381b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref @@ -67,7 +67,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref index 34c339c..a241920 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "Scene_1", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 180.0000000000], + transform: [1, 0, 0, 1, 240, 180], contents: [ SVGRect { x: -230, y: -170, width: 460, height: 300, fill: "#6363CE" }, SVGRect { x: -220, y: -160, width: 440, height: 280, fill: "white" }, @@ -28,43 +28,43 @@ SVGViewport { text: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, -148, 0] }, SVGText { text: "Vestibulum pulvinar. Duis laoreet, nunc vitae facilisis", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, -148, 20] }, SVGText { text: "tristique, pede sem iaculis mi, non consectetuer lorem", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, -148, 40] }, SVGText { text: "libero et est. Donec imperdiet purus sed odio. Duis", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, -148, 60] }, SVGText { text: "venenatis tortor eu lectus. Suspendisse sed metus at", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, -148, 80] }, SVGText { text: "metus viverra ultricies. Mauris porttitor, justo a vulputate", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -148.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, -148, 100] } ] }, SVGGroup { id: "dropdown", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 2.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 2, 0], contents: [ SVGRect { id: "drop-bg", @@ -79,14 +79,14 @@ SVGViewport { text: "Load", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -138.0000000000, 24.0000000000] + transform: [1, 0, 0, 1, -138, 24] }, SVGRect { x: -143, y: 40, width: 102, height: 34, fill: "silver" }, SVGText { text: "Save", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -138.0000000000, 64.0000000000] + transform: [1, 0, 0, 1, -138, 64] }, SVGPath { path: "M-149,83 h114 v-94", @@ -108,13 +108,13 @@ SVGViewport { text: "File", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -141.0000000000, -32.0000000000] + transform: [1, 0, 0, 1, -141, -32] }, SVGText { text: "Edit", font: { name: "SVGFreeSansASCII,sans-serif", size: 20, weight: "bold" }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -32.0000000000] + transform: [1, 0, 0, 1, -90, -32] } ] }, @@ -135,7 +135,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 24, weight: "bold" }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, -78.0000000000] + transform: [1, 0, 0, 1, 5, -78] }, SVGGroup { id: "button", @@ -159,7 +159,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref index c5bbc06..a8e3ad7 100644 --- a/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref @@ -21,7 +21,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref index c2d20eb..e90fac8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref index 6065b02..ca4d2ee 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref index d25270d..e0b686a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "test-grid", @@ -601,41 +601,41 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], + transform: [1, 0, 0, 1, 50, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], + transform: [0, -1, 1, 0, 150, 70], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], + transform: [1, 0, 1, 1, 250, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], + transform: [1, 1, 0, 1, 350, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 210.0000000000, 120.0000000000], + transform: [2, 0, 0, 2, 210, 120], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -650,7 +650,7 @@ SVGViewport { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 40, 40] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -659,7 +659,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 140, 40] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -668,7 +668,7 @@ SVGViewport { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 240, 40] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -677,7 +677,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 340, 40] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -686,7 +686,7 @@ SVGViewport { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 200, 110] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -702,20 +702,20 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 50.0000010000, 210.0000000000], + transform: [3, 0, 0, 2, 50,000001, 210], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGGroup { - transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], + transform: [3, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], + transform: [1, 0, 0, 1, 16,666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -734,7 +734,7 @@ SVGViewport { text: "scale(25, 95) and translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 40, 200] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -743,7 +743,7 @@ SVGViewport { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 240, 200] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -763,7 +763,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref index 0e8beb6..6bf8dca 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -30, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], + transform: [1, 0, 0, 1, 50, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], + transform: [0, -1, 1, 0, 150, 70], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -36,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -30, 0], contents: [ SVGText { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 40, 40] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -51,7 +51,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 140, 40] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -71,7 +71,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref index 040965d..a01c0fc 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -560, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], + transform: [1, 0, 1, 1, 250, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], + transform: [1, 1, 0, 1, 350, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -36,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -560, 0], contents: [ SVGText { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 240, 40] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -51,7 +51,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 340, 40] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -71,7 +71,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref index 4ed6207..9aae9fd 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref @@ -8,17 +8,17 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, 60.0000000000, 45.0000000000], + transform: [2,5, 0, 0, 2,5, 60, 45], contents: [ SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 40.0000000000, 10.0000000000], + transform: [2, 0, 0, 2, 40, 10], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -28,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -364.0000000000, -230.0000000000], + transform: [2,5, 0, 0, 2,5, -364, -230], contents: [ SVGText { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 200, 110] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -54,7 +54,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref index 10aa942..8b41b8a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref @@ -8,17 +8,17 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "nested-transforms-test", contents: [ SVGGroup { id: "nested-transforms", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -450.0000000000], + transform: [1, 0, 0, 1, -90, -450], contents: [ SVGGroup { - transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 125.0000025000, 525.0000000000], + transform: [7,5, 0, 0, 5, 125,0000025, 525], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -28,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -90.0000000000, -450.0000000000], + transform: [2,5, 0, 0, 2,5, -90, -450], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 40, 200] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -54,7 +54,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref index b530445..344ad89 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "nested-transforms-test", @@ -17,13 +17,13 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -102.0000000000, -450.0000000000], + transform: [1, 0, 0, 1, -102, -450], contents: [ SVGGroup { - transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 0.0000000000, 0.0000000000], + transform: [7,5, 0, 0, 5, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], + transform: [1, 0, 0, 1, 16,666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -37,13 +37,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -600.0000000000, -450.0000000000], + transform: [2,5, 0, 0, 2,5, -600, -450], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 248.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 248, 200] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -63,7 +63,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref index daca048..1d4f889 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref @@ -12,7 +12,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 123.2050807569, 186.6025403784], + transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 123,2050807569, 186,6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -22,11 +22,11 @@ SVGViewport { text: "rotate+translate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 185.0000000000] + transform: [1, 0, 0, 1, 65, 185] }, SVGGroup { id: "object_2", - transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 200.0000000000, 100.0000000000], + transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 200, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -36,7 +36,7 @@ SVGViewport { text: "translate+rotate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 150, 100] } ] } @@ -49,7 +49,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref index 09ee367..8628601 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref @@ -12,7 +12,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [2.0000000000, 1.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [2, 1, 1, 1, 0, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -25,11 +25,11 @@ SVGViewport { text: "skewX(45)+skewY(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 16.0000000000] + transform: [1, 0, 0, 1, 30, 16] }, SVGGroup { id: "object_2", - transform: [1.0000000000, 1.0000000000, 1.0000000000, 2.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 1, 1, 2, 200, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -42,7 +42,7 @@ SVGViewport { text: "skewY(45)+skewX(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 16.0000000000] + transform: [1, 0, 0, 1, 230, 16] } ] } @@ -55,7 +55,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref index 7cfc994..3502bc8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref @@ -11,7 +11,7 @@ SVGViewport { id: "elementary-transforms-test", contents: [ SVGGroup { - transform: [0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 0, 0, 0, 0, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -21,10 +21,10 @@ SVGViewport { text: "matrix(0 0 0 0 0 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 6.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 6, 20] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], + transform: [1, 0, 0, 1, 100, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -34,10 +34,10 @@ SVGViewport { text: "matrix(1 0 0 1 100 100)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 100, 100] }, SVGGroup { - transform: [1.5000000000, 0.0000000000, 0.0000000000, 1.5000000000, 70.0000000000, 60.0000000000], + transform: [1,5, 0, 0, 1,5, 70, 60], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -47,10 +47,10 @@ SVGViewport { text: "matrix(1.5 0 0 1.5 70 60)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 70, 60] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.5000000000, 1.0000000000, 30.0000000000, 170.0000000000], + transform: [1, 0, 0,5, 1, 30, 170], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -60,10 +60,10 @@ SVGViewport { text: "matrix(1 0 0.5 1 30 170)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 30, 170] }, SVGGroup { - transform: [1.0000000000, 0.5000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000], + transform: [1, 0,5, 0, 1, 100, 200], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -73,10 +73,10 @@ SVGViewport { text: "matrix(1 0.5 0 1 100 200)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 100, 200] }, SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 450.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 450, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -86,10 +86,10 @@ SVGViewport { text: "matrix(0 1 -1 0 450 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 275, 30] }, SVGGroup { - transform: [1.0000000000, 0.8000000000, 0.8000000000, 1.0000000000, 300.0000000000, 220.0000000000], + transform: [1, 0,8, 0,8, 1, 300, 220], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -99,7 +99,7 @@ SVGViewport { text: "matrix(1 0.8 0.8 1 300 220)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 220.0000000000] + transform: [1, 0, 0, 1, 230, 220] } ] } @@ -112,7 +112,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref index 8453492..e8314f4 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], + transform: [1, 0, 0, 1, 40, 20], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -16,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], + transform: [1, 0, 0, 1, 40, 20], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -43,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -64,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 100.0000000000], + transform: [1, 0, 0, 1, 0, 100], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], + transform: [1, 0, 0, 1, 40, 20], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -75,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 20.0000000000], + transform: [1, 0, 0, 1, 40, 20], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -102,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -133,7 +133,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref index 6f69913..c2fa874 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], + transform: [1,2, 0, 0, 2,5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -16,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], + transform: [1,2, 0, 0, 2,5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -43,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -64,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], + transform: [1, 0, 0, 1, 0, 150], contents: [ SVGGroup { - transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], + transform: [1,2, 0, 0, 2,5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -75,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.2000000000, 0.0000000000, 0.0000000000, 2.5000000000, 0.0000000000, 0.0000000000], + transform: [1,2, 0, 0, 2,5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -102,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -133,7 +133,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref index ee689ab..a5a0321 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref @@ -8,10 +8,10 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -19,14 +19,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -46,7 +46,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -69,10 +69,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 310, 0], contents: [ SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -80,14 +80,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -107,7 +107,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -138,7 +138,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref index d5b6192..6427b6d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 0, 1, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -16,14 +16,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 0, 1, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -43,7 +43,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -64,10 +64,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], + transform: [1, 0, 0, 1, 0, 150], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 0, 1, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -75,14 +75,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 0, 1, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -102,7 +102,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -133,7 +133,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref index f76f2b9..b40bb41 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref @@ -8,10 +8,10 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [0.7047694656, -0.2565151075, 0.2565151075, 0.7047694656, 0.0000000000, 0.0000000000], + transform: [0,7047694656, -0,2565151075, 0,2565151075, 0,7047694656, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 1, 0, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -19,14 +19,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 1, 0, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -46,7 +46,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -67,10 +67,10 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], + transform: [1, 0, 0, 1, 0, 150], contents: [ SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 1, 0, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -78,14 +78,14 @@ SVGViewport { text: "Filler Text", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "red", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, y: 20, width: 30, height: 50, fill: "red" }, SVGLine { x1: 310, y1: 20, x2: 350, y2: 70, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [1, 1, 0, 1, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -105,7 +105,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", stroke: { fill: "black" }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 160.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 160, 40] }, SVGRect { x: 250, @@ -138,7 +138,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref index d64b659..b34c3cd 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref @@ -8,13 +8,13 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { width: 100, @@ -25,13 +25,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 125, y: 125, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 125, @@ -44,13 +44,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 150, y: -75, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 150, @@ -63,13 +63,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 300, y: -150, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 300, @@ -82,13 +82,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 400, y: -325, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 400, @@ -101,13 +101,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 500, y: -200, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50.0000000000, 50.0000000000], + transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], contents: [ SVGRect { x: 500, @@ -128,7 +128,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref index 32712ed..a9713bf 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref @@ -8,10 +8,10 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 150, 0], contents: [ SVGGroup { - transform: [1.4142135624, 1.4142135624, -1.4142135624, 1.4142135624, -17.0710678119, 1.2132034356], + transform: [1,4142135624, 1,4142135624, -1,4142135624, 1,4142135624, -17,0710678119, 1,2132034356], contents: [ SVGRect { width: 50, height: 50, fill: "red" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "red" }, @@ -26,16 +26,16 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -10.0000000000, -20.0000000000], + transform: [1, 0, 0, 1, -10, -20], contents: [ SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], + transform: [2, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0.0000000000, 0.0000000000], + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 5, 10], contents: [ SVGRect { width: 50, height: 50, fill: "black" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "black" }, @@ -56,19 +56,19 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -10.0000000000, -20.0000000000], + transform: [1, 0, 0, 1, -10, -20], contents: [ SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], + transform: [2, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0.0000000000, 0.0000000000], + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 5, 10], contents: [ SVGRect { width: 50, height: 50, fill: "red" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "red" }, @@ -89,7 +89,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.4142135624, 1.4142135624, -1.4142135624, 1.4142135624, -17.0710678119, 1.2132034356], + transform: [1,4142135624, 1,4142135624, -1,4142135624, 1,4142135624, -17,0710678119, 1,2132034356], contents: [ SVGRect { width: 50, height: 50, fill: "black" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "black" }, @@ -116,7 +116,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref index c82fbac..2973ad8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref @@ -12,7 +12,7 @@ SVGViewport { width: 100, height: 200, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGEllipse { cx: 170, cy: 100, rx: 50, ry: 100, fill: "red" }, SVGEllipse { @@ -21,7 +21,7 @@ SVGViewport { rx: 50, ry: 100, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGLine { x1: 230, @@ -38,13 +38,13 @@ SVGViewport { y2: 200, fill: "black", stroke: { fill: "black", width: 10 }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGPath { path: "M340,0 L440,0 L390,200 z", fill: "red" }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] } ] }, @@ -55,7 +55,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref index a0d682d..fd9e50d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref @@ -12,7 +12,7 @@ SVGViewport { width: 50, height: 100, fill: "black", - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] + transform: [2, 0, 0, 2, 0, 0] }, SVGEllipse { cx: 160, cy: 100, rx: 50, ry: 100, fill: "red" }, SVGEllipse { @@ -21,7 +21,7 @@ SVGViewport { rx: 25, ry: 50, fill: "black", - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] + transform: [2, 0, 0, 2, 0, 0] }, SVGLine { x1: 220, @@ -38,13 +38,13 @@ SVGViewport { y2: 100, fill: "black", stroke: { fill: "black", width: 5 }, - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] + transform: [2, 0, 0, 2, 0, 0] }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "red" }, SVGPath { path: "M165,0 L215,0 L190,100 z", fill: "black", - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000] + transform: [2, 0, 0, 2, 0, 0] } ] }, @@ -55,7 +55,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref index f0d5754..61799a6 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref @@ -8,10 +8,10 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 15.0000000000], + transform: [1, 0, 0, 1, 50, 15], contents: [ SVGGroup { - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000], + transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0], contents: [ SVGRect { x: 10, width: 100, height: 200, fill: "red" }, SVGEllipse { cx: 170, cy: 100, rx: 50, ry: 100, fill: "red" }, @@ -27,13 +27,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000], + transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0], contents: [ SVGRect { width: 100, height: 200, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGEllipse { cx: 160, @@ -41,7 +41,7 @@ SVGViewport { rx: 50, ry: 100, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGLine { x1: 220, @@ -50,12 +50,12 @@ SVGViewport { y2: 200, fill: "black", stroke: { fill: "black", width: 10 }, - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] }, SVGPath { path: "M330,0 L430,0 L380,200 z", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 0.0000000000] + transform: [1, 0, 0, 1, 10, 0] } ] } @@ -70,7 +70,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref index 6391152..514ff2b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref @@ -13,10 +13,10 @@ SVGViewport { text: "CSS pixel coordinate to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 35.0000000000] + transform: [1, 0, 0, 1, 60, 35] }, SVGGroup { - transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 5.0000000000, 0.0000000000], + transform: [4, 0, 0, 4, 5, 0], contents: [ SVGCircle { cx: 7.5, cy: 7.5, r: 2.5, fill: "black" }, SVGCircle { cx: 7.5, cy: 7.5, r: 1.5, fill: "fuchsia" } @@ -26,10 +26,10 @@ SVGViewport { text: "Percentage coordinates to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 85.0000000000] + transform: [1, 0, 0, 1, 60, 85] }, SVGGroup { - transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 5.0000000000, 50.0000000000], + transform: [4, 0, 0, 4, 5, 50], contents: [ SVGCircle { cx: 7.5, cy: 7.5, r: 2.5, fill: "black" }, SVGCircle { @@ -44,10 +44,10 @@ SVGViewport { text: "CSS width/height to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 140.0000000000] + transform: [1, 0, 0, 1, 60, 140] }, SVGGroup { - transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 30.0000000000, 115.0000000000], + transform: [4, 0, 0, 4, 30, 115], contents: [ SVGRect { x: -5, width: 10, height: 5, fill: "black" }, SVGRect { x: -5, y: 5, width: 10, height: 5, fill: "fuchsia" } @@ -57,10 +57,10 @@ SVGViewport { text: "Percentage width/height to user space conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 60, 200] }, SVGGroup { - transform: [4.0000000000, 0.0000000000, 0.0000000000, 4.0000000000, 30.0000000000, 175.0000000000], + transform: [4, 0, 0, 4, 30, 175], contents: [ SVGRect { x: -5, width: 10, height: 5, fill: "black" }, SVGRect { x: -5, y: 5, width: 9.9984, height: 5.0004, fill: "fuchsia" } @@ -70,10 +70,10 @@ SVGViewport { text: "CSS and percentage length conversion", font: { name: "SVGFreeSansASCII,sans-serif", size: 17.333333333333332 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 265.0000000000] + transform: [1, 0, 0, 1, 140, 265] }, SVGGroup { - transform: [4.0000000000, 0.0000000000, 4.0000000000, 4.0000000000, 30.0000000000, 260.0000000000], + transform: [4, 0, 4, 4, 30, 260], contents: [ SVGCircle { r: 3.536, fill: "black" }, SVGCircle { cx: 10, r: 3.536, fill: "fuchsia" }, @@ -105,7 +105,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref index e2b38a6..4fc0f23 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref @@ -18,49 +18,49 @@ SVGViewport { text: "Initial viewport and CSS units test", font: { name: "Arial", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 125, 20] }, SVGGroup { id: "units-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 60.0000000000], + transform: [1, 0, 0, 1, 0, 60], contents: [ SVGText { text: "200", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 18.0000000000] + transform: [1, 0, 0, 1, 20, 18] }, SVGText { text: "User space units (no specifier)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 230, 20] }, SVGRect { x: 20, y: 20, width: 200, height: 1, fill: "black" }, SVGText { text: "200 px", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 20, 38] }, SVGText { text: "Pixels (px)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 230, 40] }, SVGRect { x: 20, y: 40, width: 200, height: 1, fill: "black" }, SVGText { text: "20 em = 200 px (font-size=10px)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 58.0000000000] + transform: [1, 0, 0, 1, 20, 58] }, SVGText { text: "Relative to font size (em)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 230, 60] }, SVGGroup { contents: [ @@ -71,13 +71,13 @@ SVGViewport { text: "40 ex", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 78.0000000000] + transform: [1, 0, 0, 1, 20, 78] }, SVGText { text: "Relative to font x-height (ex)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 230, 80] }, SVGGroup { contents: [ @@ -88,78 +88,78 @@ SVGViewport { text: "41.67% = 200 px", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 98.0000000000] + transform: [1, 0, 0, 1, 20, 98] }, SVGText { text: "Percentage (%)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 230, 100] }, SVGRect { x: 20, y: 100, width: 200.01600000000002, height: 1, fill: "black" }, SVGText { text: "1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 118.0000000000] + transform: [1, 0, 0, 1, 20, 118] }, SVGText { text: "Inches (in)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 120.0000000000] + transform: [1, 0, 0, 1, 230, 120] }, SVGRect { x: 20, y: 120, width: 96, height: 1, fill: "black" }, SVGText { text: "2.54 cm = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 138.0000000000] + transform: [1, 0, 0, 1, 20, 138] }, SVGText { text: "Centimeters (cm)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 140.0000000000] + transform: [1, 0, 0, 1, 230, 140] }, SVGRect { x: 20, y: 140, width: 96, height: 1, fill: "black" }, SVGText { text: "25.4 mm = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 158.0000000000] + transform: [1, 0, 0, 1, 20, 158] }, SVGText { text: "Millimeters (mm)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 160.0000000000] + transform: [1, 0, 0, 1, 230, 160] }, SVGRect { x: 20, y: 160, width: 95.99999999999999, height: 1, fill: "black" }, SVGText { text: "72pt = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 178.0000000000] + transform: [1, 0, 0, 1, 20, 178] }, SVGText { text: "Points (pt)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 180.0000000000] + transform: [1, 0, 0, 1, 230, 180] }, SVGRect { x: 20, y: 180, width: 96, height: 1, fill: "black" }, SVGText { text: "6pc = 1 in", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 198.0000000000] + transform: [1, 0, 0, 1, 20, 198] }, SVGText { text: "Picas (pc)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13.333333333333334 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 230, 200] }, SVGRect { x: 20, y: 200, width: 96, height: 1, fill: "black" } ] @@ -173,7 +173,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref index 6ab2dc2..99a9ac8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Test for opacity property on a group.", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 27.0000000000] + transform: [1, 0, 0, 1, 50, 27] }, SVGRect { x: 10, y: 30, width: 100, height: 260, fill: "red" }, SVGGroup { @@ -24,19 +24,19 @@ SVGViewport { text: "Group opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 62.0000000000] + transform: [1, 0, 0, 1, 200, 62] }, SVGText { text: "Blue rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 200, 80] }, SVGText { text: "Green rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 98.0000000000] + transform: [1, 0, 0, 1, 200, 98] }, SVGGroup { opacity: 0.5, @@ -49,19 +49,19 @@ SVGViewport { text: "Group opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 122.0000000000] + transform: [1, 0, 0, 1, 200, 122] }, SVGText { text: "Blue rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 140.0000000000] + transform: [1, 0, 0, 1, 200, 140] }, SVGText { text: "Green rectangle opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 158.0000000000] + transform: [1, 0, 0, 1, 200, 158] }, SVGGroup { contents: [ @@ -73,19 +73,19 @@ SVGViewport { text: "Group opacity: 1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 182.0000000000] + transform: [1, 0, 0, 1, 200, 182] }, SVGText { text: "Blue rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 200, 200] }, SVGText { text: "Green rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 218.0000000000] + transform: [1, 0, 0, 1, 200, 218] }, SVGGroup { opacity: 0.5, @@ -98,19 +98,19 @@ SVGViewport { text: "Group opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 242.0000000000] + transform: [1, 0, 0, 1, 200, 242] }, SVGText { text: "Blue rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 200, 260] }, SVGText { text: "Green rectangle opacity: 0.5", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 278.0000000000] + transform: [1, 0, 0, 1, 200, 278] } ] }, @@ -121,7 +121,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref index df41474..20ad0ae 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref @@ -32,7 +32,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref index c2232e5..e803553 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref @@ -34,7 +34,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref index be2aa67..26c032a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-01-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 42.0000000000] + transform: [1, 0, 0, 1, 40, 42] }, SVGRect { id: "fill-01", @@ -34,13 +34,13 @@ SVGViewport { text: "fill=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 75, 280] }, SVGText { text: "fill=\"green\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 275, 280] } ] }, @@ -51,7 +51,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref index acb66d1..e159796 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-02-t.ref @@ -13,13 +13,13 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 42.0000000000] + transform: [1, 0, 0, 1, 30, 42] }, SVGText { text: "fill=\"currentColor\"", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 100, 80] }, SVGRect { id: "fill-03", @@ -43,13 +43,13 @@ SVGViewport { text: "green", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 80, 280] }, SVGText { text: "blue", font: { name: "Arial", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 290, 280] } ] } @@ -62,7 +62,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref index fa9d405..fc0c78b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-03-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: fill properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 42.0000000000] + transform: [1, 0, 0, 1, 30, 42] }, SVGPath { path: "M110,75 l50,160 l-130,-100 l160,0 l-130,100 z", @@ -26,13 +26,13 @@ SVGViewport { text: "fill-rule=\"evenodd\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 282.0000000000] + transform: [1, 0, 0, 1, 10, 282] }, SVGText { text: "fill-rule=\"nonzero\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 260.0000000000, 282.0000000000] + transform: [1, 0, 0, 1, 260, 282] } ] }, @@ -43,7 +43,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref index 8ed7a80..1612fe5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-04-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "G1", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 120, 30], contents: [ SVGRect { width: 90, @@ -70,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref b/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref index c85820c..ba68a68 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-fill-05-b.ref @@ -112,7 +112,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref index 48f2544..586a25b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref @@ -85,7 +85,7 @@ SVGViewport { text: "Basic Markers", font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 170.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 170, 30] }, SVGPath { path: "M130,40 L180,40 L180,90", @@ -95,26 +95,26 @@ SVGViewport { marker-end: "marker1" }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 120, 0], contents: [ SVGPath { path: "M130,40 L180,40 L180,90", stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 32.0000000000], + transform: [1,6, 0, 0, 1,6, 122, 32], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 32.0000000000], + transform: [1,6, 0, 0, 1,6, 172, 32], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 82.0000000000], + transform: [1,6, 0, 0, 1,6, 172, 82], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] @@ -125,7 +125,7 @@ SVGViewport { text: "Start, Middle and End", font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 145.0000000000, 125.0000000000] + transform: [1, 0, 0, 1, 145, 125] }, SVGPath { path: "M130,135 L180,135 L180,185", @@ -135,26 +135,26 @@ SVGViewport { marker-end: "markerEnd" }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 120, 0], contents: [ SVGPath { path: "M130,135 L180,135 L180,185", stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 127.0000000000], + transform: [1,6, 0, 0, 1,6, 122, 127], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 127.0000000000], + transform: [1,6, 0, 0, 1,6, 172, 127], contents: [ SVGCircle { cx: 5, cy: 5, r: 5, fill: "green" } ] }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 172.0000000000, 177.0000000000], + transform: [1,6, 0, 0, 1,6, 172, 177], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] @@ -165,7 +165,7 @@ SVGViewport { text: "Automatic Orientation", font: { name: "SVGFreeSansASCII,sans-serif", size: 14 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 145.0000000000, 220.0000000000] + transform: [1, 0, 0, 1, 145, 220] }, SVGPath { path: "M130,230 L180,230 L180,280", @@ -175,26 +175,26 @@ SVGViewport { marker-end: "marker2" }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 120, 0], contents: [ SVGPath { path: "M130,230 L180,230 L180,280", stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1.6000000000, 0.0000000000, 0.0000000000, 1.6000000000, 122.0000000000, 222.0000000000], + transform: [1,6, 0, 0, 1,6, 122, 222], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] }, SVGGroup { - transform: [1.1313708499, 1.1313708499, -1.1313708499, 1.1313708499, 180.0000000000, 218.6862915010], + transform: [1,1313708499, 1,1313708499, -1,1313708499, 1,1313708499, 180, 218,686291501], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] }, SVGGroup { - transform: [0.0000000000, 1.6000000000, -1.6000000000, 0.0000000000, 188.0000000000, 272.0000000000], + transform: [0, 1,6, -1,6, 0, 188, 272], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] @@ -210,7 +210,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref index fbffc0b..854437f 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-01-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 10, 40] }, SVGRect { id: "stroke-01", x: 90, y: 70, width: 300, height: 50, fill: "blue" }, SVGRect { @@ -27,13 +27,13 @@ SVGViewport { text: "stroke=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 140, 150] }, SVGText { text: "stroke=\"green\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 148.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 148, 280] } ] }, @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref index 132be98..8097b0b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-02-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 10, 40] }, SVGRect { id: "stroke-01", @@ -33,13 +33,13 @@ SVGViewport { text: "stroke-width=\"20\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 160.0000000000] + transform: [1, 0, 0, 1, 120, 160] }, SVGText { text: "stroke-linejoin=\"round\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 58.0000000000, 290.0000000000] + transform: [1, 0, 0, 1, 58, 290] } ] }, @@ -50,7 +50,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref index e86d5e1..ffe1090 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-03-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 10, 40] }, SVGPath { path: "M160,70 l200,20 l-200,20", @@ -25,13 +25,13 @@ SVGViewport { text: "stroke-linecap=\"round\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 60.0000000000, 160.0000000000] + transform: [1, 0, 0, 1, 60, 160] }, SVGText { text: "stroke-miterlimit=\"1\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 130, 280] } ] }, @@ -42,7 +42,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref index c166433..96cc1d7 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-04-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 10, 60] }, SVGPath { id: "stroke-7b", @@ -27,13 +27,13 @@ SVGViewport { text: "stroke-dasharray=\"10, 10\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 210.0000000000] + transform: [1, 0, 0, 1, 65, 210] }, SVGText { text: "stroke-dashoffset=\"10\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 75, 260] } ] }, @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref index 128e646..9f21e11 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-05-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 240, 30] }, SVGPolyline { points: [30, 50, 30, 300], @@ -165,7 +165,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref index a7b70d5..1dbfb19 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.2000000000, 0.0000000000, 0.0000000000, 1.2000000000, 72.0000000000, 36.0000000000], + transform: [1,2, 0, 0, 1,2, 72, 36], contents: [ SVGPath { path: "M20,20 L200,30 L20,40", @@ -45,7 +45,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref index e0845d1..8cb6d18 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.7000000000, 0.0000000000, 0.0000000000, 1.7000000000, 50.0000000000, 0.0000000000], + transform: [1,7, 0, 0, 1,7, 50, 0], contents: [ SVGCircle { cx: 200, cy: 20, r: 5, fill: "#FF6666" }, SVGCircle { cx: 200, cy: 40, r: 5, fill: "#FF6666" }, @@ -72,7 +72,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref index 4034fc6..ef14c11 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-09-t.ref @@ -20,7 +20,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref index 80ee8f0..dcb04a2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-01-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Cubic bezier curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 100, 14] }, SVGPath { id: "X_curve_MCSmcs", @@ -29,7 +29,7 @@ SVGViewport { text: "M, C, S, m, c, s", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 82.0000000000] + transform: [1, 0, 0, 1, 5, 82] }, SVGPath { id: "Infinity_McccCz", @@ -44,7 +44,7 @@ SVGViewport { text: "M, c, c, c, C, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 253.0000000000, 50.0000000000] + transform: [1, 0, 0, 1, 253, 50] }, SVGPath { id: "Line_MCZ", @@ -57,7 +57,7 @@ SVGViewport { text: "M, C, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, 190.0000000000] + transform: [1, 0, 0, 1, 110, 190] }, SVGPath { id: "Inv_V_MCcZ", @@ -71,7 +71,7 @@ SVGViewport { text: "M, C, c, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 85.0000000000, 220.0000000000] + transform: [1, 0, 0, 1, 85, 220] }, SVGPath { id: "Rem_Rib_mcs", @@ -85,7 +85,7 @@ SVGViewport { text: "m, c, s", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 165.0000000000, 210.0000000000] + transform: [1, 0, 0, 1, 165, 210] }, SVGPath { id: "Arc_MC", @@ -99,7 +99,7 @@ SVGViewport { text: "M, C", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 360, 150] }, SVGPath { id: "Circle_Mcssz", @@ -115,7 +115,7 @@ SVGViewport { text: "M, c, s, s, s, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 265.0000000000] + transform: [1, 0, 0, 1, 290, 265] }, SVGPath { id: "Horseshoe_Mcs", @@ -129,7 +129,7 @@ SVGViewport { text: "m, c, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 380, 340] } ] }, @@ -140,7 +140,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref index 88e770f..3edc1e8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-02-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Quadric bezier curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 120, 14] }, SVGPath { id: "Bez_MQMqz", @@ -22,7 +22,7 @@ SVGViewport { text: "M, Q, M, q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 86.0000000000] + transform: [1, 0, 0, 1, 80, 86] }, SVGRect { x: 13, y: 18, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 128, y: 28, width: 4, height: 4, fill: "#00C000" }, @@ -38,7 +38,7 @@ SVGViewport { text: "m, q, z, m, q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 352.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 352, 150] }, SVGRect { x: 370, y: 128, width: 4, height: 4, fill: "blue" }, SVGRect { x: 420, y: 8, width: 4, height: 4, fill: "blue" }, @@ -53,7 +53,7 @@ SVGViewport { text: "M, Q, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 192.0000000000, 36.0000000000] + transform: [1, 0, 0, 1, 192, 36] }, SVGRect { x: 222, y: 101, width: 4, height: 4, fill: "blue" }, SVGRect { x: 302, y: 31, width: 4, height: 4, fill: "blue" }, @@ -67,7 +67,7 @@ SVGViewport { text: "M, Q, T, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 308.0000000000, 188.0000000000] + transform: [1, 0, 0, 1, 308, 188] }, SVGRect { x: 206, y: 166, width: 4, height: 4, fill: "blue" }, SVGRect { x: 306, y: 166, width: 4, height: 4, fill: "blue" }, @@ -82,7 +82,7 @@ SVGViewport { text: "M, Q, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 80, 200] }, SVGRect { x: 58, y: 98, width: 4, height: 4, fill: "blue" }, SVGRect { x: 58, y: 198, width: 4, height: 4, fill: "blue" }, @@ -96,7 +96,7 @@ SVGViewport { text: "M, q, t, t, t, t, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 236.0000000000] + transform: [1, 0, 0, 1, 380, 236] }, SVGRect { x: 238, y: 294, width: 4, height: 4, fill: "blue" }, SVGRect { x: 285, y: 294, width: 4, height: 4, fill: "blue" }, @@ -114,7 +114,7 @@ SVGViewport { text: "M, q, Q, q, Q, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 48, 280] }, SVGRect { x: 170, y: 191, width: 4, height: 4, fill: "#40DD20" }, SVGRect { x: 170, y: 241, width: 4, height: 4, fill: "#40DD20" }, @@ -130,7 +130,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref index a2eae8d..1521411 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-03-f.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Elliptical arc curves drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 120, 14] }, SVGPath { id: "Arc_MAZ", @@ -22,7 +22,7 @@ SVGViewport { text: "M, A, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 70.0000000000] + transform: [1, 0, 0, 1, 48, 70] }, SVGRect { x: 23, y: 68, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 23, y: 67, width: 4, height: 4, fill: "#00C000" }, @@ -36,7 +36,7 @@ SVGViewport { text: "m, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 124.0000000000, 45.0000000000] + transform: [1, 0, 0, 1, 124, 45] }, SVGRect { x: 148, y: 98, width: 4, height: 4, fill: "#CF0000" }, SVGRect { x: 173, y: 28, width: 4, height: 4, fill: "#CF0000" }, @@ -49,7 +49,7 @@ SVGViewport { text: "M, a", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 390.0000000000, 300.0000000000] + transform: [1, 0, 0, 1, 390, 300] }, SVGRect { x: 348, y: 243, width: 4, height: 4, fill: "blue" }, SVGRect { x: 428, y: 303, width: 4, height: 4, fill: "blue" }, @@ -63,7 +63,7 @@ SVGViewport { text: "M, A, a, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 280.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 280, 135] }, SVGRect { x: 268, y: 28, width: 4, height: 4, fill: "blue" }, SVGRect { x: 343, y: 28, width: 4, height: 4, fill: "blue" }, @@ -79,7 +79,7 @@ SVGViewport { text: "M, a, Z, m, A, Z, m, a, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 25.0000000000, 270.0000000000] + transform: [1, 0, 0, 1, 25, 270] }, SVGRect { x: 28, y: 148, width: 4, height: 4, fill: "blue" }, SVGRect { x: 93, y: 198, width: 4, height: 4, fill: "blue" }, @@ -96,7 +96,7 @@ SVGViewport { text: "M, A, A, A, A", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 215.0000000000, 246.0000000000] + transform: [1, 0, 0, 1, 215, 246] }, SVGRect { x: 213, y: 188, width: 4, height: 4, fill: "blue" }, SVGRect { x: 263, y: 188, width: 4, height: 4, fill: "blue" }, @@ -113,7 +113,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref index 41b518e..025ff66 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], + transform: [1,8, 0, 0, 1,8, 0, 0], contents: [ SVGText { text: "M, L, L, L, Z,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 88.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 88, 30] }, SVGText { text: "subpath", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 98.0000000000, 46.0000000000] + transform: [1, 0, 0, 1, 98, 46] }, SVGText { text: "M, L, L, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 88.0000000000, 61.0000000000] + transform: [1, 0, 0, 1, 88, 61] }, SVGPath { id: "Triangle_stroke_MLZ", @@ -43,7 +43,7 @@ SVGViewport { text: "stroked", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 42.0000000000, 162.0000000000] + transform: [1, 0, 0, 1, 42, 162] }, SVGPath { id: "Triangle_fill_MLZ", @@ -61,7 +61,7 @@ SVGViewport { text: "filled", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 162.0000000000, 162.0000000000] + transform: [1, 0, 0, 1, 162, 162] } ] } @@ -74,7 +74,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref index 77a5e31..b53a6e0 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, -270.0000000000], + transform: [1,8, 0, 0, 1,8, 0, -270], contents: [ SVGText { text: "m, l, l, l, z,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 96.0000000000, 180.0000000000] + transform: [1, 0, 0, 1, 96, 180] }, SVGText { text: "subpath", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 194.0000000000] + transform: [1, 0, 0, 1, 100, 194] }, SVGText { text: "m, l, l, l, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 97.0000000000, 208.0000000000] + transform: [1, 0, 0, 1, 97, 208] }, SVGPath { id: "Triangle_stroke_mlz", @@ -62,7 +62,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref index 825ff59..a85e29a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, -360.0000000000, 0.0000000000], + transform: [1,8, 0, 0, 1,8, -360, 0], contents: [ SVGText { text: "M, H, V, H,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 288, 30] }, SVGText { text: "V. H, V, H,", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 46.0000000000] + transform: [1, 0, 0, 1, 288, 46] }, SVGText { text: "V, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 304.0000000000, 62.0000000000] + transform: [1, 0, 0, 1, 304, 62] }, SVGPath { id: "Stairs_stroke_MHVZ", @@ -65,7 +65,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref index 3dbb181..e951af1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, -360.0000000000, -270.0000000000], + transform: [1,8, 0, 0, 1,8, -360, -270], contents: [ SVGText { text: "m, h, v, h", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 180.0000000000] + transform: [1, 0, 0, 1, 288, 180] }, SVGText { text: "v, h, v, h", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 288.0000000000, 194.0000000000] + transform: [1, 0, 0, 1, 288, 194] }, SVGText { text: "v, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 304.0000000000, 208.0000000000] + transform: [1, 0, 0, 1, 304, 208] }, SVGPath { id: "Stairs_stroke_mhvz", @@ -65,7 +65,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref index 2a9900f..c13d5fd 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref @@ -11,16 +11,16 @@ SVGViewport { text: "Lines drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 34.0000000000] + transform: [1, 0, 0, 1, 75, 34] }, SVGText { text: "M and Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 64.0000000000] + transform: [1, 0, 0, 1, 180, 64] }, SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], + transform: [1,8, 0, 0, 1,8, 0, 0], contents: [ SVGPath { id: "Triangle_stroke_MZ", @@ -37,7 +37,7 @@ SVGViewport { text: "stroked", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 42.0000000000, 162.0000000000] + transform: [1, 0, 0, 1, 42, 162] }, SVGPath { id: "Triangle_fill_MZ", @@ -55,7 +55,7 @@ SVGViewport { text: "filled", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 162.0000000000, 162.0000000000] + transform: [1, 0, 0, 1, 162, 162] } ] } @@ -68,7 +68,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref index b8d0b89..e100b98 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref @@ -11,16 +11,16 @@ SVGViewport { text: "Lines drawn with commands:", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 75.0000000000, 34.0000000000] + transform: [1, 0, 0, 1, 75, 34] }, SVGText { text: "m and z", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 180.0000000000, 64.0000000000] + transform: [1, 0, 0, 1, 180, 64] }, SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, -270.0000000000], + transform: [1,8, 0, 0, 1,8, 0, -270], contents: [ SVGPath { id: "Triangle_stroke_mz", @@ -56,7 +56,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref index 4767e69..a962462 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-10-t.ref @@ -8,34 +8,34 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 10, 10], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 10, 20] }, SVGText { text: "join=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 10, 38] }, SVGText { text: "cap=butt", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 10, 56] }, SVGText { text: "M, L", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 10, 74] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 115, 0], contents: [ SVGPath { id: "triangle-01", @@ -48,34 +48,34 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 115.0000000000], + transform: [1, 0, 0, 1, 10, 115], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 10, 20] }, SVGText { text: "join=bevel", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 10, 38] }, SVGText { text: "cap=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 10, 56] }, SVGText { text: "m, l", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 10, 74] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 115, 0], contents: [ SVGPath { id: "triangle-02", @@ -88,34 +88,34 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 220.0000000000], + transform: [1, 0, 0, 1, 10, 220], contents: [ SVGText { text: "open", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 10, 20] }, SVGText { text: "join=miter", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 10, 38] }, SVGText { text: "cap=square", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 10, 56] }, SVGText { text: "M, L", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 10, 74] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 115.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 115, 0], contents: [ SVGPath { id: "triangle-03", @@ -128,31 +128,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 250, 10], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 125, 20] }, SVGText { text: "join=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 125, 38] }, SVGText { text: "cap=butt", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 125, 56] }, SVGText { text: "M, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 125, 74] }, SVGGroup { contents: [ @@ -167,31 +167,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 115.0000000000], + transform: [1, 0, 0, 1, 250, 115], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 125, 20] }, SVGText { text: "join=bevel", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 125, 38] }, SVGText { text: "cap=round", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 125, 56] }, SVGText { text: "m, l, z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 125, 74] }, SVGGroup { contents: [ @@ -206,31 +206,31 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 250.0000000000, 220.0000000000], + transform: [1, 0, 0, 1, 250, 220], contents: [ SVGText { text: "closed", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 125, 20] }, SVGText { text: "join=miter", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 38.0000000000] + transform: [1, 0, 0, 1, 125, 38] }, SVGText { text: "cap=square", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 56.0000000000] + transform: [1, 0, 0, 1, 125, 56] }, SVGText { text: "M, L, Z", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 125.0000000000, 74.0000000000] + transform: [1, 0, 0, 1, 125, 74] }, SVGGroup { contents: [ @@ -253,7 +253,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref index 29503e0..01dad04 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-12-t.ref @@ -33,7 +33,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref index 1081cc1..7eb3b76 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-13-t.ref @@ -26,7 +26,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref index 662de51..f10e163 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 0.0000000000, 0.0000000000], + transform: [1,8, 0, 0, 1,8, 0, 0], contents: [ SVGPath { path: "m62,56 l51.96152,90 l-103.92304,0 l51.96152,-90 z m0,15 l38.97114,67.5 l-77.91228,0 l38.97114,-67.5 z", @@ -30,7 +30,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref index c4e232b..e594dce 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.8000000000, 0.0000000000, 0.0000000000, 1.8000000000, 36.0000000000, 90.0000000000], + transform: [1,8, 0, 0, 1,8, 36, 90], contents: [ SVGPath { path: "M20,20 Q50,10,80,20 Q110,30,140,20 Q170,10,200,20", @@ -32,7 +32,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref index 70d2b19..cb856cd 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-16-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Test relative-ness of implicit lineto path commands", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 10, 40] }, SVGGroup { contents: [ @@ -50,7 +50,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref index de84bce..99dac83 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-17-f.ref @@ -32,7 +32,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref index bfe37c8..3fbeeae 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-18-f.ref @@ -19,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [8.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 60.0000000000, -30.0000000000], + transform: [8, 0, 0, 2, 60, -30], contents: [ SVGPath { path: "M20,40 H40", @@ -102,7 +102,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref index ea5d5a7..3d5cef9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-19-f.ref @@ -144,7 +144,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref index 79ce39e..658cf87 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-20-f.ref @@ -64,7 +64,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref index 28e0e0d..79ea6b5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-01-b.ref @@ -12,14 +12,14 @@ SVGViewport { text: "Linear gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] + transform: [1, 0, 0, 1, 20, 130] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Referencing gradient below.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 20, 260] } ] }, @@ -30,7 +30,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref index 7828b05..c183595 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-02-b.ref @@ -12,14 +12,14 @@ SVGViewport { text: "Radial gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] + transform: [1, 0, 0, 1, 20, 130] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Referencing gradient below.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 20, 260] } ] }, @@ -30,7 +30,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref index 3a792b8..cb822a2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-04-b.ref @@ -12,14 +12,14 @@ SVGViewport { text: "Multi-color linear gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 130.0000000000] + transform: [1, 0, 0, 1, 20, 130] }, SVGRect { x: 20, y: 150, width: 440, height: 80 }, SVGText { text: "Multi-color radial gradient.", font: { name: "SVGFreeSansASCII,sans-serif", size: 30 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 20.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 20, 260] } ] }, @@ -30,7 +30,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref index 09a8867..570b646 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-05-b.ref @@ -11,14 +11,14 @@ SVGViewport { text: "Background", font: { name: "SVGFreeSansASCII,sans-serif", size: 60 }, fill: "aqua", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 70, 80] }, SVGRect { x: 20, y: 20, width: 440, height: 80 }, SVGText { text: "Background", font: { name: "SVGFreeSansASCII,sans-serif", size: 60 }, fill: "aqua", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 210.0000000000] + transform: [1, 0, 0, 1, 70, 210] }, SVGRect { x: 20, y: 150, width: 440, height: 80 } ] @@ -30,7 +30,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref index 841ecd8..f82ba00 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref @@ -8,14 +8,14 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.5000000000, 0.0000000000, 0.0000000000], + transform: [1, 0, 0, 1,5, 0, 0], contents: [ SVGRect { x: 10, y: 10, width: 430, height: 60 }, SVGText { text: "Linear gradient filled rectangle", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 90.0000000000] + transform: [1, 0, 0, 1, 10, 90] }, SVGRect { x: 25, @@ -28,7 +28,7 @@ SVGViewport { text: "Linear gradient on stroke of rectangle", font: { name: "SVGFreeSansASCII,sans-serif", size: 24 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 10, 170] } ] } @@ -41,7 +41,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref index 071cd02..71724c2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-09-b.ref @@ -11,15 +11,11 @@ SVGViewport { text: "Testing gradientUnits attribute", font: { name: "SVGFreeSansASCII,sans-serif", size: 15 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 25.0000000000] + transform: [1, 0, 0, 1, 10, 25] }, SVGRect { x: 125, y: 35, width: 200, height: 50 }, SVGRect { x: 10, y: 125, width: 430, height: 50 }, - SVGRect { - width: 50, - height: 430, - transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 10.0000000000, 260.0000000000] - } + SVGRect { width: 50, height: 430, transform: [0, -1, 1, 0, 10, 260] } ] }, SVGGroup { @@ -29,7 +25,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref index c8c992e..b036bf9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-01-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -19,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +31,7 @@ SVGViewport { text: "Shape fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 130, -30] } ] } @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref index df93fe4..c49ca62 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-02-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -19,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +31,7 @@ SVGViewport { text: "Shape stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 110, -30] } ] } @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref index 8493143..e74231a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/render-elems-03-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -20,7 +20,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -33,7 +33,7 @@ SVGViewport { text: "Shape fill and stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 70, -30] } ] } @@ -46,7 +46,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref index 71f63a6..ad98bb4 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-01-t.ref @@ -50,7 +50,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref index 9417d26..6afb6c5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-circle-02-t.ref @@ -50,7 +50,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref index 410a590..ceda1a4 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-01-t.ref @@ -60,7 +60,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref index 5130ebc..70846b9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-02-t.ref @@ -48,7 +48,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref index 25ee29d..873c7b9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 150.0000000000], + transform: [1, 0, 0, 1, 150, 150], contents: [ SVGLine { y1: -100, @@ -30,7 +30,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0.8660254038, -0.5000000000, 0.5000000000, 0.8660254038, 350.0000000000, 150.0000000000], + transform: [0,8660254038, -0,5, 0,5, 0,8660254038, 350, 150], contents: [ SVGLine { y1: -100, @@ -60,7 +60,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref index fb334e3..d18f908 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-grammar-01-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 400.0000000000], + transform: [1, 0, 0, 1, 0, 400], contents: [ SVGGroup { contents: [ @@ -47,7 +47,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref index 2b3a44a..3dc4178 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-intro-01-t.ref @@ -94,49 +94,49 @@ SVGViewport { text: "Stroked", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 90.0000000000] + transform: [1, 0, 0, 1, 5, 90] }, SVGText { text: "Unstroked", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 195.0000000000] + transform: [1, 0, 0, 1, 5, 195] }, SVGText { text: "Zero width rect", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 50, 135] }, SVGText { text: "Zero height rect", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 130, 135] }, SVGText { text: "Zero radius circle", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 210.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 210, 135] }, SVGText { text: "Zero x radius ellipse", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 315.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 315, 135] }, SVGText { text: "Zero y radius ellipse", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 394.0000000000, 135.0000000000] + transform: [1, 0, 0, 1, 394, 135] }, SVGText { text: "Zero length line", font: { name: "Arial", size: 8 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 235.0000000000, 290.0000000000] + transform: [1, 0, 0, 1, 235, 290] } ] }, @@ -217,7 +217,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref index 2d03380..5de824f 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-line-01-t.ref @@ -191,7 +191,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref index 540e29a..8e5dbc0 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref @@ -22,7 +22,7 @@ SVGViewport { y2: 100, fill: "red", stroke: { fill: "black", width: 10 }, - transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0.0000000000, 0.0000000000] + transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0] } ] }, @@ -33,7 +33,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref index cef8928..2da47d9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-01-t.ref @@ -48,7 +48,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref index 16503ef..cb9cda8 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-02-t.ref @@ -81,7 +81,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref index b9cec4e..9c27077 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polygon-03-t.ref @@ -24,7 +24,7 @@ SVGViewport { text: "$Revision: 1.1 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref index 6c141c9..fc2e900 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-01-t.ref @@ -48,7 +48,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref index 6676733..2547c93 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-polyline-02-t.ref @@ -81,7 +81,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref index f7e10f8..2154a62 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-02-t.ref @@ -68,7 +68,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref index 89fa005..db3527d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-04-f.ref @@ -21,7 +21,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref index 8017c3c..924c242 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], + transform: [1, 0, 0, 1, 100, 100], contents: [ SVGRect { width: 75, @@ -28,7 +28,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0.8660254038, -0.5000000000, 0.8152074691, 0.6840402867, 100.0000000000, 100.0000000000], + transform: [0,8660254038, -0,5, 0,8152074691, 0,6840402867, 100, 100], contents: [ SVGRect { x: 100, @@ -64,7 +64,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref index 56cf565..832c696 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-06-f.ref @@ -24,7 +24,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref index dc33e01..56403f7 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-defs-01-t.ref @@ -28,7 +28,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref index 5cebd7c..3b19002 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref @@ -10,47 +10,47 @@ SVGViewport { text: "Default entities: amp, lt, gt, apos, quot:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 30, 30] }, SVGText { text: "&, <, >, ', \"", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 90, 60] }, SVGText { text: "Character references:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 30, 100] }, SVGText { text: "A hexadecimal (A)= A", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 130.0000000000] + transform: [1, 0, 0, 1, 90, 130] }, SVGText { text: "A decimal (A)= A", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "gray", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 90.0000000000, 160.0000000000] + transform: [1, 0, 0, 1, 90, 160] }, SVGText { text: "Entity references:", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 30, 200] }, SVGText { text: "gray", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 105.0000000000, 228.0000000000] + transform: [1, 0, 0, 1, 105, 228] }, SVGGroup { - transform: [0.2000000000, 0.0000000000, 0.0000000000, 0.2000000000, 90.0000000000, 235.0000000000], + transform: [0,2, 0, 0, 0,2, 90, 235], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -63,10 +63,10 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 205.0000000000, 228.0000000000] + transform: [1, 0, 0, 1, 205, 228] }, SVGGroup { - transform: [0.2000000000, 0.0000000000, 0.0000000000, 0.2000000000, 190.0000000000, 235.0000000000], + transform: [0,2, 0, 0, 0,2, 190, 235], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -83,7 +83,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref index 2541037..7c419e1 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref @@ -26,7 +26,7 @@ SVGViewport { contents: [ SVGGroup { id: "yellowNrotate", - transform: [0.9396926208, -0.3420201433, 0.3420201433, 0.9396926208, 0.0000000000, 0.0000000000], + transform: [0,9396926208, -0,3420201433, 0,3420201433, 0,9396926208, 0, 0], contents: [ SVGRect { y: 224, width: 40, height: 40, fill: "yellow" }, SVGRect { y: 280, width: 40, height: 40, fill: "yellow" } @@ -43,7 +43,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref index 38ba77c..8c1e39a 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-image-01-t.ref @@ -31,7 +31,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref index 2590c1e..6e47940 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-image-04-t.ref @@ -31,7 +31,7 @@ SVGViewport { text: "$Revision: 1.7 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref index 9d07c8b..71ffc3c 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref @@ -23,18 +23,18 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 120, 60] }, SVGText { text: "", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 360, 60] }, SVGGroup { id: "reference", - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813], + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813], contents: [ SVGRect { width: 100, @@ -45,14 +45,14 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 240, 0], contents: [ SVGRect { width: 100, height: 100, fill: "aqua", stroke: { fill: "blue", width: 20 }, - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813] + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813] } ] } @@ -65,7 +65,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref index 6153107..9c79786 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-class-01-f.ref @@ -29,7 +29,7 @@ SVGViewport { text: "$Revision: 1.2 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref index 044af2a..d7afd92 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-css-01-b.ref @@ -16,7 +16,7 @@ SVGViewport { text: "element selectors:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 36.0000000000] + transform: [1, 0, 0, 1, 40, 36] }, SVGCircle { cx: 160, cy: 100, r: 30, fill: "green" }, SVGGroup { @@ -29,13 +29,13 @@ SVGViewport { fill: "green" }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 150.0000000000], + transform: [1, 0, 0, 1, 0, 150], contents: [ SVGText { text: "class selectors:", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 36.0000000000] + transform: [1, 0, 0, 1, 40, 36] }, SVGGroup { contents: [ @@ -58,7 +58,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref index 5ce40b3..5d9e2aa 100644 --- a/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/styling-pres-01-t.ref @@ -25,7 +25,7 @@ SVGViewport { text: "$Revision: 1.5 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref index 329035e..0367218 100644 --- a/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/types-basic-01-f.ref @@ -37,7 +37,7 @@ SVGViewport { text: "Different forms of the type", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 50, 200] }, SVGGroup { contents: [ @@ -46,21 +46,21 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 100, 110] }, SVGText { text: "5e1", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 200, 110] }, SVGText { text: ".5e2", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, textAnchor: "middle", fill: "#555555", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 300.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 300, 110] } ] } @@ -73,7 +73,7 @@ SVGViewport { text: "$Revision: 1.3 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref index dae07c2..20769fb 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "test-grid", @@ -601,41 +601,41 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], + transform: [1, 0, 0, 1, 50, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], + transform: [0, -1, 1, 0, 150, 70], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], + transform: [1, 0, 1, 1, 250, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], + transform: [1, 1, 0, 1, 350, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 210.0000000000, 120.0000000000], + transform: [2, 0, 0, 2, 210, 120], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -650,7 +650,7 @@ SVGViewport { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 40, 40] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -659,7 +659,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 140, 40] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -668,7 +668,7 @@ SVGViewport { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 240, 40] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -677,7 +677,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 340, 40] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -686,7 +686,7 @@ SVGViewport { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 200, 110] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -702,20 +702,20 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 50.0000010000, 210.0000000000], + transform: [3, 0, 0, 2, 50,000001, 210], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGGroup { - transform: [3.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 0.0000000000, 0.0000000000], + transform: [3, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], + transform: [1, 0, 0, 1, 16,666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -734,7 +734,7 @@ SVGViewport { text: "scale(25, 95) and translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 40, 200] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -743,7 +743,7 @@ SVGViewport { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 13 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 240, 200] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -763,7 +763,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref index 615e70f..d9f600e 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -30, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 50.0000000000, 50.0000000000], + transform: [1, 0, 0, 1, 50, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [0.0000000000, -1.0000000000, 1.0000000000, 0.0000000000, 150.0000000000, 70.0000000000], + transform: [0, -1, 1, 0, 150, 70], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -36,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -30.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -30, 0], contents: [ SVGText { text: "translate (50, 50)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 40, 40] }, SVGRect { x: 48, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 68, y: 48, width: 5, height: 5, fill: "blue" }, @@ -51,7 +51,7 @@ SVGViewport { text: "rotate(-90)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 140, 40] }, SVGRect { x: 148, y: 68, width: 5, height: 5, fill: "black" }, SVGRect { x: 148, y: 48, width: 5, height: 5, fill: "blue" }, @@ -71,7 +71,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref index 1187e42..1213c04 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref @@ -8,25 +8,25 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 10.0000000000], + transform: [1, 0, 0, 1, 0, 10], contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -560, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 1.0000000000, 1.0000000000, 250.0000000000, 50.0000000000], + transform: [1, 0, 1, 1, 250, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } ] }, SVGGroup { - transform: [1.0000000000, 1.0000000000, 0.0000000000, 1.0000000000, 350.0000000000, 50.0000000000], + transform: [1, 1, 0, 1, 350, 50], contents: [ SVGRect { width: 20, height: 2, fill: "blue" }, SVGRect { width: 2, height: 20, fill: "red" } @@ -36,13 +36,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -560.0000000000, 0.0000000000], + transform: [2,5, 0, 0, 2,5, -560, 0], contents: [ SVGText { text: "skew x (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 240, 40] }, SVGRect { x: 248, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 268, y: 48, width: 5, height: 5, fill: "blue" }, @@ -51,7 +51,7 @@ SVGViewport { text: "skew y (45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 340.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 340, 40] }, SVGRect { x: 348, y: 48, width: 5, height: 5, fill: "black" }, SVGRect { x: 368, y: 68, width: 5, height: 5, fill: "blue" }, @@ -71,7 +71,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref index 1873e96..f7bd76b 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref @@ -8,17 +8,17 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "elementary-transforms-test", contents: [ SVGGroup { id: "elementary-transforms", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, 60.0000000000, 45.0000000000], + transform: [2,5, 0, 0, 2,5, 60, 45], contents: [ SVGGroup { - transform: [2.0000000000, 0.0000000000, 0.0000000000, 2.0000000000, 40.0000000000, 10.0000000000], + transform: [2, 0, 0, 2, 40, 10], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 1, height: 20, fill: "red" } @@ -28,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -364.0000000000, -230.0000000000], + transform: [2,5, 0, 0, 2,5, -364, -230], contents: [ SVGText { text: "scale (2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 200, 110] }, SVGRect { x: 208, y: 118, width: 5, height: 5, fill: "black" }, SVGRect { x: 248, y: 118, width: 5, height: 5, fill: "blue" }, @@ -54,7 +54,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref index fb21209..0ef393c 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref @@ -8,17 +8,17 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "nested-transforms-test", contents: [ SVGGroup { id: "nested-transforms", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -90.0000000000, -450.0000000000], + transform: [1, 0, 0, 1, -90, -450], contents: [ SVGGroup { - transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 125.0000025000, 525.0000000000], + transform: [7,5, 0, 0, 5, 125,0000025, 525], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -28,13 +28,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -90.0000000000, -450.0000000000], + transform: [2,5, 0, 0, 2,5, -90, -450], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 40.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 40, 200] }, SVGRect { x: 48, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 108, y: 208, width: 5, height: 5, fill: "blue" }, @@ -54,7 +54,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref index 5baef2e..c596404 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 0.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 0, 30], contents: [ SVGGroup { id: "nested-transforms-test", @@ -17,13 +17,13 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, -102.0000000000, -450.0000000000], + transform: [1, 0, 0, 1, -102, -450], contents: [ SVGGroup { - transform: [7.5000000000, 0.0000000000, 0.0000000000, 5.0000000000, 0.0000000000, 0.0000000000], + transform: [7,5, 0, 0, 5, 0, 0], contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 16.6666670000, 105.0000000000], + transform: [1, 0, 0, 1, 16,666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -37,13 +37,13 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2.5000000000, 0.0000000000, 0.0000000000, 2.5000000000, -600.0000000000, -450.0000000000], + transform: [2,5, 0, 0, 2,5, -600, -450], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 248.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 248, 200] }, SVGRect { x: 248, y: 208, width: 5, height: 5, fill: "black" }, SVGRect { x: 308, y: 208, width: 5, height: 5, fill: "blue" }, @@ -63,7 +63,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref index ab2ec47..433496c 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 123.2050807569, 186.6025403784], + transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 123,2050807569, 186,6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -19,11 +19,11 @@ SVGViewport { text: "rotate+translate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 65.0000000000, 185.0000000000] + transform: [1, 0, 0, 1, 65, 185] }, SVGGroup { id: "object_2", - transform: [0.8660254038, 0.5000000000, -0.5000000000, 0.8660254038, 200.0000000000, 100.0000000000], + transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 200, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -33,7 +33,7 @@ SVGViewport { text: "translate+rotate", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 150.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 150, 100] } ] }, @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref index 79a0839..cd908f0 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-08-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [2.0000000000, 1.0000000000, 1.0000000000, 1.0000000000, 0.0000000000, 0.0000000000], + transform: [2, 1, 1, 1, 0, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -22,11 +22,11 @@ SVGViewport { text: "skewX(45)+skewY(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 16.0000000000] + transform: [1, 0, 0, 1, 30, 16] }, SVGGroup { id: "object_2", - transform: [1.0000000000, 1.0000000000, 1.0000000000, 2.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 1, 1, 2, 200, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" }, @@ -39,7 +39,7 @@ SVGViewport { text: "skewY(45)+skewX(45)", font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 16.0000000000] + transform: [1, 0, 0, 1, 230, 16] } ] }, @@ -50,7 +50,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref index e02010f..d8363be 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000, 0.0000000000], + transform: [0, 0, 0, 0, 0, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -18,10 +18,10 @@ SVGViewport { text: "matrix(0 0 0 0 0 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 6.0000000000, 20.0000000000] + transform: [1, 0, 0, 1, 6, 20] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000], + transform: [1, 0, 0, 1, 100, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -31,10 +31,10 @@ SVGViewport { text: "matrix(1 0 0 1 100 100)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 100.0000000000] + transform: [1, 0, 0, 1, 100, 100] }, SVGGroup { - transform: [1.5000000000, 0.0000000000, 0.0000000000, 1.5000000000, 70.0000000000, 60.0000000000], + transform: [1,5, 0, 0, 1,5, 70, 60], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -44,10 +44,10 @@ SVGViewport { text: "matrix(1.5 0 0 1.5 70 60)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 70, 60] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.5000000000, 1.0000000000, 30.0000000000, 170.0000000000], + transform: [1, 0, 0,5, 1, 30, 170], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -57,10 +57,10 @@ SVGViewport { text: "matrix(1 0 0.5 1 30 170)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 30, 170] }, SVGGroup { - transform: [1.0000000000, 0.5000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000], + transform: [1, 0,5, 0, 1, 100, 200], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -70,10 +70,10 @@ SVGViewport { text: "matrix(1 0.5 0 1 100 200)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 100.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 100, 200] }, SVGGroup { - transform: [0.0000000000, 1.0000000000, -1.0000000000, 0.0000000000, 450.0000000000, 0.0000000000], + transform: [0, 1, -1, 0, 450, 0], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -83,10 +83,10 @@ SVGViewport { text: "matrix(0 1 -1 0 450 0)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 275.0000000000, 30.0000000000] + transform: [1, 0, 0, 1, 275, 30] }, SVGGroup { - transform: [1.0000000000, 0.8000000000, 0.8000000000, 1.0000000000, 300.0000000000, 220.0000000000], + transform: [1, 0,8, 0,8, 1, 300, 220], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -96,7 +96,7 @@ SVGViewport { text: "matrix(1 0.8 0.8 1 300 220)", font: { name: "SVGFreeSansASCII,sans-serif", size: 20 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 230.0000000000, 220.0000000000] + transform: [1, 0, 0, 1, 230, 220] } ] }, @@ -107,7 +107,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref index 85be17a..94cfd37 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-color-03-t.ref @@ -67,7 +67,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref index 0d0e788..0f19a31 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-color-201-t.ref @@ -34,49 +34,49 @@ SVGViewport { text: "black", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 50.0000000000] + transform: [1, 0, 0, 1, 70, 50] }, SVGText { text: "silver", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 70, 80] }, SVGText { text: "gray", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 70, 110] }, SVGText { text: "white", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 140.0000000000] + transform: [1, 0, 0, 1, 70, 140] }, SVGText { text: "maroon", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 70, 170] }, SVGText { text: "red", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 70, 200] }, SVGText { text: "purple", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 230.0000000000] + transform: [1, 0, 0, 1, 70, 230] }, SVGText { text: "fuchsia", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 70, 260] }, SVGRect { x: 275, y: 30, width: 25, height: 25, fill: "green" }, SVGRect { x: 275, y: 60, width: 25, height: 25, fill: "lime" }, @@ -98,49 +98,49 @@ SVGViewport { text: "green", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 50.0000000000] + transform: [1, 0, 0, 1, 310, 50] }, SVGText { text: "lime", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 80.0000000000] + transform: [1, 0, 0, 1, 310, 80] }, SVGText { text: "olive", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 110.0000000000] + transform: [1, 0, 0, 1, 310, 110] }, SVGText { text: "yellow", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 140.0000000000] + transform: [1, 0, 0, 1, 310, 140] }, SVGText { text: "navy", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 170.0000000000] + transform: [1, 0, 0, 1, 310, 170] }, SVGText { text: "blue", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 310, 200] }, SVGText { text: "teal", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 230.0000000000] + transform: [1, 0, 0, 1, 310, 230] }, SVGText { text: "aqua", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 310.0000000000, 260.0000000000] + transform: [1, 0, 0, 1, 310, 260] } ] }, @@ -151,7 +151,7 @@ SVGViewport { text: "$Revision: 1.4 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref index 9236751..28fac19 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-fill-04-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "G1", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 120, 30], contents: [ SVGRect { width: 90, @@ -70,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref index 61aac6d..3ab6bb8 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-fill-06-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "G1", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 30.0000000000], + transform: [1, 0, 0, 1, 120, 30], contents: [ SVGRect { width: 90, @@ -70,7 +70,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref b/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref index 87be3a3..185e55a 100644 --- a/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paint-stroke-01-t.ref @@ -11,7 +11,7 @@ SVGViewport { text: "Basic paint: stroke properties.", font: { name: "SVGFreeSansASCII,sans-serif", size: 36 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 40.0000000000] + transform: [1, 0, 0, 1, 10, 40] }, SVGRect { id: "stroke-01", x: 90, y: 70, width: 300, height: 50, fill: "blue" }, SVGRect { @@ -27,13 +27,13 @@ SVGViewport { text: "stroke=\"none\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 140.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 140, 150] }, SVGText { text: "stroke=\"red\"", font: { name: "SVGFreeSansASCII,sans-serif", size: 40 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 148.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 148, 280] } ] }, @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref b/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref index 9cd7c44..4a1be4c 100644 --- a/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paths-data-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGPath { id: "X_curve_MCSmcs", @@ -30,7 +30,7 @@ SVGViewport { text: "M,C,S,m,c,s", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 5.0000000000, 82.0000000000] + transform: [1, 0, 0, 1, 5, 82] }, SVGPath { id: "Infinity_McccCz", @@ -45,7 +45,7 @@ SVGViewport { text: "M,c,c,c,C,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 253.0000000000, 50.0000000000] + transform: [1, 0, 0, 1, 253, 50] }, SVGPath { id: "Line_MCZ", @@ -58,7 +58,7 @@ SVGViewport { text: "M,C,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, 190.0000000000] + transform: [1, 0, 0, 1, 110, 190] }, SVGPath { id: "Inv_V_MCcZ", @@ -72,7 +72,7 @@ SVGViewport { text: "M,C,c,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 85.0000000000, 220.0000000000] + transform: [1, 0, 0, 1, 85, 220] }, SVGPath { id: "Rem_Rib_mcs", @@ -86,7 +86,7 @@ SVGViewport { text: "m,c,s", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 165.0000000000, 210.0000000000] + transform: [1, 0, 0, 1, 165, 210] }, SVGPath { id: "Arc_MC", @@ -100,7 +100,7 @@ SVGViewport { text: "M,C", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 360, 150] }, SVGPath { id: "Circle_Mcssz", @@ -116,7 +116,7 @@ SVGViewport { text: "M,c,s,s,s,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 290.0000000000, 265.0000000000] + transform: [1, 0, 0, 1, 290, 265] }, SVGPath { id: "Horseshoe_Mcs", @@ -130,7 +130,7 @@ SVGViewport { text: "m,c,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 380, 340] } ] }, @@ -141,7 +141,7 @@ SVGViewport { text: "$Revision: 1.13 $", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref b/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref index 1d845ee..8a4daa1 100644 --- a/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/paths-data-02-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGPath { id: "Bez_MQMqz", @@ -23,7 +23,7 @@ SVGViewport { text: "M,Q,M,q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 86.0000000000] + transform: [1, 0, 0, 1, 80, 86] }, SVGRect { x: 13, y: 18, width: 4, height: 4, fill: "#00C000" }, SVGRect { x: 128, y: 28, width: 4, height: 4, fill: "#00C000" }, @@ -39,7 +39,7 @@ SVGViewport { text: "m,q,z,m,q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 352.0000000000, 150.0000000000] + transform: [1, 0, 0, 1, 352, 150] }, SVGRect { x: 370, y: 128, width: 4, height: 4, fill: "blue" }, SVGRect { x: 420, y: 8, width: 4, height: 4, fill: "blue" }, @@ -54,7 +54,7 @@ SVGViewport { text: "M,Q,Z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 192.0000000000, 36.0000000000] + transform: [1, 0, 0, 1, 192, 36] }, SVGRect { x: 222, y: 101, width: 4, height: 4, fill: "blue" }, SVGRect { x: 302, y: 31, width: 4, height: 4, fill: "blue" }, @@ -68,7 +68,7 @@ SVGViewport { text: "M,Q,T,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 308.0000000000, 188.0000000000] + transform: [1, 0, 0, 1, 308, 188] }, SVGRect { x: 206, y: 166, width: 4, height: 4, fill: "blue" }, SVGRect { x: 306, y: 166, width: 4, height: 4, fill: "blue" }, @@ -83,7 +83,7 @@ SVGViewport { text: "M,Q,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 80.0000000000, 200.0000000000] + transform: [1, 0, 0, 1, 80, 200] }, SVGRect { x: 58, y: 98, width: 4, height: 4, fill: "blue" }, SVGRect { x: 58, y: 198, width: 4, height: 4, fill: "blue" }, @@ -97,7 +97,7 @@ SVGViewport { text: "M,q,t,t,t,t,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 380.0000000000, 236.0000000000] + transform: [1, 0, 0, 1, 380, 236] }, SVGRect { x: 238, y: 294, width: 4, height: 4, fill: "blue" }, SVGRect { x: 285, y: 294, width: 4, height: 4, fill: "blue" }, @@ -115,7 +115,7 @@ SVGViewport { text: "M,q,Q,q,Q,z", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 12 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 48.0000000000, 280.0000000000] + transform: [1, 0, 0, 1, 48, 280] }, SVGRect { x: 170, y: 191, width: 4, height: 4, fill: "red" }, SVGRect { x: 170, y: 241, width: 4, height: 4, fill: "red" }, @@ -131,7 +131,7 @@ SVGViewport { text: "$Revision: 1.13 $", font: { name: "SVGFreeSansISO-8859-1,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref index 3729de7..9572deb 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-01-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -19,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +31,7 @@ SVGViewport { text: "Shape fill", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 130.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 130, -30] } ] } @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref index ace5637..1b6ece2 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-02-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -19,7 +19,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -31,7 +31,7 @@ SVGViewport { text: "Shape stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 110.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 110, -30] } ] } @@ -44,7 +44,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref b/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref index 3558b73..e35ef99 100644 --- a/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/render-elems-03-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 30.0000000000, 80.0000000000], + transform: [1, 0, 0, 1, 30, 80], contents: [ SVGGroup { contents: [ @@ -20,7 +20,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 200.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 200, 0], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -33,7 +33,7 @@ SVGViewport { text: "Shape fill and stroke", font: { name: "SVGFreeSansASCII,sans-serif", size: 28 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 70.0000000000, -30.0000000000] + transform: [1, 0, 0, 1, 70, -30] } ] } @@ -46,7 +46,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref index b13b825..1648e7b 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-circle-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGCircle { cx: 100, @@ -57,7 +57,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref index caf5ac7..f2f64cc 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-ellipse-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGEllipse { id: "ellipse-01", @@ -67,7 +67,7 @@ SVGViewport { text: "$Revision: 1.10 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref index d19ebfb..ddf2c08 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-line-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGGroup { id: "diagonal-line-set", @@ -198,7 +198,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref index de38aa1..9d328d9 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-polygon-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGPolygon { id: "polygon-01", @@ -55,7 +55,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref index cb6e379..393ce72 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-polyline-01-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGPolyline { id: "polyline-01", @@ -55,7 +55,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref b/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref index 99cbce2..f25f6d4 100644 --- a/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/shapes-rect-02-t.ref @@ -12,7 +12,7 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 12 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 14.0000000000] + transform: [1, 0, 0, 1, 240, 14] }, SVGGroup { contents: [ @@ -75,7 +75,7 @@ SVGViewport { text: "$Revision: 1.9 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref index f8b0eb7..add1b17 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-defs-01-t.ref @@ -28,7 +28,7 @@ SVGViewport { text: "$Revision: 1.8 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, diff --git a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref index 2b706b4..0d9c3b6 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref @@ -23,18 +23,18 @@ SVGViewport { font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 120.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 120, 60] }, SVGText { text: "", font: { name: "SVGFreeSansASCII,sans-serif", size: 18 }, textAnchor: "middle", fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 360.0000000000, 60.0000000000] + transform: [1, 0, 0, 1, 360, 60] }, SVGGroup { id: "reference", - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813], + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813], contents: [ SVGRect { width: 100, @@ -45,14 +45,14 @@ SVGViewport { ] }, SVGGroup { - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 240.0000000000, 0.0000000000], + transform: [1, 0, 0, 1, 240, 0], contents: [ SVGRect { width: 100, height: 100, fill: "#FADC00", stroke: { fill: "#C82828", width: 20 }, - transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120.0000000000, 99.2893218813] + transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813] } ] } @@ -65,7 +65,7 @@ SVGViewport { text: "$Revision: 1.6 $", font: { name: "SVGFreeSansASCII,sans-serif", size: 32 }, fill: "black", - transform: [1.0000000000, 0.0000000000, 0.0000000000, 1.0000000000, 10.0000000000, 340.0000000000] + transform: [1, 0, 0, 1, 10, 340] } ] }, From 633735218e30a361d067b451d5ef392a2197c152 Mon Sep 17 00:00:00 2001 From: khoi Date: Tue, 27 May 2025 20:20:44 +0700 Subject: [PATCH 21/25] Fix decimal separator in CGAffineTransform serialization - Set NumberFormatter decimalSeparator to "." for consistent formatting - Update test fixtures to reflect period-separated decimal values - Ensure transform matrix serialization works regardless of system locale --- .../w3c/1.1F2/refs/coords-trans-01-b.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-02-t.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-03-t.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-04-t.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-05-t.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-06-t.ref | 6 ++--- .../w3c/1.1F2/refs/coords-trans-07-t.ref | 4 ++-- .../w3c/1.1F2/refs/coords-trans-09-t.ref | 8 +++---- .../w3c/1.1F2/refs/coords-trans-11-f.ref | 8 +++---- .../w3c/1.1F2/refs/coords-trans-14-f.ref | 2 +- .../1.1F2/refs/coords-transformattr-01-f.ref | 24 +++++++++---------- .../1.1F2/refs/coords-transformattr-02-f.ref | 8 +++---- .../1.1F2/refs/coords-transformattr-05-f.ref | 4 ++-- .../w3c/1.1F2/refs/painting-marker-01-f.ref | 18 +++++++------- .../w3c/1.1F2/refs/painting-stroke-07-t.ref | 2 +- .../w3c/1.1F2/refs/painting-stroke-08-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-04-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-05-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-06-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-07-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-08-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-09-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-14-t.ref | 2 +- .../w3c/1.1F2/refs/paths-data-15-t.ref | 2 +- .../w3c/1.1F2/refs/pservers-grad-07-b.ref | 2 +- .../w3c/1.1F2/refs/shapes-ellipse-03-f.ref | 2 +- .../w3c/1.1F2/refs/shapes-line-02-f.ref | 2 +- .../w3c/1.1F2/refs/shapes-rect-05-f.ref | 2 +- .../w3c/1.1F2/refs/struct-frag-06-t.ref | 4 ++-- .../w3c/1.1F2/refs/struct-group-01-t.ref | 2 +- .../w3c/1.1F2/refs/struct-use-03-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-01-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-02-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-03-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-04-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-05-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-06-t.ref | 6 ++--- .../w3c/1.2T/refs/coords-trans-07-t.ref | 4 ++-- .../w3c/1.2T/refs/coords-trans-09-t.ref | 8 +++---- .../w3c/1.2T/refs/struct-use-03-t.ref | 4 ++-- Source/Serialization/Serializations.swift | 1 + 41 files changed, 92 insertions(+), 91 deletions(-) diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref index e0b686a..13d0dc5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref @@ -702,7 +702,7 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3, 0, 0, 2, 50,000001, 210], + transform: [3, 0, 0, 2, 50.000001, 210], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -715,7 +715,7 @@ SVGViewport { transform: [3, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16,666667, 105], + transform: [1, 0, 0, 1, 16.666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref index 6bf8dca..3849643 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref @@ -16,7 +16,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, -30, 0], + transform: [2.5, 0, 0, 2.5, -30, 0], contents: [ SVGGroup { transform: [1, 0, 0, 1, 50, 50], @@ -36,7 +36,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -30, 0], + transform: [2.5, 0, 0, 2.5, -30, 0], contents: [ SVGText { text: "translate (50, 50)", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref index a01c0fc..8d09c3d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref @@ -16,7 +16,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, -560, 0], + transform: [2.5, 0, 0, 2.5, -560, 0], contents: [ SVGGroup { transform: [1, 0, 1, 1, 250, 50], @@ -36,7 +36,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -560, 0], + transform: [2.5, 0, 0, 2.5, -560, 0], contents: [ SVGText { text: "skew x (45)", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref index 9aae9fd..117e086 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref @@ -15,7 +15,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, 60, 45], + transform: [2.5, 0, 0, 2.5, 60, 45], contents: [ SVGGroup { transform: [2, 0, 0, 2, 40, 10], @@ -28,7 +28,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -364, -230], + transform: [2.5, 0, 0, 2.5, -364, -230], contents: [ SVGText { text: "scale (2)", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref index 8b41b8a..1fb0ce9 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref @@ -18,7 +18,7 @@ SVGViewport { transform: [1, 0, 0, 1, -90, -450], contents: [ SVGGroup { - transform: [7,5, 0, 0, 5, 125,0000025, 525], + transform: [7.5, 0, 0, 5, 125.0000025, 525], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -28,7 +28,7 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -90, -450], + transform: [2.5, 0, 0, 2.5, -90, -450], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref index 344ad89..53e1cc0 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref @@ -20,10 +20,10 @@ SVGViewport { transform: [1, 0, 0, 1, -102, -450], contents: [ SVGGroup { - transform: [7,5, 0, 0, 5, 0, 0], + transform: [7.5, 0, 0, 5, 0, 0], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16,666667, 105], + transform: [1, 0, 0, 1, 16.666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -37,7 +37,7 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -600, -450], + transform: [2.5, 0, 0, 2.5, -600, -450], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref index 1d4f889..729b4fd 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref @@ -12,7 +12,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 123,2050807569, 186,6025403784], + transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 123.2050807569, 186.6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -26,7 +26,7 @@ SVGViewport { }, SVGGroup { id: "object_2", - transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 200, 100], + transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 200, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref index 3502bc8..21dbe9d 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref @@ -37,7 +37,7 @@ SVGViewport { transform: [1, 0, 0, 1, 100, 100] }, SVGGroup { - transform: [1,5, 0, 0, 1,5, 70, 60], + transform: [1.5, 0, 0, 1.5, 70, 60], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -50,7 +50,7 @@ SVGViewport { transform: [1, 0, 0, 1, 70, 60] }, SVGGroup { - transform: [1, 0, 0,5, 1, 30, 170], + transform: [1, 0, 0.5, 1, 30, 170], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -63,7 +63,7 @@ SVGViewport { transform: [1, 0, 0, 1, 30, 170] }, SVGGroup { - transform: [1, 0,5, 0, 1, 100, 200], + transform: [1, 0.5, 0, 1, 100, 200], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -89,7 +89,7 @@ SVGViewport { transform: [1, 0, 0, 1, 275, 30] }, SVGGroup { - transform: [1, 0,8, 0,8, 1, 300, 220], + transform: [1, 0.8, 0.8, 1, 300, 220], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref index c2fa874..a74059e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,2, 0, 0, 2,5, 0, 0], + transform: [1.2, 0, 0, 2.5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -23,7 +23,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1,2, 0, 0, 2,5, 0, 0], + transform: [1.2, 0, 0, 2.5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", @@ -67,7 +67,7 @@ SVGViewport { transform: [1, 0, 0, 1, 0, 150], contents: [ SVGGroup { - transform: [1,2, 0, 0, 2,5, 0, 0], + transform: [1.2, 0, 0, 2.5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", fill: "red" }, SVGEllipse { cx: 120, cy: 35, rx: 30, ry: 10, fill: "red" }, @@ -82,7 +82,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1,2, 0, 0, 2,5, 0, 0], + transform: [1.2, 0, 0, 2.5, 0, 0], contents: [ SVGPath { path: "M20,20 L70,20 L45,60 z", diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref index b40bb41..1d19607 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [0,7047694656, -0,2565151075, 0,2565151075, 0,7047694656, 0, 0], + transform: [0.7047694656, -0.2565151075, 0.2565151075, 0.7047694656, 0, 0], contents: [ SVGGroup { transform: [1, 1, 0, 1, 0, 0], diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref index b34c3cd..d1c5347 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref @@ -8,13 +8,13 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { width: 100, @@ -25,13 +25,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 125, y: 125, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 125, @@ -44,13 +44,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 150, y: -75, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 150, @@ -63,13 +63,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 300, y: -150, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 300, @@ -82,13 +82,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 400, y: -325, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 400, @@ -101,13 +101,13 @@ SVGViewport { ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 500, y: -200, width: 100, height: 100, fill: "red" } ] }, SVGGroup { - transform: [0,5656854249, 0,5656854249, -0,4141104722, 0,7172603777, 50, 50], + transform: [0.5656854249, 0.5656854249, -0.4141104722, 0.7172603777, 50, 50], contents: [ SVGRect { x: 500, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref index a9713bf..57a7d92 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref @@ -11,7 +11,7 @@ SVGViewport { transform: [1, 0, 0, 1, 150, 0], contents: [ SVGGroup { - transform: [1,4142135624, 1,4142135624, -1,4142135624, 1,4142135624, -17,0710678119, 1,2132034356], + transform: [1.4142135624, 1.4142135624, -1.4142135624, 1.4142135624, -17.0710678119, 1.2132034356], contents: [ SVGRect { width: 50, height: 50, fill: "red" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "red" }, @@ -32,7 +32,7 @@ SVGViewport { transform: [2, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 0, 0], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0, 0], contents: [ SVGGroup { transform: [1, 0, 0, 1, 5, 10], @@ -65,7 +65,7 @@ SVGViewport { transform: [2, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 0, 0], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 0, 0], contents: [ SVGGroup { transform: [1, 0, 0, 1, 5, 10], @@ -89,7 +89,7 @@ SVGViewport { ] }, SVGGroup { - transform: [1,4142135624, 1,4142135624, -1,4142135624, 1,4142135624, -17,0710678119, 1,2132034356], + transform: [1.4142135624, 1.4142135624, -1.4142135624, 1.4142135624, -17.0710678119, 1.2132034356], contents: [ SVGRect { width: 50, height: 50, fill: "black" }, SVGCircle { cx: 50, cy: 50, r: 25, fill: "black" }, diff --git a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref index 61799a6..4747df2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref @@ -11,7 +11,7 @@ SVGViewport { transform: [1, 0, 0, 1, 50, 15], contents: [ SVGGroup { - transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0], + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0], contents: [ SVGRect { x: 10, width: 100, height: 200, fill: "red" }, SVGEllipse { cx: 170, cy: 100, rx: 50, ry: 100, fill: "red" }, @@ -27,7 +27,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0], + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0], contents: [ SVGRect { width: 100, diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref index 586a25b..59cdbae 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref @@ -102,19 +102,19 @@ SVGViewport { stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 122, 32], + transform: [1.6, 0, 0, 1.6, 122, 32], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 172, 32], + transform: [1.6, 0, 0, 1.6, 172, 32], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 172, 82], + transform: [1.6, 0, 0, 1.6, 172, 82], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] @@ -142,19 +142,19 @@ SVGViewport { stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 122, 127], + transform: [1.6, 0, 0, 1.6, 122, 127], contents: [ SVGRect { width: 10, height: 10, fill: "purple" } ] }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 172, 127], + transform: [1.6, 0, 0, 1.6, 172, 127], contents: [ SVGCircle { cx: 5, cy: 5, r: 5, fill: "green" } ] }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 172, 177], + transform: [1.6, 0, 0, 1.6, 172, 177], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] @@ -182,19 +182,19 @@ SVGViewport { stroke: { fill: "black", width: 8 } }, SVGGroup { - transform: [1,6, 0, 0, 1,6, 122, 222], + transform: [1.6, 0, 0, 1.6, 122, 222], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] }, SVGGroup { - transform: [1,1313708499, 1,1313708499, -1,1313708499, 1,1313708499, 180, 218,686291501], + transform: [1.1313708499, 1.1313708499, -1.1313708499, 1.1313708499, 180, 218.686291501], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] }, SVGGroup { - transform: [0, 1,6, -1,6, 0, 188, 272], + transform: [0, 1.6, -1.6, 0, 188, 272], contents: [ SVGPath { path: "M5,0 L10,10 L0,10 z", fill: "blue" } ] diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref index 1dbfb19..9af6da2 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-07-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,2, 0, 0, 1,2, 72, 36], + transform: [1.2, 0, 0, 1.2, 72, 36], contents: [ SVGPath { path: "M20,20 L200,30 L20,40", diff --git a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref index 8cb6d18..bfd13b3 100644 --- a/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/painting-stroke-08-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,7, 0, 0, 1,7, 50, 0], + transform: [1.7, 0, 0, 1.7, 50, 0], contents: [ SVGCircle { cx: 200, cy: 20, r: 5, fill: "#FF6666" }, SVGCircle { cx: 200, cy: 40, r: 5, fill: "#FF6666" }, diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref index 025ff66..343db63 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-04-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, 0, 0], + transform: [1.8, 0, 0, 1.8, 0, 0], contents: [ SVGText { text: "M, L, L, L, Z,", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref index b53a6e0..1fd2131 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-05-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, 0, -270], + transform: [1.8, 0, 0, 1.8, 0, -270], contents: [ SVGText { text: "m, l, l, l, z,", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref index a85e29a..5dba0ed 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-06-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, -360, 0], + transform: [1.8, 0, 0, 1.8, -360, 0], contents: [ SVGText { text: "M, H, V, H,", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref index e951af1..897aaa3 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-07-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, -360, -270], + transform: [1.8, 0, 0, 1.8, -360, -270], contents: [ SVGText { text: "m, h, v, h", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref index c13d5fd..7679107 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-08-t.ref @@ -20,7 +20,7 @@ SVGViewport { transform: [1, 0, 0, 1, 180, 64] }, SVGGroup { - transform: [1,8, 0, 0, 1,8, 0, 0], + transform: [1.8, 0, 0, 1.8, 0, 0], contents: [ SVGPath { id: "Triangle_stroke_MZ", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref index e100b98..f58ab78 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-09-t.ref @@ -20,7 +20,7 @@ SVGViewport { transform: [1, 0, 0, 1, 180, 64] }, SVGGroup { - transform: [1,8, 0, 0, 1,8, 0, -270], + transform: [1.8, 0, 0, 1.8, 0, -270], contents: [ SVGPath { id: "Triangle_stroke_mz", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref index f10e163..1d9c783 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-14-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, 0, 0], + transform: [1.8, 0, 0, 1.8, 0, 0], contents: [ SVGPath { path: "m62,56 l51.96152,90 l-103.92304,0 l51.96152,-90 z m0,15 l38.97114,67.5 l-77.91228,0 l38.97114,-67.5 z", diff --git a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref index e594dce..2b91a08 100644 --- a/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/paths-data-15-t.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1,8, 0, 0, 1,8, 36, 90], + transform: [1.8, 0, 0, 1.8, 36, 90], contents: [ SVGPath { path: "M20,20 Q50,10,80,20 Q110,30,140,20 Q170,10,200,20", diff --git a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref index f82ba00..7e84727 100644 --- a/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref +++ b/SVGViewTests/w3c/1.1F2/refs/pservers-grad-07-b.ref @@ -8,7 +8,7 @@ SVGViewport { id: "test-body-content", contents: [ SVGGroup { - transform: [1, 0, 0, 1,5, 0, 0], + transform: [1, 0, 0, 1.5, 0, 0], contents: [ SVGRect { x: 10, y: 10, width: 430, height: 60 }, SVGText { diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref index 873c7b9..da1a2fe 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-ellipse-03-f.ref @@ -30,7 +30,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0,8660254038, -0,5, 0,5, 0,8660254038, 350, 150], + transform: [0.8660254038, -0.5, 0.5, 0.8660254038, 350, 150], contents: [ SVGLine { y1: -100, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref index 8e5dbc0..c2bd6cc 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-line-02-f.ref @@ -22,7 +22,7 @@ SVGViewport { y2: 100, fill: "red", stroke: { fill: "black", width: 10 }, - transform: [0,9659258263, 0,2588190451, -0,2588190451, 0,9659258263, 0, 0] + transform: [0.9659258263, 0.2588190451, -0.2588190451, 0.9659258263, 0, 0] } ] }, diff --git a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref index 924c242..b3aa9e5 100644 --- a/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref +++ b/SVGViewTests/w3c/1.1F2/refs/shapes-rect-05-f.ref @@ -28,7 +28,7 @@ SVGViewport { ] }, SVGGroup { - transform: [0,8660254038, -0,5, 0,8152074691, 0,6840402867, 100, 100], + transform: [0.8660254038, -0.5, 0.8152074691, 0.6840402867, 100, 100], contents: [ SVGRect { x: 100, diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref index 3b19002..7bdd31b 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-frag-06-t.ref @@ -50,7 +50,7 @@ SVGViewport { transform: [1, 0, 0, 1, 105, 228] }, SVGGroup { - transform: [0,2, 0, 0, 0,2, 90, 235], + transform: [0.2, 0, 0, 0.2, 90, 235], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", @@ -66,7 +66,7 @@ SVGViewport { transform: [1, 0, 0, 1, 205, 228] }, SVGGroup { - transform: [0,2, 0, 0, 0,2, 190, 235], + transform: [0.2, 0, 0, 0.2, 190, 235], contents: [ SVGPath { path: "M60,0 l60,0 l60,60 l0,60 l-60,60 l-60,0 l-60,-60 l0,-60 z", diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref index 7c419e1..86b2d5e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-group-01-t.ref @@ -26,7 +26,7 @@ SVGViewport { contents: [ SVGGroup { id: "yellowNrotate", - transform: [0,9396926208, -0,3420201433, 0,3420201433, 0,9396926208, 0, 0], + transform: [0.9396926208, -0.3420201433, 0.3420201433, 0.9396926208, 0, 0], contents: [ SVGRect { y: 224, width: 40, height: 40, fill: "yellow" }, SVGRect { y: 280, width: 40, height: 40, fill: "yellow" } diff --git a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref index 71ffc3c..9c7652e 100644 --- a/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.1F2/refs/struct-use-03-t.ref @@ -34,7 +34,7 @@ SVGViewport { }, SVGGroup { id: "reference", - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813], contents: [ SVGRect { width: 100, @@ -52,7 +52,7 @@ SVGViewport { height: 100, fill: "aqua", stroke: { fill: "blue", width: 20 }, - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813] + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813] } ] } diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref index 20769fb..61ab041 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-01-t.ref @@ -702,7 +702,7 @@ SVGViewport { id: "nested-transforms", contents: [ SVGGroup { - transform: [3, 0, 0, 2, 50,000001, 210], + transform: [3, 0, 0, 2, 50.000001, 210], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -715,7 +715,7 @@ SVGViewport { transform: [3, 0, 0, 2, 0, 0], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16,666667, 105], + transform: [1, 0, 0, 1, 16.666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref index d9f600e..4f81059 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-02-t.ref @@ -16,7 +16,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, -30, 0], + transform: [2.5, 0, 0, 2.5, -30, 0], contents: [ SVGGroup { transform: [1, 0, 0, 1, 50, 50], @@ -36,7 +36,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -30, 0], + transform: [2.5, 0, 0, 2.5, -30, 0], contents: [ SVGText { text: "translate (50, 50)", diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref index 1213c04..d5a9d74 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-03-t.ref @@ -16,7 +16,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, -560, 0], + transform: [2.5, 0, 0, 2.5, -560, 0], contents: [ SVGGroup { transform: [1, 0, 1, 1, 250, 50], @@ -36,7 +36,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -560, 0], + transform: [2.5, 0, 0, 2.5, -560, 0], contents: [ SVGText { text: "skew x (45)", diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref index f7bd76b..fb93788 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-04-t.ref @@ -15,7 +15,7 @@ SVGViewport { contents: [ SVGGroup { id: "elementary-transforms", - transform: [2,5, 0, 0, 2,5, 60, 45], + transform: [2.5, 0, 0, 2.5, 60, 45], contents: [ SVGGroup { transform: [2, 0, 0, 2, 40, 10], @@ -28,7 +28,7 @@ SVGViewport { }, SVGGroup { id: "elementary-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -364, -230], + transform: [2.5, 0, 0, 2.5, -364, -230], contents: [ SVGText { text: "scale (2)", diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref index 0ef393c..ee46056 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-05-t.ref @@ -18,7 +18,7 @@ SVGViewport { transform: [1, 0, 0, 1, -90, -450], contents: [ SVGGroup { - transform: [7,5, 0, 0, 5, 125,0000025, 525], + transform: [7.5, 0, 0, 5, 125.0000025, 525], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -28,7 +28,7 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -90, -450], + transform: [2.5, 0, 0, 2.5, -90, -450], contents: [ SVGText { text: "scale(25, 95) - translate(2, 2)", diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref index c596404..b1d5754 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-06-t.ref @@ -20,10 +20,10 @@ SVGViewport { transform: [1, 0, 0, 1, -102, -450], contents: [ SVGGroup { - transform: [7,5, 0, 0, 5, 0, 0], + transform: [7.5, 0, 0, 5, 0, 0], contents: [ SVGGroup { - transform: [1, 0, 0, 1, 16,666667, 105], + transform: [1, 0, 0, 1, 16.666667, 105], contents: [ SVGRect { width: 20, height: 1, fill: "blue" }, SVGRect { width: 0.67, height: 20, fill: "red" } @@ -37,7 +37,7 @@ SVGViewport { }, SVGGroup { id: "nested-transforms-test-markers", - transform: [2,5, 0, 0, 2,5, -600, -450], + transform: [2.5, 0, 0, 2.5, -600, -450], contents: [ SVGText { text: "scale(25, 95) then translate(2, 2)", diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref index 433496c..86ba7c7 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-07-t.ref @@ -9,7 +9,7 @@ SVGViewport { contents: [ SVGGroup { id: "object_1", - transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 123,2050807569, 186,6025403784], + transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 123.2050807569, 186.6025403784], contents: [ SVGRect { width: 150, height: 5, fill: "green" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -23,7 +23,7 @@ SVGViewport { }, SVGGroup { id: "object_2", - transform: [0,8660254038, 0,5, -0,5, 0,8660254038, 200, 100], + transform: [0.8660254038, 0.5, -0.5, 0.8660254038, 200, 100], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } diff --git a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref index d8363be..1707091 100644 --- a/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/coords-trans-09-t.ref @@ -34,7 +34,7 @@ SVGViewport { transform: [1, 0, 0, 1, 100, 100] }, SVGGroup { - transform: [1,5, 0, 0, 1,5, 70, 60], + transform: [1.5, 0, 0, 1.5, 70, 60], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -47,7 +47,7 @@ SVGViewport { transform: [1, 0, 0, 1, 70, 60] }, SVGGroup { - transform: [1, 0, 0,5, 1, 30, 170], + transform: [1, 0, 0.5, 1, 30, 170], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -60,7 +60,7 @@ SVGViewport { transform: [1, 0, 0, 1, 30, 170] }, SVGGroup { - transform: [1, 0,5, 0, 1, 100, 200], + transform: [1, 0.5, 0, 1, 100, 200], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } @@ -86,7 +86,7 @@ SVGViewport { transform: [1, 0, 0, 1, 275, 30] }, SVGGroup { - transform: [1, 0,8, 0,8, 1, 300, 220], + transform: [1, 0.8, 0.8, 1, 300, 220], contents: [ SVGRect { width: 150, height: 5, fill: "blue" }, SVGRect { width: 5, height: 50, fill: "red" } diff --git a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref index 0d9c3b6..1070873 100644 --- a/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref +++ b/SVGViewTests/w3c/1.2T/refs/struct-use-03-t.ref @@ -34,7 +34,7 @@ SVGViewport { }, SVGGroup { id: "reference", - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813], + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813], contents: [ SVGRect { width: 100, @@ -52,7 +52,7 @@ SVGViewport { height: 100, fill: "#FADC00", stroke: { fill: "#C82828", width: 20 }, - transform: [0,7071067812, 0,7071067812, -0,7071067812, 0,7071067812, 120, 99,2893218813] + transform: [0.7071067812, 0.7071067812, -0.7071067812, 0.7071067812, 120, 99.2893218813] } ] } diff --git a/Source/Serialization/Serializations.swift b/Source/Serialization/Serializations.swift index 1b45d67..06e2613 100644 --- a/Source/Serialization/Serializations.swift +++ b/Source/Serialization/Serializations.swift @@ -50,6 +50,7 @@ extension CGAffineTransform: SerializableAtom { let formatter = NumberFormatter() formatter.minimumFractionDigits = 0 formatter.maximumFractionDigits = 10 + formatter.decimalSeparator = "." let nums = [a, b, c, d, tx, ty] From 35b2c731ce46cb4c2b8705dbe0b1dd8f3dc59b6a Mon Sep 17 00:00:00 2001 From: pacowong Date: Tue, 27 May 2025 21:54:47 +0800 Subject: [PATCH 22/25] Update Source/Model/Nodes/SVGMarker.swift Co-authored-by: khoi <6994441+khoi@users.noreply.github.com> --- Source/Model/Nodes/SVGMarker.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index 17b598f..af6cd42 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -11,7 +11,7 @@ public class SVGMarker: SVGNode { case autoStartReverse case angle(Float) - public init?(rawValue: String?) { + public init(rawValue: String) { guard let rawValue else { self = .angle(0) return From a285e116f70b28a2e2fb54a8de6574b59859d545 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 23:22:28 +0800 Subject: [PATCH 23/25] Remove .zero --- Source/Model/Nodes/SVGMarker.swift | 18 +++++++++--------- Source/Model/Primitives/SVGLength.swift | 2 -- .../SVG/Elements/SVGStructureParsers.swift | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index af6cd42..75e94fe 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -12,10 +12,6 @@ public class SVGMarker: SVGNode { case angle(Float) public init(rawValue: String) { - guard let rawValue else { - self = .angle(0) - return - } if rawValue == "auto" { self = .auto } else if rawValue == "auto-start-reverse" { @@ -80,13 +76,13 @@ public class SVGMarker: SVGNode { @Published public var markerWidth: SVGLength @Published public var orient: Orient @Published public var preserveAspectRatio: SVGPreserveAspectRatio - @Published public var refX: RefMagnitude - @Published public var refY: RefMagnitude + @Published public var refX: RefMagnitude? + @Published public var refY: RefMagnitude? @Published public var viewBox: CGRect? @Published public var contents: [SVGNode] = [] #endif - public init(markerHeight: SVGLength, markerUnits: MarkerUnits, markerWidth: SVGLength, orient: Orient, preserveAspectRatio: SVGPreserveAspectRatio, refX: RefMagnitude, refY: RefMagnitude, viewBox: CGRect? = nil, contents: [SVGNode]) { + public init(markerHeight: SVGLength, markerUnits: MarkerUnits, markerWidth: SVGLength, orient: Orient, preserveAspectRatio: SVGPreserveAspectRatio, refX: RefMagnitude?, refY: RefMagnitude?, viewBox: CGRect? = nil, contents: [SVGNode]) { self.markerHeight = markerHeight self.markerUnits = markerUnits self.markerWidth = markerWidth @@ -118,8 +114,12 @@ public class SVGMarker: SVGNode { serializer.add("xAlign", preserveAspectRatio.xAlign) serializer.add("yAlign", preserveAspectRatio.yAlign) - serializer.add("refX", refX.toString()) - serializer.add("refY", refY.toString()) + if let refXStr = refX?.toString() { + serializer.add("refX", refXStr) + } + if let refYStr = refY?.toString() { + serializer.add("refY", refYStr) + } serializer.add("viewBox", viewBox) diff --git a/Source/Model/Primitives/SVGLength.swift b/Source/Model/Primitives/SVGLength.swift index bcfc193..466afb3 100644 --- a/Source/Model/Primitives/SVGLength.swift +++ b/Source/Model/Primitives/SVGLength.swift @@ -16,8 +16,6 @@ public enum SVGLength { case percent(CGFloat) case pixels(CGFloat) - static let zero: SVGLength = .pixels(0) - init(percent: CGFloat) { self = .percent(percent) } diff --git a/Source/Parser/SVG/Elements/SVGStructureParsers.swift b/Source/Parser/SVG/Elements/SVGStructureParsers.swift index 366bc0d..1b1bb10 100644 --- a/Source/Parser/SVG/Elements/SVGStructureParsers.swift +++ b/Source/Parser/SVG/Elements/SVGStructureParsers.swift @@ -126,9 +126,9 @@ class SVGMarkerParser: SVGBaseElementParser { } } - static func parseRefMagnitude(_ attributes: [String: String], _ key: String) -> SVGMarker.RefMagnitude { + static func parseRefMagnitude(_ attributes: [String: String], _ key: String) -> SVGMarker.RefMagnitude? { guard let value = attributes[key] else { - return .coordinate(.zero) + return nil } if value == "right" { return .right @@ -139,7 +139,7 @@ class SVGMarkerParser: SVGBaseElementParser { } else if let magnitude = SVGHelper.parseDimension(attributes, key) { return .coordinate(magnitude) } else { - return .coordinate(.zero) + return nil } } } From 42e1a3c0c127d14e150beb2045580ca3b3778d73 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 23:34:59 +0800 Subject: [PATCH 24/25] SVGMarker is a subclass of SVGGroup --- Source/Model/Nodes/SVGGroup.swift | 9 ++++++++- Source/Model/Nodes/SVGMarker.swift | 27 +++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Source/Model/Nodes/SVGGroup.swift b/Source/Model/Nodes/SVGGroup.swift index 406839a..ce143cc 100644 --- a/Source/Model/Nodes/SVGGroup.swift +++ b/Source/Model/Nodes/SVGGroup.swift @@ -11,7 +11,14 @@ public class SVGGroup: SVGNode { #else @Published public var contents: [SVGNode] = [] #endif - public init(contents: [SVGNode], transform: CGAffineTransform = .identity, opaque: Bool = true, opacity: Double = 1, clip: SVGUserSpaceNode? = nil, mask: SVGNode? = nil) { + public init( + contents: [SVGNode], + transform: CGAffineTransform = .identity, + opaque: Bool = true, + opacity: Double = 1, + clip: SVGUserSpaceNode? = nil, + mask: SVGNode? = nil + ) { super.init(transform: transform, opaque: opaque, opacity: opacity, clip: clip, mask: mask) self.contents = contents } diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index 75e94fe..87a0314 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -5,7 +5,7 @@ import SwiftUI import Combine #endif -public class SVGMarker: SVGNode { +public class SVGMarker: SVGGroup { public enum Orient { case auto case autoStartReverse @@ -69,7 +69,6 @@ public class SVGMarker: SVGNode { public var refX: RefMagnitude public var refY: RefMagnitude public var viewBox: CGRect? - public var contents: [SVGNode] = [] #else @Published public var markerHeight: SVGLength @Published public var markerUnits: MarkerUnits @@ -79,10 +78,19 @@ public class SVGMarker: SVGNode { @Published public var refX: RefMagnitude? @Published public var refY: RefMagnitude? @Published public var viewBox: CGRect? - @Published public var contents: [SVGNode] = [] #endif - public init(markerHeight: SVGLength, markerUnits: MarkerUnits, markerWidth: SVGLength, orient: Orient, preserveAspectRatio: SVGPreserveAspectRatio, refX: RefMagnitude?, refY: RefMagnitude?, viewBox: CGRect? = nil, contents: [SVGNode]) { + public init( + markerHeight: SVGLength, + markerUnits: MarkerUnits, + markerWidth: SVGLength, + orient: Orient, + preserveAspectRatio: SVGPreserveAspectRatio, + refX: RefMagnitude?, + refY: RefMagnitude?, + viewBox: CGRect? = nil, + contents: [SVGNode] + ) { self.markerHeight = markerHeight self.markerUnits = markerUnits self.markerWidth = markerWidth @@ -91,15 +99,7 @@ public class SVGMarker: SVGNode { self.refX = refX self.refY = refY self.viewBox = viewBox - self.contents = contents - } - - override public func bounds() -> CGRect { - contents.map { $0.bounds() }.reduce(contents.first?.bounds() ?? CGRect.zero) { $0.union($1) } - } - - override public func getNode(byId id: String) -> SVGMarker? { - self.id == id ? self : .none + super.init(contents: contents) } override func serialize(_ serializer: Serializer) { @@ -145,7 +145,6 @@ public class SVGMarker: SVGNode { } #if canImport(SwiftUI) -extension SVGMarker: ObservableObject {} struct SVGMarkerView: View { @ObservedObject var model: SVGMarker From 34383ab6a06ae5d71abb0f5f6fdaaec0aa9e36d1 Mon Sep 17 00:00:00 2001 From: Paco Wong Date: Tue, 27 May 2025 23:52:16 +0800 Subject: [PATCH 25/25] Fix XP code --- Source/Model/Nodes/SVGMarker.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Model/Nodes/SVGMarker.swift b/Source/Model/Nodes/SVGMarker.swift index 87a0314..c7ed050 100644 --- a/Source/Model/Nodes/SVGMarker.swift +++ b/Source/Model/Nodes/SVGMarker.swift @@ -66,8 +66,8 @@ public class SVGMarker: SVGGroup { public var markerWidth: SVGLength public var orient: Orient public var preserveAspectRatio: SVGPreserveAspectRatio - public var refX: RefMagnitude - public var refY: RefMagnitude + public var refX: RefMagnitude? + public var refY: RefMagnitude? public var viewBox: CGRect? #else @Published public var markerHeight: SVGLength