Implement tailor made data structure and logic for text on a path rendering.

Remove postinstall script and dependencies on PerformanceBezier & QuartzBookPack.
This commit is contained in:
Mikael Sand
2017-12-28 05:23:38 +02:00
parent ec2a967592
commit b9959c779c
9 changed files with 396 additions and 137 deletions

View File

@@ -49,14 +49,12 @@
7F08CE9B1E23476900650F83 /* RNSVGTSpanManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F08CE991E23476900650F83 /* RNSVGTSpanManager.m */; };
7F08CEA01E23479700650F83 /* RNSVGTextPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F08CE9D1E23479700650F83 /* RNSVGTextPath.m */; };
7F08CEA11E23479700650F83 /* RNSVGTSpan.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F08CE9F1E23479700650F83 /* RNSVGTSpan.m */; };
7F4BB50A1FB1E50000663D5F /* QuartzBookPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F4BB5051FB1DEC300663D5F /* QuartzBookPack.framework */; };
7F9CDAFA1E1F809C00E0C805 /* RNSVGPathParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F9CDAF91E1F809C00E0C805 /* RNSVGPathParser.m */; };
7FC260CE1E3499BC00A39833 /* RNSVGViewBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC260CD1E3499BC00A39833 /* RNSVGViewBox.m */; };
7FC260D11E34A12000A39833 /* RNSVGSymbol.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC260D01E34A12000A39833 /* RNSVGSymbol.m */; };
7FC260D41E34A12A00A39833 /* RNSVGSymbolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FC260D31E34A12A00A39833 /* RNSVGSymbolManager.m */; };
945A8AF81F4CE3E8004BBF6B /* AlignmentBaseline.m in Sources */ = {isa = PBXBuildFile; fileRef = 945A8AF71F4CE3E8004BBF6B /* AlignmentBaseline.m */; };
945A8AF91F4CE3E8004BBF6B /* AlignmentBaseline.m in Sources */ = {isa = PBXBuildFile; fileRef = 945A8AF71F4CE3E8004BBF6B /* AlignmentBaseline.m */; };
9494C47A1F47116800D5BCFD /* PerformanceBezier.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9494C4771F4710FE00D5BCFD /* PerformanceBezier.framework */; };
9494C4D81F473BA700D5BCFD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9494C4D71F473BA700D5BCFD /* QuartzCore.framework */; };
9494C4DA1F473BCB00D5BCFD /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9494C4D91F473BCB00D5BCFD /* CoreText.framework */; };
9494C4DC1F473BD900D5BCFD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9494C4DB1F473BD900D5BCFD /* CoreGraphics.framework */; };
@@ -89,6 +87,10 @@
9494C5471F4C44DD00D5BCFD /* TextPathSide.m in Sources */ = {isa = PBXBuildFile; fileRef = 9494C5361F4C44DD00D5BCFD /* TextPathSide.m */; };
9494C5481F4C44DD00D5BCFD /* TextPathSpacing.m in Sources */ = {isa = PBXBuildFile; fileRef = 9494C5371F4C44DD00D5BCFD /* TextPathSpacing.m */; };
9494C5491F4C44DD00D5BCFD /* TextPathSpacing.m in Sources */ = {isa = PBXBuildFile; fileRef = 9494C5371F4C44DD00D5BCFD /* TextPathSpacing.m */; };
94EB93171FF4196100C0B251 /* UIBezierPath+TextRendering.m in Sources */ = {isa = PBXBuildFile; fileRef = 94EB93161FF4196100C0B251 /* UIBezierPath+TextRendering.m */; };
94EB93181FF4196100C0B251 /* UIBezierPath+TextRendering.m in Sources */ = {isa = PBXBuildFile; fileRef = 94EB93161FF4196100C0B251 /* UIBezierPath+TextRendering.m */; };
94EB936C1FF4916F00C0B251 /* BezierElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 94EB936B1FF4916F00C0B251 /* BezierElement.m */; };
94EB936D1FF4916F00C0B251 /* BezierElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 94EB936B1FF4916F00C0B251 /* BezierElement.m */; };
A361E76E1EB0C33D00646005 /* RNSVGTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 10BA0D331CE74E3100887C2B /* RNSVGTextManager.m */; };
A361E76F1EB0C33D00646005 /* RNSVGImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1039D2841CE71EB7001E90A8 /* RNSVGImage.m */; };
A361E7701EB0C33D00646005 /* RNSVGRect.m in Sources */ = {isa = PBXBuildFile; fileRef = 10BA0D471CE74E3D00887C2B /* RNSVGRect.m */; };
@@ -137,37 +139,6 @@
A361E79D1EB0C33D00646005 /* RNSVGDefsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1023B48C1D3DDCCE0051496D /* RNSVGDefsManager.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
7F4BB5041FB1DEC300663D5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7F4BB4FF1FB1DEC300663D5F /* QuartzBookPack.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7F917B141FB1D5E900A75AA4;
remoteInfo = QuartzBookPack;
};
7F4BB5061FB1DEC300663D5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7F4BB4FF1FB1DEC300663D5F /* QuartzBookPack.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7F917B1D1FB1D5E900A75AA4;
remoteInfo = QuartzBookPackTests;
};
9494C4761F4710FE00D5BCFD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9494C4711F4710FE00D5BCFD /* PerformanceBezier.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66F2EBE31A8DC05100D536E9;
remoteInfo = PerformanceBezier;
};
9494C4781F4710FE00D5BCFD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9494C4711F4710FE00D5BCFD /* PerformanceBezier.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 66B9D28C1A8D5FDE00CAC341;
remoteInfo = PerformanceBezierTests;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
0CF68ABF1AF0540F00FF9E5C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -281,7 +252,6 @@
7F08CE9E1E23479700650F83 /* RNSVGTSpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSVGTSpan.h; path = Text/RNSVGTSpan.h; sourceTree = "<group>"; };
7F08CE9F1E23479700650F83 /* RNSVGTSpan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNSVGTSpan.m; path = Text/RNSVGTSpan.m; sourceTree = "<group>"; };
7F08CEA31E23481F00650F83 /* RNSVGTextAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSVGTextAnchor.h; path = Utils/RNSVGTextAnchor.h; sourceTree = "<group>"; };
7F4BB4FF1FB1DEC300663D5F /* QuartzBookPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuartzBookPack.xcodeproj; path = QuartzBookPack/QuartzBookPack.xcodeproj; sourceTree = "<group>"; };
7F69160D1E3703D800DA6EDC /* RNSVGUnits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSVGUnits.h; path = Utils/RNSVGUnits.h; sourceTree = "<group>"; };
7F9CDAF81E1F809C00E0C805 /* RNSVGPathParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSVGPathParser.h; path = Utils/RNSVGPathParser.h; sourceTree = "<group>"; };
7F9CDAF91E1F809C00E0C805 /* RNSVGPathParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNSVGPathParser.m; path = Utils/RNSVGPathParser.m; sourceTree = "<group>"; };
@@ -293,7 +263,6 @@
7FC260D31E34A12A00A39833 /* RNSVGSymbolManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSVGSymbolManager.m; sourceTree = "<group>"; };
945A8AF71F4CE3E8004BBF6B /* AlignmentBaseline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AlignmentBaseline.m; path = Text/AlignmentBaseline.m; sourceTree = "<group>"; };
945A8AFA1F4CE41E004BBF6B /* AlignmentBaseline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AlignmentBaseline.h; path = Text/AlignmentBaseline.h; sourceTree = "<group>"; };
9494C4711F4710FE00D5BCFD /* PerformanceBezier.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PerformanceBezier.xcodeproj; path = PerformanceBezier/PerformanceBezier.xcodeproj; sourceTree = "<group>"; };
9494C4D71F473BA700D5BCFD /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
9494C4D91F473BCB00D5BCFD /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
9494C4DB1F473BD900D5BCFD /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -327,6 +296,10 @@
9494C5361F4C44DD00D5BCFD /* TextPathSide.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextPathSide.m; path = Text/TextPathSide.m; sourceTree = "<group>"; };
9494C5371F4C44DD00D5BCFD /* TextPathSpacing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextPathSpacing.m; path = Text/TextPathSpacing.m; sourceTree = "<group>"; };
94DDAC5C1F3D024300EED511 /* libRNSVG-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRNSVG-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
94EB93151FF4196100C0B251 /* UIBezierPath+TextRendering.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "UIBezierPath+TextRendering.h"; path = "Utils/UIBezierPath+TextRendering.h"; sourceTree = "<group>"; };
94EB93161FF4196100C0B251 /* UIBezierPath+TextRendering.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "UIBezierPath+TextRendering.m"; path = "Utils/UIBezierPath+TextRendering.m"; sourceTree = "<group>"; };
94EB936B1FF4916F00C0B251 /* BezierElement.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BezierElement.m; path = Utils/BezierElement.m; sourceTree = "<group>"; };
94EB93701FF4918D00C0B251 /* BezierElement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BezierElement.h; path = Utils/BezierElement.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -334,14 +307,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7F4BB50A1FB1E50000663D5F /* QuartzBookPack.framework in Frameworks */,
9494C4E01F473BED00D5BCFD /* Accelerate.framework in Frameworks */,
9494C4D81F473BA700D5BCFD /* QuartzCore.framework in Frameworks */,
9494C4DA1F473BCB00D5BCFD /* CoreText.framework in Frameworks */,
9494C4DC1F473BD900D5BCFD /* CoreGraphics.framework in Frameworks */,
9494C4DE1F473BDD00D5BCFD /* UIKit.framework in Frameworks */,
9494C4E21F473BF500D5BCFD /* Foundation.framework in Frameworks */,
9494C47A1F47116800D5BCFD /* PerformanceBezier.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -358,8 +329,6 @@
0CF68AB81AF0540F00FF9E5C = {
isa = PBXGroup;
children = (
7F4BB4FF1FB1DEC300663D5F /* QuartzBookPack.xcodeproj */,
9494C4711F4710FE00D5BCFD /* PerformanceBezier.xcodeproj */,
1039D29A1CE7212C001E90A8 /* Utils */,
1039D2801CE71DCF001E90A8 /* Elements */,
1039D27F1CE71D9B001E90A8 /* Text */,
@@ -545,19 +514,14 @@
7F9CDAF91E1F809C00E0C805 /* RNSVGPathParser.m */,
1039D29B1CE72177001E90A8 /* RCTConvert+RNSVG.h */,
1039D29C1CE72177001E90A8 /* RCTConvert+RNSVG.m */,
94EB93151FF4196100C0B251 /* UIBezierPath+TextRendering.h */,
94EB93161FF4196100C0B251 /* UIBezierPath+TextRendering.m */,
94EB936B1FF4916F00C0B251 /* BezierElement.m */,
94EB93701FF4918D00C0B251 /* BezierElement.h */,
);
name = Utils;
sourceTree = "<group>";
};
7F4BB5001FB1DEC300663D5F /* Products */ = {
isa = PBXGroup;
children = (
7F4BB5051FB1DEC300663D5F /* QuartzBookPack.framework */,
7F4BB5071FB1DEC300663D5F /* QuartzBookPackTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
9494C2B31F46139600D5BCFD /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -571,15 +535,6 @@
name = Frameworks;
sourceTree = "<group>";
};
9494C4721F4710FE00D5BCFD /* Products */ = {
isa = PBXGroup;
children = (
9494C4771F4710FE00D5BCFD /* PerformanceBezier.framework */,
9494C4791F4710FE00D5BCFD /* PerformanceBezierTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -640,16 +595,6 @@
mainGroup = 0CF68AB81AF0540F00FF9E5C;
productRefGroup = 0CF68AC21AF0540F00FF9E5C /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 9494C4721F4710FE00D5BCFD /* Products */;
ProjectRef = 9494C4711F4710FE00D5BCFD /* PerformanceBezier.xcodeproj */;
},
{
ProductGroup = 7F4BB5001FB1DEC300663D5F /* Products */;
ProjectRef = 7F4BB4FF1FB1DEC300663D5F /* QuartzBookPack.xcodeproj */;
},
);
projectRoot = "";
targets = (
0CF68AC01AF0540F00FF9E5C /* RNSVG */,
@@ -658,37 +603,6 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
7F4BB5051FB1DEC300663D5F /* QuartzBookPack.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = QuartzBookPack.framework;
remoteRef = 7F4BB5041FB1DEC300663D5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
7F4BB5071FB1DEC300663D5F /* QuartzBookPackTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = QuartzBookPackTests.xctest;
remoteRef = 7F4BB5061FB1DEC300663D5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9494C4771F4710FE00D5BCFD /* PerformanceBezier.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework.static;
path = PerformanceBezier.framework;
remoteRef = 9494C4761F4710FE00D5BCFD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9494C4791F4710FE00D5BCFD /* PerformanceBezierTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PerformanceBezierTests.xctest;
remoteRef = 9494C4781F4710FE00D5BCFD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXSourcesBuildPhase section */
0CF68ABD1AF0540F00FF9E5C /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -700,6 +614,7 @@
10BA0D341CE74E3100887C2B /* RNSVGCircleManager.m in Sources */,
10BEC1BC1D3F66F500FDCB19 /* RNSVGLinearGradient.m in Sources */,
9494C5461F4C44DD00D5BCFD /* TextPathSide.m in Sources */,
94EB93171FF4196100C0B251 /* UIBezierPath+TextRendering.m in Sources */,
1039D2B01CE72F27001E90A8 /* RNSVGPercentageConverter.m in Sources */,
9494C53C1F4C44DD00D5BCFD /* TextAnchor.m in Sources */,
10BA0D491CE74E3D00887C2B /* RNSVGEllipse.m in Sources */,
@@ -734,6 +649,7 @@
9494C5251F4B605F00D5BCFD /* GlyphContext.m in Sources */,
10BA0D481CE74E3D00887C2B /* RNSVGCircle.m in Sources */,
9494C5401F4C44DD00D5BCFD /* TextLengthAdjust.m in Sources */,
94EB936C1FF4916F00C0B251 /* BezierElement.m in Sources */,
10BA0D351CE74E3100887C2B /* RNSVGEllipseManager.m in Sources */,
1039D2A01CE72177001E90A8 /* RCTConvert+RNSVG.m in Sources */,
9494C4FF1F4B5BE800D5BCFD /* FontData.m in Sources */,
@@ -767,6 +683,7 @@
A361E7711EB0C33D00646005 /* RNSVGCircleManager.m in Sources */,
A361E7721EB0C33D00646005 /* RNSVGLinearGradient.m in Sources */,
A361E7731EB0C33D00646005 /* RNSVGPercentageConverter.m in Sources */,
94EB93181FF4196100C0B251 /* UIBezierPath+TextRendering.m in Sources */,
9494C53F1F4C44DD00D5BCFD /* TextDecoration.m in Sources */,
A361E7751EB0C33D00646005 /* RNSVGEllipse.m in Sources */,
A361E7761EB0C33D00646005 /* RNSVGPath.m in Sources */,
@@ -801,6 +718,7 @@
9494C53B1F4C44DD00D5BCFD /* FontVariantLigatures.m in Sources */,
9494C5001F4B5BE800D5BCFD /* FontData.m in Sources */,
9494C5491F4C44DD00D5BCFD /* TextPathSpacing.m in Sources */,
94EB936D1FF4916F00C0B251 /* BezierElement.m in Sources */,
A361E78D1EB0C33D00646005 /* RNSVGLineManager.m in Sources */,
9494C53D1F4C44DD00D5BCFD /* TextAnchor.m in Sources */,
9494C5471F4C44DD00D5BCFD /* TextPathSide.m in Sources */,