Skip to content

Commit ad35caa

Browse files
adamgitadamgit
committed
FIXED: Bug in some text positions for complex interaction of transforms and X,Y co-ords
1 parent 6ac4dd3 commit ad35caa

File tree

9 files changed

+80
-249
lines changed

9 files changed

+80
-249
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# osx
22
.DS_Store
33
Icon?
4+
*.swp
45

56
# Thumbnails
67
._*

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/PreserveAspectRatio.svg

-84
This file was deleted.

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/StyleAttribute.svg

-8
This file was deleted.

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/lingrad01.svg

-25
This file was deleted.

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/opacity01.svg

-47
This file was deleted.

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/text01.svg

-17
This file was deleted.

‎Demo-Samples/SVG/apache-licensed-from-svg-android/svg spec examples/tspan01.svg

-20
This file was deleted.

‎Demo-iOS.xcodeproj/project.pbxproj

+30-31
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
663FCFF416C9AF1C00CCBFB3 /* transformations.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FCFF016C9AF1C00CCBFB3 /* transformations.svg */; };
1818
663FCFF616C9AF3C00CCBFB3 /* Sample Licenses from svg-android project.txt in Resources */ = {isa = PBXBuildFile; fileRef = 663FCFF516C9AF3C00CCBFB3 /* Sample Licenses from svg-android project.txt */; };
1919
663FD00416CAB16B00CCBFB3 /* groups-and-layers-test.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00316CAB16B00CCBFB3 /* groups-and-layers-test.svg */; };
20-
663FD00C16CADE2300CCBFB3 /* lingrad01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00616CADE2200CCBFB3 /* lingrad01.svg */; };
21-
663FD00D16CADE2300CCBFB3 /* opacity01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00716CADE2200CCBFB3 /* opacity01.svg */; };
22-
663FD00E16CADE2300CCBFB3 /* PreserveAspectRatio.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00816CADE2300CCBFB3 /* PreserveAspectRatio.svg */; };
23-
663FD00F16CADE2300CCBFB3 /* StyleAttribute.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00916CADE2300CCBFB3 /* StyleAttribute.svg */; };
24-
663FD01016CADE2300CCBFB3 /* text01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00A16CADE2300CCBFB3 /* text01.svg */; };
25-
663FD01116CADE2300CCBFB3 /* tspan01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 663FD00B16CADE2300CCBFB3 /* tspan01.svg */; };
2620
6649E0AD1617479200AFE92A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6649E0AC1617479200AFE92A /* QuartzCore.framework */; };
2721
6649E10D1617577000AFE92A /* libSVGKit-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6649E10A1617574700AFE92A /* libSVGKit-iOS.a */; };
2822
6649E10F1617578500AFE92A /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6649E10E1617578500AFE92A /* libxml2.dylib */; };
2923
665E07F316CE81DD00D6934D /* g-element-applies-rotation.svg in Resources */ = {isa = PBXBuildFile; fileRef = 665E07F216CE81DD00D6934D /* g-element-applies-rotation.svg */; };
3024
6661A77D1698BBE20061E349 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6661A77C1698BBE20061E349 /* CoreText.framework */; };
25+
66A09CA616CFE67B003CD5CD /* lingrad01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA016CFE67B003CD5CD /* lingrad01.svg */; };
26+
66A09CA716CFE67B003CD5CD /* opacity01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA116CFE67B003CD5CD /* opacity01.svg */; };
27+
66A09CA816CFE67B003CD5CD /* PreserveAspectRatio.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA216CFE67B003CD5CD /* PreserveAspectRatio.svg */; };
28+
66A09CA916CFE67B003CD5CD /* StyleAttribute.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA316CFE67B003CD5CD /* StyleAttribute.svg */; };
29+
66A09CAA16CFE67B003CD5CD /* text01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA416CFE67B003CD5CD /* text01.svg */; };
30+
66A09CAB16CFE67B003CD5CD /* tspan01.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A09CA516CFE67B003CD5CD /* tspan01.svg */; };
3131
66A9F4441688C66E000D4A2E /* RainbowWing.svg in Resources */ = {isa = PBXBuildFile; fileRef = 66A9F4431688C66E000D4A2E /* RainbowWing.svg */; };
3232
66E8626B1688BA0B0059C9C4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 66E862581688BA0B0059C9C4 /* AppDelegate.m */; };
3333
66E8626C1688BA0B0059C9C4 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 66E862591688BA0B0059C9C4 /* [email protected] */; };
@@ -90,17 +90,17 @@
9090
663FCFF016C9AF1C00CCBFB3 /* transformations.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = transformations.svg; sourceTree = "<group>"; };
9191
663FCFF516C9AF3C00CCBFB3 /* Sample Licenses from svg-android project.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Sample Licenses from svg-android project.txt"; sourceTree = "<group>"; };
9292
663FD00316CAB16B00CCBFB3 /* groups-and-layers-test.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "groups-and-layers-test.svg"; sourceTree = "<group>"; };
93-
663FD00616CADE2200CCBFB3 /* lingrad01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = lingrad01.svg; sourceTree = "<group>"; };
94-
663FD00716CADE2200CCBFB3 /* opacity01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = opacity01.svg; sourceTree = "<group>"; };
95-
663FD00816CADE2300CCBFB3 /* PreserveAspectRatio.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PreserveAspectRatio.svg; sourceTree = "<group>"; };
96-
663FD00916CADE2300CCBFB3 /* StyleAttribute.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = StyleAttribute.svg; sourceTree = "<group>"; };
97-
663FD00A16CADE2300CCBFB3 /* text01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = text01.svg; sourceTree = "<group>"; };
98-
663FD00B16CADE2300CCBFB3 /* tspan01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tspan01.svg; sourceTree = "<group>"; };
9993
6649E0AC1617479200AFE92A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
10094
6649E1021617574600AFE92A /* SVGKit-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "SVGKit-iOS.xcodeproj"; sourceTree = "<group>"; };
10195
6649E10E1617578500AFE92A /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
10296
665E07F216CE81DD00D6934D /* g-element-applies-rotation.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "g-element-applies-rotation.svg"; sourceTree = "<group>"; };
10397
6661A77C1698BBE20061E349 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
98+
66A09CA016CFE67B003CD5CD /* lingrad01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = lingrad01.svg; sourceTree = "<group>"; };
99+
66A09CA116CFE67B003CD5CD /* opacity01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = opacity01.svg; sourceTree = "<group>"; };
100+
66A09CA216CFE67B003CD5CD /* PreserveAspectRatio.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PreserveAspectRatio.svg; sourceTree = "<group>"; };
101+
66A09CA316CFE67B003CD5CD /* StyleAttribute.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = StyleAttribute.svg; sourceTree = "<group>"; };
102+
66A09CA416CFE67B003CD5CD /* text01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = text01.svg; sourceTree = "<group>"; };
103+
66A09CA516CFE67B003CD5CD /* tspan01.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tspan01.svg; sourceTree = "<group>"; };
104104
66A9F4431688C66E000D4A2E /* RainbowWing.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = RainbowWing.svg; sourceTree = "<group>"; };
105105
66E862571688BA0B0059C9C4 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
106106
66E862581688BA0B0059C9C4 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -202,26 +202,25 @@
202202
path = "apache-licensed-from-svg-android";
203203
sourceTree = "<group>";
204204
};
205-
663FD00516CADE2200CCBFB3 /* svg spec examples */ = {
205+
6649E1031617574600AFE92A /* Products */ = {
206206
isa = PBXGroup;
207207
children = (
208-
663FD00616CADE2200CCBFB3 /* lingrad01.svg */,
209-
663FD00716CADE2200CCBFB3 /* opacity01.svg */,
210-
663FD00816CADE2300CCBFB3 /* PreserveAspectRatio.svg */,
211-
663FD00916CADE2300CCBFB3 /* StyleAttribute.svg */,
212-
663FD00A16CADE2300CCBFB3 /* text01.svg */,
213-
663FD00B16CADE2300CCBFB3 /* tspan01.svg */,
208+
6649E10A1617574700AFE92A /* libSVGKit-iOS.a */,
214209
);
215-
name = "svg spec examples";
216-
path = "apache-licensed-from-svg-android/svg spec examples";
210+
name = Products;
217211
sourceTree = "<group>";
218212
};
219-
6649E1031617574600AFE92A /* Products */ = {
213+
66A09C9F16CFE67B003CD5CD /* svg spec examples */ = {
220214
isa = PBXGroup;
221215
children = (
222-
6649E10A1617574700AFE92A /* libSVGKit-iOS.a */,
216+
66A09CA016CFE67B003CD5CD /* lingrad01.svg */,
217+
66A09CA116CFE67B003CD5CD /* opacity01.svg */,
218+
66A09CA216CFE67B003CD5CD /* PreserveAspectRatio.svg */,
219+
66A09CA316CFE67B003CD5CD /* StyleAttribute.svg */,
220+
66A09CA416CFE67B003CD5CD /* text01.svg */,
221+
66A09CA516CFE67B003CD5CD /* tspan01.svg */,
223222
);
224-
name = Products;
223+
path = "svg spec examples";
225224
sourceTree = "<group>";
226225
};
227226
66E862561688BA0B0059C9C4 /* Demo-iOS */ = {
@@ -270,7 +269,7 @@
270269
isa = PBXGroup;
271270
children = (
272271
663FCFEC16C9AF1C00CCBFB3 /* apache-licensed-from-svg-android */,
273-
663FD00516CADE2200CCBFB3 /* svg spec examples */,
272+
66A09C9F16CFE67B003CD5CD /* svg spec examples */,
274273
663FD00316CAB16B00CCBFB3 /* groups-and-layers-test.svg */,
275274
665E07F216CE81DD00D6934D /* g-element-applies-rotation.svg */,
276275
661ADBF916CC3399006F4BC3 /* rotated-and-skewed-text.svg */,
@@ -398,14 +397,14 @@
398397
663FCFF416C9AF1C00CCBFB3 /* transformations.svg in Resources */,
399398
663FCFF616C9AF3C00CCBFB3 /* Sample Licenses from svg-android project.txt in Resources */,
400399
663FD00416CAB16B00CCBFB3 /* groups-and-layers-test.svg in Resources */,
401-
663FD00C16CADE2300CCBFB3 /* lingrad01.svg in Resources */,
402-
663FD00D16CADE2300CCBFB3 /* opacity01.svg in Resources */,
403-
663FD00E16CADE2300CCBFB3 /* PreserveAspectRatio.svg in Resources */,
404-
663FD00F16CADE2300CCBFB3 /* StyleAttribute.svg in Resources */,
405-
663FD01016CADE2300CCBFB3 /* text01.svg in Resources */,
406-
663FD01116CADE2300CCBFB3 /* tspan01.svg in Resources */,
407400
661ADBFA16CC3399006F4BC3 /* rotated-and-skewed-text.svg in Resources */,
408401
665E07F316CE81DD00D6934D /* g-element-applies-rotation.svg in Resources */,
402+
66A09CA616CFE67B003CD5CD /* lingrad01.svg in Resources */,
403+
66A09CA716CFE67B003CD5CD /* opacity01.svg in Resources */,
404+
66A09CA816CFE67B003CD5CD /* PreserveAspectRatio.svg in Resources */,
405+
66A09CA916CFE67B003CD5CD /* StyleAttribute.svg in Resources */,
406+
66A09CAA16CFE67B003CD5CD /* text01.svg in Resources */,
407+
66A09CAB16CFE67B003CD5CD /* tspan01.svg in Resources */,
409408
);
410409
runOnlyForDeploymentPostprocessing = 0;
411410
};

0 commit comments

Comments
 (0)