Update all things!

Merge branch 'feature/primitiveExportTypes'
Added convenience method in
2019-12-12 08:09:08 +00:00 · 2019-12-12 08:07:05 +00:00 · 2019-12-11 15:47:12 +00:00 · 2019-12-11 13:22:16 +00:00 · 2019-12-10 22:25:21 +00:00 · 2019-12-06 12:03:44 +00:00
115 changed files with 798 additions and 509 deletions
@@ -133,119 +133,119 @@
 		594CF560238FF46C009B251B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		594CF562238FF473009B251B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		599EB4D2238FF535004CB6BC /* libobjc.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libobjc.tbd; path = usr/lib/libobjc.tbd; sourceTree = SDKROOT; };
-		59EB756523905F6B00F5AE63 /* IJSVGLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGLayer.h; path = ../../../../source/IJSVGLayer.h; sourceTree = "<group>"; };
-		59EB756623905F6B00F5AE63 /* IJSVGGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGGradientLayer.h; path = ../../../../source/IJSVGGradientLayer.h; sourceTree = "<group>"; };
-		59EB756723905F6B00F5AE63 /* IJSVGStyleSheetRule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStyleSheetRule.m; path = ../../../../source/IJSVGStyleSheetRule.m; sourceTree = "<group>"; };
-		59EB756823905F6B00F5AE63 /* IJSVGCommandLineTo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandLineTo.h; path = ../../../../source/IJSVGCommandLineTo.h; sourceTree = "<group>"; };
-		59EB756923905F6B00F5AE63 /* IJSVGDef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGDef.m; path = ../../../../source/IJSVGDef.m; sourceTree = "<group>"; };
-		59EB756A23905F6B00F5AE63 /* IJSVG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVG.h; path = ../../../../source/IJSVG.h; sourceTree = "<group>"; };
-		59EB756B23905F6B00F5AE63 /* IJSVGText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGText.h; path = ../../../../source/IJSVGText.h; sourceTree = "<group>"; };
-		59EB756C23905F6B00F5AE63 /* IJSVGCommandQuadraticCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandQuadraticCurve.m; path = ../../../../source/IJSVGCommandQuadraticCurve.m; sourceTree = "<group>"; };
-		59EB756D23905F6C00F5AE63 /* IJSVGCommandVerticalLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandVerticalLine.h; path = ../../../../source/IJSVGCommandVerticalLine.h; sourceTree = "<group>"; };
-		59EB756E23905F6C00F5AE63 /* IJSVGWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGWriter.h; path = ../../../../source/IJSVGWriter.h; sourceTree = "<group>"; };
-		59EB756F23905F6C00F5AE63 /* IJSVGStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStyleSheet.h; path = ../../../../source/IJSVGStyleSheet.h; sourceTree = "<group>"; };
-		59EB757023905F6C00F5AE63 /* IJSVGCommandSmoothCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandSmoothCurve.h; path = ../../../../source/IJSVGCommandSmoothCurve.h; sourceTree = "<group>"; };
-		59EB757123905F6C00F5AE63 /* IJSVGColorList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGColorList.m; path = ../../../../source/IJSVGColorList.m; sourceTree = "<group>"; };
-		59EB757223905F6C00F5AE63 /* IJSVGRadialGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGRadialGradient.h; path = ../../../../source/IJSVGRadialGradient.h; sourceTree = "<group>"; };
-		59EB757323905F6C00F5AE63 /* IJSVGGradientUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGGradientUnitLength.h; path = ../../../../source/IJSVGGradientUnitLength.h; sourceTree = "<group>"; };
-		59EB757423905F6C00F5AE63 /* IJSVGStrokeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStrokeLayer.m; path = ../../../../source/IJSVGStrokeLayer.m; sourceTree = "<group>"; };
-		59EB757523905F6C00F5AE63 /* IJSVGStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStyle.m; path = ../../../../source/IJSVGStyle.m; sourceTree = "<group>"; };
-		59EB757623905F6C00F5AE63 /* IJSVGImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGImage.m; path = ../../../../source/IJSVGImage.m; sourceTree = "<group>"; };
-		59EB757723905F6C00F5AE63 /* IJSVGUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGUnitLength.h; path = ../../../../source/IJSVGUnitLength.h; sourceTree = "<group>"; };
-		59EB757823905F6C00F5AE63 /* IJSVGStringAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStringAdditions.m; path = ../../../../source/IJSVGStringAdditions.m; sourceTree = "<group>"; };
-		59EB757923905F6C00F5AE63 /* IJSVGTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGTransaction.h; path = ../../../../source/IJSVGTransaction.h; sourceTree = "<group>"; };
-		59EB757A23905F6C00F5AE63 /* IJSVGShapeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGShapeLayer.m; path = ../../../../source/IJSVGShapeLayer.m; sourceTree = "<group>"; };
-		59EB757B23905F6C00F5AE63 /* IJSVGLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGLayer.m; path = ../../../../source/IJSVGLayer.m; sourceTree = "<group>"; };
-		59EB757C23905F6C00F5AE63 /* IJSVGFontConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGFontConverter.m; path = ../../../../source/IJSVGFontConverter.m; sourceTree = "<group>"; };
-		59EB757D23905F6C00F5AE63 /* IJSVGImageRep.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGImageRep.m; path = ../../../../source/IJSVGImageRep.m; sourceTree = "<group>"; };
-		59EB757E23905F6C00F5AE63 /* IJSVGCommandQuadraticCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandQuadraticCurve.h; path = ../../../../source/IJSVGCommandQuadraticCurve.h; sourceTree = "<group>"; };
-		59EB757F23905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStyleSheetSelectorRaw.h; path = ../../../../source/IJSVGStyleSheetSelectorRaw.h; sourceTree = "<group>"; };
-		59EB758023905F6C00F5AE63 /* IJSVGUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGUtils.m; path = ../../../../source/IJSVGUtils.m; sourceTree = "<group>"; };
-		59EB758123905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStyleSheetSelectorRaw.m; path = ../../../../source/IJSVGStyleSheetSelectorRaw.m; sourceTree = "<group>"; };
-		59EB758223905F6C00F5AE63 /* IJSVGGroupLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGGroupLayer.m; path = ../../../../source/IJSVGGroupLayer.m; sourceTree = "<group>"; };
-		59EB758323905F6C00F5AE63 /* IJSVGColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGColor.h; path = ../../../../source/IJSVGColor.h; sourceTree = "<group>"; };
-		59EB758423905F6C00F5AE63 /* IJSVGError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGError.h; path = ../../../../source/IJSVGError.h; sourceTree = "<group>"; };
-		59EB758523905F6C00F5AE63 /* IJSVGColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGColor.m; path = ../../../../source/IJSVGColor.m; sourceTree = "<group>"; };
-		59EB758623905F6C00F5AE63 /* IJSVGDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGDef.h; path = ../../../../source/IJSVGDef.h; sourceTree = "<group>"; };
-		59EB758723905F6C00F5AE63 /* IJSVGCommandHorizontalLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandHorizontalLine.m; path = ../../../../source/IJSVGCommandHorizontalLine.m; sourceTree = "<group>"; };
-		59EB758823905F6D00F5AE63 /* IJSVGFontConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGFontConverter.h; path = ../../../../source/IJSVGFontConverter.h; sourceTree = "<group>"; };
-		59EB758923905F6D00F5AE63 /* IJSVGWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGWriter.m; path = ../../../../source/IJSVGWriter.m; sourceTree = "<group>"; };
-		59EB758A23905F6D00F5AE63 /* IJSVGPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGPath.m; path = ../../../../source/IJSVGPath.m; sourceTree = "<group>"; };
-		59EB758B23905F6D00F5AE63 /* IJSVGGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGGroup.h; path = ../../../../source/IJSVGGroup.h; sourceTree = "<group>"; };
-		59EB758C23905F6D00F5AE63 /* IJSVGPatternLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGPatternLayer.m; path = ../../../../source/IJSVGPatternLayer.m; sourceTree = "<group>"; };
-		59EB758D23905F6D00F5AE63 /* IJSVGRenderingStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGRenderingStyle.m; path = ../../../../source/IJSVGRenderingStyle.m; sourceTree = "<group>"; };
-		59EB758E23905F6D00F5AE63 /* IJSVGBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGBezierPathAdditions.m; path = ../../../../source/IJSVGBezierPathAdditions.m; sourceTree = "<group>"; };
-		59EB758F23905F6D00F5AE63 /* IJSVGGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGGradientLayer.m; path = ../../../../source/IJSVGGradientLayer.m; sourceTree = "<group>"; };
-		59EB759023905F6D00F5AE63 /* IJSVGLayerTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGLayerTree.m; path = ../../../../source/IJSVGLayerTree.m; sourceTree = "<group>"; };
-		59EB759123905F6D00F5AE63 /* IJSVGCommandVerticalLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandVerticalLine.m; path = ../../../../source/IJSVGCommandVerticalLine.m; sourceTree = "<group>"; };
-		59EB759223905F6D00F5AE63 /* IJSVGNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGNode.h; path = ../../../../source/IJSVGNode.h; sourceTree = "<group>"; };
-		59EB759323905F6D00F5AE63 /* IJSVGCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCache.m; path = ../../../../source/IJSVGCache.m; sourceTree = "<group>"; };
-		59EB759423905F6D00F5AE63 /* IJSVGUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGUtils.h; path = ../../../../source/IJSVGUtils.h; sourceTree = "<group>"; };
-		59EB759523905F6D00F5AE63 /* IJSVGCommandHorizontalLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandHorizontalLine.h; path = ../../../../source/IJSVGCommandHorizontalLine.h; sourceTree = "<group>"; };
-		59EB759623905F6D00F5AE63 /* IJSVGNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGNode.m; path = ../../../../source/IJSVGNode.m; sourceTree = "<group>"; };
-		59EB759723905F6D00F5AE63 /* IJSVGShapeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGShapeLayer.h; path = ../../../../source/IJSVGShapeLayer.h; sourceTree = "<group>"; };
-		59EB759823905F6E00F5AE63 /* IJSVGCommandCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandCurve.m; path = ../../../../source/IJSVGCommandCurve.m; sourceTree = "<group>"; };
-		59EB759923905F6E00F5AE63 /* IJSVGCommandMove.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandMove.m; path = ../../../../source/IJSVGCommandMove.m; sourceTree = "<group>"; };
-		59EB759A23905F6E00F5AE63 /* IJSVGStyleSheetSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStyleSheetSelector.h; path = ../../../../source/IJSVGStyleSheetSelector.h; sourceTree = "<group>"; };
-		59EB759B23905F6E00F5AE63 /* IJSVGStyleSheetRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStyleSheetRule.h; path = ../../../../source/IJSVGStyleSheetRule.h; sourceTree = "<group>"; };
-		59EB759C23905F6E00F5AE63 /* IJSVGCommandCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandCurve.h; path = ../../../../source/IJSVGCommandCurve.h; sourceTree = "<group>"; };
-		59EB759D23905F6E00F5AE63 /* IJSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGPath.h; path = ../../../../source/IJSVGPath.h; sourceTree = "<group>"; };
-		59EB759E23905F6E00F5AE63 /* IJSVGCommandEllipticalArc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandEllipticalArc.h; path = ../../../../source/IJSVGCommandEllipticalArc.h; sourceTree = "<group>"; };
-		59EB759F23905F6E00F5AE63 /* IJSVGLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGLinearGradient.h; path = ../../../../source/IJSVGLinearGradient.h; sourceTree = "<group>"; };
-		59EB75A023905F6E00F5AE63 /* IJSVGCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommand.m; path = ../../../../source/IJSVGCommand.m; sourceTree = "<group>"; };
-		59EB75A123905F6E00F5AE63 /* IJSVGRenderingStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGRenderingStyle.h; path = ../../../../source/IJSVGRenderingStyle.h; sourceTree = "<group>"; };
-		59EB75A223905F6E00F5AE63 /* IJSVG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVG.m; path = ../../../../source/IJSVG.m; sourceTree = "<group>"; };
-		59EB75A323905F6E00F5AE63 /* IJSVGImageRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGImageRep.h; path = ../../../../source/IJSVGImageRep.h; sourceTree = "<group>"; };
-		59EB75A423905F6E00F5AE63 /* IJSVGStrokeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStrokeLayer.h; path = ../../../../source/IJSVGStrokeLayer.h; sourceTree = "<group>"; };
-		59EB75A523905F6E00F5AE63 /* IJSVGParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGParser.m; path = ../../../../source/IJSVGParser.m; sourceTree = "<group>"; };
-		59EB75A623905F6F00F5AE63 /* IJSVGRadialGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGRadialGradient.m; path = ../../../../source/IJSVGRadialGradient.m; sourceTree = "<group>"; };
-		59EB75A723905F6F00F5AE63 /* IJSVGParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGParser.h; path = ../../../../source/IJSVGParser.h; sourceTree = "<group>"; };
-		59EB75A823905F6F00F5AE63 /* IJSVGCommandSmoothCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandSmoothCurve.m; path = ../../../../source/IJSVGCommandSmoothCurve.m; sourceTree = "<group>"; };
-		59EB75A923905F6F00F5AE63 /* IJSVGColorList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGColorList.h; path = ../../../../source/IJSVGColorList.h; sourceTree = "<group>"; };
-		59EB75AA23905F6F00F5AE63 /* IJSVGPattern.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGPattern.m; path = ../../../../source/IJSVGPattern.m; sourceTree = "<group>"; };
-		59EB75AB23905F6F00F5AE63 /* IJSVGGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGGradient.h; path = ../../../../source/IJSVGGradient.h; sourceTree = "<group>"; };
-		59EB75AC23905F6F00F5AE63 /* IJSVGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStyle.h; path = ../../../../source/IJSVGStyle.h; sourceTree = "<group>"; };
-		59EB75AD23905F6F00F5AE63 /* IJSVGGroupLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGGroupLayer.h; path = ../../../../source/IJSVGGroupLayer.h; sourceTree = "<group>"; };
-		59EB75AE23905F6F00F5AE63 /* IJSVGCommandLineTo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandLineTo.m; path = ../../../../source/IJSVGCommandLineTo.m; sourceTree = "<group>"; };
-		59EB75AF23905F6F00F5AE63 /* IJSVGCommandMove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandMove.h; path = ../../../../source/IJSVGCommandMove.h; sourceTree = "<group>"; };
-		59EB75B023905F6F00F5AE63 /* IJSVGTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGTransform.h; path = ../../../../source/IJSVGTransform.h; sourceTree = "<group>"; };
-		59EB75B123905F6F00F5AE63 /* IJSVGMath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGMath.m; path = ../../../../source/IJSVGMath.m; sourceTree = "<group>"; };
-		59EB75B223905F6F00F5AE63 /* IJSVGExporterPathInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGExporterPathInstruction.h; path = ../../../../source/IJSVGExporterPathInstruction.h; sourceTree = "<group>"; };
-		59EB75B323905F6F00F5AE63 /* IJSVGTransaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGTransaction.m; path = ../../../../source/IJSVGTransaction.m; sourceTree = "<group>"; };
-		59EB75B423905F6F00F5AE63 /* IJSVGTransform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGTransform.m; path = ../../../../source/IJSVGTransform.m; sourceTree = "<group>"; };
-		59EB75B523905F7000F5AE63 /* IJSVGImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGImage.h; path = ../../../../source/IJSVGImage.h; sourceTree = "<group>"; };
-		59EB75B623905F7000F5AE63 /* IJSVGMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGMath.h; path = ../../../../source/IJSVGMath.h; sourceTree = "<group>"; };
-		59EB75B723905F7000F5AE63 /* IJSVGCommandClose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandClose.h; path = ../../../../source/IJSVGCommandClose.h; sourceTree = "<group>"; };
-		59EB75B823905F7000F5AE63 /* IJSVGStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGStringAdditions.h; path = ../../../../source/IJSVGStringAdditions.h; sourceTree = "<group>"; };
-		59EB75B923905F7000F5AE63 /* IJSVGGradientUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGGradientUnitLength.m; path = ../../../../source/IJSVGGradientUnitLength.m; sourceTree = "<group>"; };
-		59EB75BA23905F7000F5AE63 /* IJSVGUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGUnitLength.m; path = ../../../../source/IJSVGUnitLength.m; sourceTree = "<group>"; };
-		59EB75BB23905F7000F5AE63 /* IJSVGPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGPattern.h; path = ../../../../source/IJSVGPattern.h; sourceTree = "<group>"; };
-		59EB75BC23905F7000F5AE63 /* IJSVGLayerTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGLayerTree.h; path = ../../../../source/IJSVGLayerTree.h; sourceTree = "<group>"; };
-		59EB75BD23905F7000F5AE63 /* IJSVGExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGExporter.m; path = ../../../../source/IJSVGExporter.m; sourceTree = "<group>"; };
-		59EB75BE23905F7000F5AE63 /* IJSVGCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCache.h; path = ../../../../source/IJSVGCache.h; sourceTree = "<group>"; };
-		59EB75BF23905F7000F5AE63 /* IJSVGPatternLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGPatternLayer.h; path = ../../../../source/IJSVGPatternLayer.h; sourceTree = "<group>"; };
-		59EB75C023905F7100F5AE63 /* IJSVGText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGText.m; path = ../../../../source/IJSVGText.m; sourceTree = "<group>"; };
-		59EB75C123905F7100F5AE63 /* IJSVGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGView.m; path = ../../../../source/IJSVGView.m; sourceTree = "<group>"; };
-		59EB75C223905F7100F5AE63 /* IJSVGLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGLinearGradient.m; path = ../../../../source/IJSVGLinearGradient.m; sourceTree = "<group>"; };
-		59EB75C323905F7100F5AE63 /* IJSVGBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGBezierPathAdditions.h; path = ../../../../source/IJSVGBezierPathAdditions.h; sourceTree = "<group>"; };
-		59EB75C423905F7100F5AE63 /* IJSVGStyleSheetSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStyleSheetSelector.m; path = ../../../../source/IJSVGStyleSheetSelector.m; sourceTree = "<group>"; };
-		59EB75C523905F7100F5AE63 /* IJSVGImageLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGImageLayer.m; path = ../../../../source/IJSVGImageLayer.m; sourceTree = "<group>"; };
-		59EB75C623905F7100F5AE63 /* IJSVGCommandClose.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandClose.m; path = ../../../../source/IJSVGCommandClose.m; sourceTree = "<group>"; };
-		59EB75C723905F7100F5AE63 /* IJSVGCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommand.h; path = ../../../../source/IJSVGCommand.h; sourceTree = "<group>"; };
-		59EB75C823905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandSmoothQuadraticCurve.m; path = ../../../../source/IJSVGCommandSmoothQuadraticCurve.m; sourceTree = "<group>"; };
-		59EB75C923905F7200F5AE63 /* IJSVGForeignObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGForeignObject.m; path = ../../../../source/IJSVGForeignObject.m; sourceTree = "<group>"; };
-		59EB75CA23905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGCommandSmoothQuadraticCurve.h; path = ../../../../source/IJSVGCommandSmoothQuadraticCurve.h; sourceTree = "<group>"; };
-		59EB75CB23905F7200F5AE63 /* IJSVGCommandEllipticalArc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGCommandEllipticalArc.m; path = ../../../../source/IJSVGCommandEllipticalArc.m; sourceTree = "<group>"; };
-		59EB75CC23905F7200F5AE63 /* IJSVGGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGGroup.m; path = ../../../../source/IJSVGGroup.m; sourceTree = "<group>"; };
-		59EB75CD23905F7200F5AE63 /* IJSVGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGView.h; path = ../../../../source/IJSVGView.h; sourceTree = "<group>"; };
-		59EB75CE23905F7200F5AE63 /* IJSVGForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGForeignObject.h; path = ../../../../source/IJSVGForeignObject.h; sourceTree = "<group>"; };
-		59EB75CF23905F7200F5AE63 /* IJSVGExporterPathInstruction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGExporterPathInstruction.m; path = ../../../../source/IJSVGExporterPathInstruction.m; sourceTree = "<group>"; };
-		59EB75D023905F7200F5AE63 /* IJSVGImageLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGImageLayer.h; path = ../../../../source/IJSVGImageLayer.h; sourceTree = "<group>"; };
-		59EB75D123905F7300F5AE63 /* IJSVGStyleSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGStyleSheet.m; path = ../../../../source/IJSVGStyleSheet.m; sourceTree = "<group>"; };
-		59EB75D223905F7300F5AE63 /* IJSVGGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGGradient.m; path = ../../../../source/IJSVGGradient.m; sourceTree = "<group>"; };
-		59EB75D323905F7300F5AE63 /* IJSVGRendering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGRendering.h; path = ../../../../source/IJSVGRendering.h; sourceTree = "<group>"; };
-		59EB75D423905F7300F5AE63 /* IJSVGExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IJSVGExporter.h; path = ../../../../source/IJSVGExporter.h; sourceTree = "<group>"; };
-		59EB75D523905F7300F5AE63 /* IJSVGRendering.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IJSVGRendering.m; path = ../../../../source/IJSVGRendering.m; sourceTree = "<group>"; };
+		59EB756523905F6B00F5AE63 /* IJSVGLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGLayer.h; sourceTree = "<group>"; };
+		59EB756623905F6B00F5AE63 /* IJSVGGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGradientLayer.h; sourceTree = "<group>"; };
+		59EB756723905F6B00F5AE63 /* IJSVGStyleSheetRule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyleSheetRule.m; sourceTree = "<group>"; };
+		59EB756823905F6B00F5AE63 /* IJSVGCommandLineTo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandLineTo.h; sourceTree = "<group>"; };
+		59EB756923905F6B00F5AE63 /* IJSVGDef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGDef.m; sourceTree = "<group>"; };
+		59EB756A23905F6B00F5AE63 /* IJSVG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVG.h; sourceTree = "<group>"; };
+		59EB756B23905F6B00F5AE63 /* IJSVGText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGText.h; sourceTree = "<group>"; };
+		59EB756C23905F6B00F5AE63 /* IJSVGCommandQuadraticCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandQuadraticCurve.m; sourceTree = "<group>"; };
+		59EB756D23905F6C00F5AE63 /* IJSVGCommandVerticalLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandVerticalLine.h; sourceTree = "<group>"; };
+		59EB756E23905F6C00F5AE63 /* IJSVGWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGWriter.h; sourceTree = "<group>"; };
+		59EB756F23905F6C00F5AE63 /* IJSVGStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheet.h; sourceTree = "<group>"; };
+		59EB757023905F6C00F5AE63 /* IJSVGCommandSmoothCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandSmoothCurve.h; sourceTree = "<group>"; };
+		59EB757123905F6C00F5AE63 /* IJSVGColorList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGColorList.m; sourceTree = "<group>"; };
+		59EB757223905F6C00F5AE63 /* IJSVGRadialGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGRadialGradient.h; sourceTree = "<group>"; };
+		59EB757323905F6C00F5AE63 /* IJSVGGradientUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGradientUnitLength.h; sourceTree = "<group>"; };
+		59EB757423905F6C00F5AE63 /* IJSVGStrokeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStrokeLayer.m; sourceTree = "<group>"; };
+		59EB757523905F6C00F5AE63 /* IJSVGStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyle.m; sourceTree = "<group>"; };
+		59EB757623905F6C00F5AE63 /* IJSVGImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGImage.m; sourceTree = "<group>"; };
+		59EB757723905F6C00F5AE63 /* IJSVGUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGUnitLength.h; sourceTree = "<group>"; };
+		59EB757823905F6C00F5AE63 /* IJSVGStringAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStringAdditions.m; sourceTree = "<group>"; };
+		59EB757923905F6C00F5AE63 /* IJSVGTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGTransaction.h; sourceTree = "<group>"; };
+		59EB757A23905F6C00F5AE63 /* IJSVGShapeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGShapeLayer.m; sourceTree = "<group>"; };
+		59EB757B23905F6C00F5AE63 /* IJSVGLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGLayer.m; sourceTree = "<group>"; };
+		59EB757C23905F6C00F5AE63 /* IJSVGFontConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGFontConverter.m; sourceTree = "<group>"; };
+		59EB757D23905F6C00F5AE63 /* IJSVGImageRep.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGImageRep.m; sourceTree = "<group>"; };
+		59EB757E23905F6C00F5AE63 /* IJSVGCommandQuadraticCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandQuadraticCurve.h; sourceTree = "<group>"; };
+		59EB757F23905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheetSelectorRaw.h; sourceTree = "<group>"; };
+		59EB758023905F6C00F5AE63 /* IJSVGUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGUtils.m; sourceTree = "<group>"; };
+		59EB758123905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyleSheetSelectorRaw.m; sourceTree = "<group>"; };
+		59EB758223905F6C00F5AE63 /* IJSVGGroupLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGroupLayer.m; sourceTree = "<group>"; };
+		59EB758323905F6C00F5AE63 /* IJSVGColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGColor.h; sourceTree = "<group>"; };
+		59EB758423905F6C00F5AE63 /* IJSVGError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGError.h; sourceTree = "<group>"; };
+		59EB758523905F6C00F5AE63 /* IJSVGColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGColor.m; sourceTree = "<group>"; };
+		59EB758623905F6C00F5AE63 /* IJSVGDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGDef.h; sourceTree = "<group>"; };
+		59EB758723905F6C00F5AE63 /* IJSVGCommandHorizontalLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandHorizontalLine.m; sourceTree = "<group>"; };
+		59EB758823905F6D00F5AE63 /* IJSVGFontConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGFontConverter.h; sourceTree = "<group>"; };
+		59EB758923905F6D00F5AE63 /* IJSVGWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGWriter.m; sourceTree = "<group>"; };
+		59EB758A23905F6D00F5AE63 /* IJSVGPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGPath.m; sourceTree = "<group>"; };
+		59EB758B23905F6D00F5AE63 /* IJSVGGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGroup.h; sourceTree = "<group>"; };
+		59EB758C23905F6D00F5AE63 /* IJSVGPatternLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGPatternLayer.m; sourceTree = "<group>"; };
+		59EB758D23905F6D00F5AE63 /* IJSVGRenderingStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGRenderingStyle.m; sourceTree = "<group>"; };
+		59EB758E23905F6D00F5AE63 /* IJSVGBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGBezierPathAdditions.m; sourceTree = "<group>"; };
+		59EB758F23905F6D00F5AE63 /* IJSVGGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGradientLayer.m; sourceTree = "<group>"; };
+		59EB759023905F6D00F5AE63 /* IJSVGLayerTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGLayerTree.m; sourceTree = "<group>"; };
+		59EB759123905F6D00F5AE63 /* IJSVGCommandVerticalLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandVerticalLine.m; sourceTree = "<group>"; };
+		59EB759223905F6D00F5AE63 /* IJSVGNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGNode.h; sourceTree = "<group>"; };
+		59EB759323905F6D00F5AE63 /* IJSVGCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCache.m; sourceTree = "<group>"; };
+		59EB759423905F6D00F5AE63 /* IJSVGUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGUtils.h; sourceTree = "<group>"; };
+		59EB759523905F6D00F5AE63 /* IJSVGCommandHorizontalLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandHorizontalLine.h; sourceTree = "<group>"; };
+		59EB759623905F6D00F5AE63 /* IJSVGNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGNode.m; sourceTree = "<group>"; };
+		59EB759723905F6D00F5AE63 /* IJSVGShapeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGShapeLayer.h; sourceTree = "<group>"; };
+		59EB759823905F6E00F5AE63 /* IJSVGCommandCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandCurve.m; sourceTree = "<group>"; };
+		59EB759923905F6E00F5AE63 /* IJSVGCommandMove.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandMove.m; sourceTree = "<group>"; };
+		59EB759A23905F6E00F5AE63 /* IJSVGStyleSheetSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheetSelector.h; sourceTree = "<group>"; };
+		59EB759B23905F6E00F5AE63 /* IJSVGStyleSheetRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheetRule.h; sourceTree = "<group>"; };
+		59EB759C23905F6E00F5AE63 /* IJSVGCommandCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandCurve.h; sourceTree = "<group>"; };
+		59EB759D23905F6E00F5AE63 /* IJSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGPath.h; sourceTree = "<group>"; };
+		59EB759E23905F6E00F5AE63 /* IJSVGCommandEllipticalArc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandEllipticalArc.h; sourceTree = "<group>"; };
+		59EB759F23905F6E00F5AE63 /* IJSVGLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGLinearGradient.h; sourceTree = "<group>"; };
+		59EB75A023905F6E00F5AE63 /* IJSVGCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommand.m; sourceTree = "<group>"; };
+		59EB75A123905F6E00F5AE63 /* IJSVGRenderingStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGRenderingStyle.h; sourceTree = "<group>"; };
+		59EB75A223905F6E00F5AE63 /* IJSVG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVG.m; sourceTree = "<group>"; };
+		59EB75A323905F6E00F5AE63 /* IJSVGImageRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGImageRep.h; sourceTree = "<group>"; };
+		59EB75A423905F6E00F5AE63 /* IJSVGStrokeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStrokeLayer.h; sourceTree = "<group>"; };
+		59EB75A523905F6E00F5AE63 /* IJSVGParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGParser.m; sourceTree = "<group>"; };
+		59EB75A623905F6F00F5AE63 /* IJSVGRadialGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGRadialGradient.m; sourceTree = "<group>"; };
+		59EB75A723905F6F00F5AE63 /* IJSVGParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGParser.h; sourceTree = "<group>"; };
+		59EB75A823905F6F00F5AE63 /* IJSVGCommandSmoothCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandSmoothCurve.m; sourceTree = "<group>"; };
+		59EB75A923905F6F00F5AE63 /* IJSVGColorList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGColorList.h; sourceTree = "<group>"; };
+		59EB75AA23905F6F00F5AE63 /* IJSVGPattern.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGPattern.m; sourceTree = "<group>"; };
+		59EB75AB23905F6F00F5AE63 /* IJSVGGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGradient.h; sourceTree = "<group>"; };
+		59EB75AC23905F6F00F5AE63 /* IJSVGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyle.h; sourceTree = "<group>"; };
+		59EB75AD23905F6F00F5AE63 /* IJSVGGroupLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGroupLayer.h; sourceTree = "<group>"; };
+		59EB75AE23905F6F00F5AE63 /* IJSVGCommandLineTo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandLineTo.m; sourceTree = "<group>"; };
+		59EB75AF23905F6F00F5AE63 /* IJSVGCommandMove.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandMove.h; sourceTree = "<group>"; };
+		59EB75B023905F6F00F5AE63 /* IJSVGTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGTransform.h; sourceTree = "<group>"; };
+		59EB75B123905F6F00F5AE63 /* IJSVGMath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGMath.m; sourceTree = "<group>"; };
+		59EB75B223905F6F00F5AE63 /* IJSVGExporterPathInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGExporterPathInstruction.h; sourceTree = "<group>"; };
+		59EB75B323905F6F00F5AE63 /* IJSVGTransaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGTransaction.m; sourceTree = "<group>"; };
+		59EB75B423905F6F00F5AE63 /* IJSVGTransform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGTransform.m; sourceTree = "<group>"; };
+		59EB75B523905F7000F5AE63 /* IJSVGImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGImage.h; sourceTree = "<group>"; };
+		59EB75B623905F7000F5AE63 /* IJSVGMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGMath.h; sourceTree = "<group>"; };
+		59EB75B723905F7000F5AE63 /* IJSVGCommandClose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandClose.h; sourceTree = "<group>"; };
+		59EB75B823905F7000F5AE63 /* IJSVGStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStringAdditions.h; sourceTree = "<group>"; };
+		59EB75B923905F7000F5AE63 /* IJSVGGradientUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGradientUnitLength.m; sourceTree = "<group>"; };
+		59EB75BA23905F7000F5AE63 /* IJSVGUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGUnitLength.m; sourceTree = "<group>"; };
+		59EB75BB23905F7000F5AE63 /* IJSVGPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGPattern.h; sourceTree = "<group>"; };
+		59EB75BC23905F7000F5AE63 /* IJSVGLayerTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGLayerTree.h; sourceTree = "<group>"; };
+		59EB75BD23905F7000F5AE63 /* IJSVGExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGExporter.m; sourceTree = "<group>"; };
+		59EB75BE23905F7000F5AE63 /* IJSVGCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCache.h; sourceTree = "<group>"; };
+		59EB75BF23905F7000F5AE63 /* IJSVGPatternLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGPatternLayer.h; sourceTree = "<group>"; };
+		59EB75C023905F7100F5AE63 /* IJSVGText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGText.m; sourceTree = "<group>"; };
+		59EB75C123905F7100F5AE63 /* IJSVGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGView.m; sourceTree = "<group>"; };
+		59EB75C223905F7100F5AE63 /* IJSVGLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGLinearGradient.m; sourceTree = "<group>"; };
+		59EB75C323905F7100F5AE63 /* IJSVGBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGBezierPathAdditions.h; sourceTree = "<group>"; };
+		59EB75C423905F7100F5AE63 /* IJSVGStyleSheetSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyleSheetSelector.m; sourceTree = "<group>"; };
+		59EB75C523905F7100F5AE63 /* IJSVGImageLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGImageLayer.m; sourceTree = "<group>"; };
+		59EB75C623905F7100F5AE63 /* IJSVGCommandClose.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandClose.m; sourceTree = "<group>"; };
+		59EB75C723905F7100F5AE63 /* IJSVGCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommand.h; sourceTree = "<group>"; };
+		59EB75C823905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandSmoothQuadraticCurve.m; sourceTree = "<group>"; };
+		59EB75C923905F7200F5AE63 /* IJSVGForeignObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGForeignObject.m; sourceTree = "<group>"; };
+		59EB75CA23905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGCommandSmoothQuadraticCurve.h; sourceTree = "<group>"; };
+		59EB75CB23905F7200F5AE63 /* IJSVGCommandEllipticalArc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGCommandEllipticalArc.m; sourceTree = "<group>"; };
+		59EB75CC23905F7200F5AE63 /* IJSVGGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGroup.m; sourceTree = "<group>"; };
+		59EB75CD23905F7200F5AE63 /* IJSVGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGView.h; sourceTree = "<group>"; };
+		59EB75CE23905F7200F5AE63 /* IJSVGForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGForeignObject.h; sourceTree = "<group>"; };
+		59EB75CF23905F7200F5AE63 /* IJSVGExporterPathInstruction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGExporterPathInstruction.m; sourceTree = "<group>"; };
+		59EB75D023905F7200F5AE63 /* IJSVGImageLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGImageLayer.h; sourceTree = "<group>"; };
+		59EB75D123905F7300F5AE63 /* IJSVGStyleSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyleSheet.m; sourceTree = "<group>"; };
+		59EB75D223905F7300F5AE63 /* IJSVGGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGradient.m; sourceTree = "<group>"; };
+		59EB75D323905F7300F5AE63 /* IJSVGRendering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGRendering.h; sourceTree = "<group>"; };
+		59EB75D423905F7300F5AE63 /* IJSVGExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGExporter.h; sourceTree = "<group>"; };
+		59EB75D523905F7300F5AE63 /* IJSVGRendering.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGRendering.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -263,6 +263,176 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		592ABBE223979F9B00F44380 /* Commands */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75C723905F7100F5AE63 /* IJSVGCommand.h */,
+				59EB75A023905F6E00F5AE63 /* IJSVGCommand.m */,
+				59EB75B723905F7000F5AE63 /* IJSVGCommandClose.h */,
+				59EB75C623905F7100F5AE63 /* IJSVGCommandClose.m */,
+				59EB759C23905F6E00F5AE63 /* IJSVGCommandCurve.h */,
+				59EB759823905F6E00F5AE63 /* IJSVGCommandCurve.m */,
+				59EB759E23905F6E00F5AE63 /* IJSVGCommandEllipticalArc.h */,
+				59EB75CB23905F7200F5AE63 /* IJSVGCommandEllipticalArc.m */,
+				59EB759523905F6D00F5AE63 /* IJSVGCommandHorizontalLine.h */,
+				59EB758723905F6C00F5AE63 /* IJSVGCommandHorizontalLine.m */,
+				59EB756823905F6B00F5AE63 /* IJSVGCommandLineTo.h */,
+				59EB75AE23905F6F00F5AE63 /* IJSVGCommandLineTo.m */,
+				59EB75AF23905F6F00F5AE63 /* IJSVGCommandMove.h */,
+				59EB759923905F6E00F5AE63 /* IJSVGCommandMove.m */,
+				59EB757E23905F6C00F5AE63 /* IJSVGCommandQuadraticCurve.h */,
+				59EB756C23905F6B00F5AE63 /* IJSVGCommandQuadraticCurve.m */,
+				59EB757023905F6C00F5AE63 /* IJSVGCommandSmoothCurve.h */,
+				59EB75A823905F6F00F5AE63 /* IJSVGCommandSmoothCurve.m */,
+				59EB75CA23905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h */,
+				59EB75C823905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m */,
+				59EB756D23905F6C00F5AE63 /* IJSVGCommandVerticalLine.h */,
+				59EB759123905F6D00F5AE63 /* IJSVGCommandVerticalLine.m */,
+			);
+			path = Commands;
+			sourceTree = "<group>";
+		};
+		592ABBE323979FBB00F44380 /* Stylesheets */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75AC23905F6F00F5AE63 /* IJSVGStyle.h */,
+				59EB757523905F6C00F5AE63 /* IJSVGStyle.m */,
+				59EB756F23905F6C00F5AE63 /* IJSVGStyleSheet.h */,
+				59EB75D123905F7300F5AE63 /* IJSVGStyleSheet.m */,
+				59EB759B23905F6E00F5AE63 /* IJSVGStyleSheetRule.h */,
+				59EB756723905F6B00F5AE63 /* IJSVGStyleSheetRule.m */,
+				59EB759A23905F6E00F5AE63 /* IJSVGStyleSheetSelector.h */,
+				59EB75C423905F7100F5AE63 /* IJSVGStyleSheetSelector.m */,
+				59EB757F23905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.h */,
+				59EB758123905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.m */,
+			);
+			path = Stylesheets;
+			sourceTree = "<group>";
+		};
+		592ABBE423979FD200F44380 /* Colors */ = {
+			isa = PBXGroup;
+			children = (
+				59EB758323905F6C00F5AE63 /* IJSVGColor.h */,
+				59EB758523905F6C00F5AE63 /* IJSVGColor.m */,
+				59EB75A923905F6F00F5AE63 /* IJSVGColorList.h */,
+				59EB757123905F6C00F5AE63 /* IJSVGColorList.m */,
+			);
+			path = Colors;
+			sourceTree = "<group>";
+		};
+		592ABBE523979FE100F44380 /* Layers */ = {
+			isa = PBXGroup;
+			children = (
+				59EB756623905F6B00F5AE63 /* IJSVGGradientLayer.h */,
+				59EB758F23905F6D00F5AE63 /* IJSVGGradientLayer.m */,
+				59EB75AD23905F6F00F5AE63 /* IJSVGGroupLayer.h */,
+				59EB758223905F6C00F5AE63 /* IJSVGGroupLayer.m */,
+				59EB75D023905F7200F5AE63 /* IJSVGImageLayer.h */,
+				59EB75C523905F7100F5AE63 /* IJSVGImageLayer.m */,
+				59EB756523905F6B00F5AE63 /* IJSVGLayer.h */,
+				59EB757B23905F6C00F5AE63 /* IJSVGLayer.m */,
+				59EB75BF23905F7000F5AE63 /* IJSVGPatternLayer.h */,
+				59EB758C23905F6D00F5AE63 /* IJSVGPatternLayer.m */,
+				59EB757223905F6C00F5AE63 /* IJSVGRadialGradient.h */,
+				59EB75A623905F6F00F5AE63 /* IJSVGRadialGradient.m */,
+				59EB759723905F6D00F5AE63 /* IJSVGShapeLayer.h */,
+				59EB757A23905F6C00F5AE63 /* IJSVGShapeLayer.m */,
+				59EB75A423905F6E00F5AE63 /* IJSVGStrokeLayer.h */,
+				59EB757423905F6C00F5AE63 /* IJSVGStrokeLayer.m */,
+			);
+			path = Layers;
+			sourceTree = "<group>";
+		};
+		592ABBE62397A00C00F44380 /* Parsing */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75A723905F6F00F5AE63 /* IJSVGParser.h */,
+				59EB75A523905F6E00F5AE63 /* IJSVGParser.m */,
+			);
+			path = Parsing;
+			sourceTree = "<group>";
+		};
+		592ABBE72397A02900F44380 /* Nodes */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75CE23905F7200F5AE63 /* IJSVGForeignObject.h */,
+				59EB75C923905F7200F5AE63 /* IJSVGForeignObject.m */,
+				59EB758623905F6C00F5AE63 /* IJSVGDef.h */,
+				59EB756923905F6B00F5AE63 /* IJSVGDef.m */,
+				59EB759F23905F6E00F5AE63 /* IJSVGLinearGradient.h */,
+				59EB75C223905F7100F5AE63 /* IJSVGLinearGradient.m */,
+				59EB75AB23905F6F00F5AE63 /* IJSVGGradient.h */,
+				59EB75D223905F7300F5AE63 /* IJSVGGradient.m */,
+				59EB758B23905F6D00F5AE63 /* IJSVGGroup.h */,
+				59EB75CC23905F7200F5AE63 /* IJSVGGroup.m */,
+				59EB75B523905F7000F5AE63 /* IJSVGImage.h */,
+				59EB757623905F6C00F5AE63 /* IJSVGImage.m */,
+				59EB759223905F6D00F5AE63 /* IJSVGNode.h */,
+				59EB759623905F6D00F5AE63 /* IJSVGNode.m */,
+				59EB759D23905F6E00F5AE63 /* IJSVGPath.h */,
+				59EB758A23905F6D00F5AE63 /* IJSVGPath.m */,
+				59EB75BB23905F7000F5AE63 /* IJSVGPattern.h */,
+				59EB75AA23905F6F00F5AE63 /* IJSVGPattern.m */,
+				59EB756B23905F6B00F5AE63 /* IJSVGText.h */,
+				59EB75C023905F7100F5AE63 /* IJSVGText.m */,
+			);
+			path = Nodes;
+			sourceTree = "<group>";
+		};
+		592ABBE82397A06800F44380 /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				59EB757323905F6C00F5AE63 /* IJSVGGradientUnitLength.h */,
+				59EB75B923905F7000F5AE63 /* IJSVGGradientUnitLength.m */,
+				59EB75B623905F7000F5AE63 /* IJSVGMath.h */,
+				59EB75B123905F6F00F5AE63 /* IJSVGMath.m */,
+				59EB757923905F6C00F5AE63 /* IJSVGTransaction.h */,
+				59EB75B323905F6F00F5AE63 /* IJSVGTransaction.m */,
+				59EB75B023905F6F00F5AE63 /* IJSVGTransform.h */,
+				59EB75B423905F6F00F5AE63 /* IJSVGTransform.m */,
+				59EB757723905F6C00F5AE63 /* IJSVGUnitLength.h */,
+				59EB75BA23905F7000F5AE63 /* IJSVGUnitLength.m */,
+				59EB759423905F6D00F5AE63 /* IJSVGUtils.h */,
+				59EB758023905F6C00F5AE63 /* IJSVGUtils.m */,
+			);
+			path = Utils;
+			sourceTree = "<group>";
+		};
+		592ABBE92397A08500F44380 /* Exporter */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75D423905F7300F5AE63 /* IJSVGExporter.h */,
+				59EB75BD23905F7000F5AE63 /* IJSVGExporter.m */,
+				59EB75B223905F6F00F5AE63 /* IJSVGExporterPathInstruction.h */,
+				59EB75CF23905F7200F5AE63 /* IJSVGExporterPathInstruction.m */,
+			);
+			path = Exporter;
+			sourceTree = "<group>";
+		};
+		592ABBEA2397A10000F44380 /* Rendering */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75BC23905F7000F5AE63 /* IJSVGLayerTree.h */,
+				59EB759023905F6D00F5AE63 /* IJSVGLayerTree.m */,
+				59EB75D323905F7300F5AE63 /* IJSVGRendering.h */,
+				59EB75D523905F7300F5AE63 /* IJSVGRendering.m */,
+				59EB75A123905F6E00F5AE63 /* IJSVGRenderingStyle.h */,
+				59EB758D23905F6D00F5AE63 /* IJSVGRenderingStyle.m */,
+			);
+			path = Rendering;
+			sourceTree = "<group>";
+		};
+		592ABBEB2397A11800F44380 /* Additions */ = {
+			isa = PBXGroup;
+			children = (
+				59EB75C323905F7100F5AE63 /* IJSVGBezierPathAdditions.h */,
+				59EB758E23905F6D00F5AE63 /* IJSVGBezierPathAdditions.m */,
+				59EB75B823905F7000F5AE63 /* IJSVGStringAdditions.h */,
+				59EB757823905F6C00F5AE63 /* IJSVGStringAdditions.m */,
+			);
+			path = Additions;
+			sourceTree = "<group>";
+		};
 		594CF465238FF38E009B251B = {
 			isa = PBXGroup;
 			children = (
@@ -300,123 +470,41 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		59EB756423905F3100F5AE63 /* Source */ = {
+		59DD1FD123A22CFD00E28C56 /* Core */ = {
 			isa = PBXGroup;
 			children = (
 				59EB756A23905F6B00F5AE63 /* IJSVG.h */,
 				59EB75A223905F6E00F5AE63 /* IJSVG.m */,
-				59EB75C323905F7100F5AE63 /* IJSVGBezierPathAdditions.h */,
-				59EB758E23905F6D00F5AE63 /* IJSVGBezierPathAdditions.m */,
 				59EB75BE23905F7000F5AE63 /* IJSVGCache.h */,
 				59EB759323905F6D00F5AE63 /* IJSVGCache.m */,
-				59EB758323905F6C00F5AE63 /* IJSVGColor.h */,
-				59EB758523905F6C00F5AE63 /* IJSVGColor.m */,
-				59EB75A923905F6F00F5AE63 /* IJSVGColorList.h */,
-				59EB757123905F6C00F5AE63 /* IJSVGColorList.m */,
-				59EB75C723905F7100F5AE63 /* IJSVGCommand.h */,
-				59EB75A023905F6E00F5AE63 /* IJSVGCommand.m */,
-				59EB75B723905F7000F5AE63 /* IJSVGCommandClose.h */,
-				59EB75C623905F7100F5AE63 /* IJSVGCommandClose.m */,
-				59EB759C23905F6E00F5AE63 /* IJSVGCommandCurve.h */,
-				59EB759823905F6E00F5AE63 /* IJSVGCommandCurve.m */,
-				59EB759E23905F6E00F5AE63 /* IJSVGCommandEllipticalArc.h */,
-				59EB75CB23905F7200F5AE63 /* IJSVGCommandEllipticalArc.m */,
-				59EB759523905F6D00F5AE63 /* IJSVGCommandHorizontalLine.h */,
-				59EB758723905F6C00F5AE63 /* IJSVGCommandHorizontalLine.m */,
-				59EB756823905F6B00F5AE63 /* IJSVGCommandLineTo.h */,
-				59EB75AE23905F6F00F5AE63 /* IJSVGCommandLineTo.m */,
-				59EB75AF23905F6F00F5AE63 /* IJSVGCommandMove.h */,
-				59EB759923905F6E00F5AE63 /* IJSVGCommandMove.m */,
-				59EB757E23905F6C00F5AE63 /* IJSVGCommandQuadraticCurve.h */,
-				59EB756C23905F6B00F5AE63 /* IJSVGCommandQuadraticCurve.m */,
-				59EB757023905F6C00F5AE63 /* IJSVGCommandSmoothCurve.h */,
-				59EB75A823905F6F00F5AE63 /* IJSVGCommandSmoothCurve.m */,
-				59EB75CA23905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h */,
-				59EB75C823905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m */,
-				59EB756D23905F6C00F5AE63 /* IJSVGCommandVerticalLine.h */,
-				59EB759123905F6D00F5AE63 /* IJSVGCommandVerticalLine.m */,
-				59EB758623905F6C00F5AE63 /* IJSVGDef.h */,
-				59EB756923905F6B00F5AE63 /* IJSVGDef.m */,
 				59EB758423905F6C00F5AE63 /* IJSVGError.h */,
-				59EB75D423905F7300F5AE63 /* IJSVGExporter.h */,
-				59EB75BD23905F7000F5AE63 /* IJSVGExporter.m */,
-				59EB75B223905F6F00F5AE63 /* IJSVGExporterPathInstruction.h */,
-				59EB75CF23905F7200F5AE63 /* IJSVGExporterPathInstruction.m */,
 				59EB758823905F6D00F5AE63 /* IJSVGFontConverter.h */,
 				59EB757C23905F6C00F5AE63 /* IJSVGFontConverter.m */,
-				59EB75CE23905F7200F5AE63 /* IJSVGForeignObject.h */,
-				59EB75C923905F7200F5AE63 /* IJSVGForeignObject.m */,
-				59EB75AB23905F6F00F5AE63 /* IJSVGGradient.h */,
-				59EB75D223905F7300F5AE63 /* IJSVGGradient.m */,
-				59EB756623905F6B00F5AE63 /* IJSVGGradientLayer.h */,
-				59EB758F23905F6D00F5AE63 /* IJSVGGradientLayer.m */,
-				59EB757323905F6C00F5AE63 /* IJSVGGradientUnitLength.h */,
-				59EB75B923905F7000F5AE63 /* IJSVGGradientUnitLength.m */,
-				59EB758B23905F6D00F5AE63 /* IJSVGGroup.h */,
-				59EB75CC23905F7200F5AE63 /* IJSVGGroup.m */,
-				59EB75AD23905F6F00F5AE63 /* IJSVGGroupLayer.h */,
-				59EB758223905F6C00F5AE63 /* IJSVGGroupLayer.m */,
-				59EB75B523905F7000F5AE63 /* IJSVGImage.h */,
-				59EB757623905F6C00F5AE63 /* IJSVGImage.m */,
-				59EB75D023905F7200F5AE63 /* IJSVGImageLayer.h */,
-				59EB75C523905F7100F5AE63 /* IJSVGImageLayer.m */,
 				59EB75A323905F6E00F5AE63 /* IJSVGImageRep.h */,
 				59EB757D23905F6C00F5AE63 /* IJSVGImageRep.m */,
-				59EB756523905F6B00F5AE63 /* IJSVGLayer.h */,
-				59EB757B23905F6C00F5AE63 /* IJSVGLayer.m */,
-				59EB75BC23905F7000F5AE63 /* IJSVGLayerTree.h */,
-				59EB759023905F6D00F5AE63 /* IJSVGLayerTree.m */,
-				59EB759F23905F6E00F5AE63 /* IJSVGLinearGradient.h */,
-				59EB75C223905F7100F5AE63 /* IJSVGLinearGradient.m */,
-				59EB75B623905F7000F5AE63 /* IJSVGMath.h */,
-				59EB75B123905F6F00F5AE63 /* IJSVGMath.m */,
-				59EB759223905F6D00F5AE63 /* IJSVGNode.h */,
-				59EB759623905F6D00F5AE63 /* IJSVGNode.m */,
-				59EB75A723905F6F00F5AE63 /* IJSVGParser.h */,
-				59EB75A523905F6E00F5AE63 /* IJSVGParser.m */,
-				59EB759D23905F6E00F5AE63 /* IJSVGPath.h */,
-				59EB758A23905F6D00F5AE63 /* IJSVGPath.m */,
-				59EB75BB23905F7000F5AE63 /* IJSVGPattern.h */,
-				59EB75AA23905F6F00F5AE63 /* IJSVGPattern.m */,
-				59EB75BF23905F7000F5AE63 /* IJSVGPatternLayer.h */,
-				59EB758C23905F6D00F5AE63 /* IJSVGPatternLayer.m */,
-				59EB757223905F6C00F5AE63 /* IJSVGRadialGradient.h */,
-				59EB75A623905F6F00F5AE63 /* IJSVGRadialGradient.m */,
-				59EB75D323905F7300F5AE63 /* IJSVGRendering.h */,
-				59EB75D523905F7300F5AE63 /* IJSVGRendering.m */,
-				59EB75A123905F6E00F5AE63 /* IJSVGRenderingStyle.h */,
-				59EB758D23905F6D00F5AE63 /* IJSVGRenderingStyle.m */,
-				59EB759723905F6D00F5AE63 /* IJSVGShapeLayer.h */,
-				59EB757A23905F6C00F5AE63 /* IJSVGShapeLayer.m */,
-				59EB75B823905F7000F5AE63 /* IJSVGStringAdditions.h */,
-				59EB757823905F6C00F5AE63 /* IJSVGStringAdditions.m */,
-				59EB75A423905F6E00F5AE63 /* IJSVGStrokeLayer.h */,
-				59EB757423905F6C00F5AE63 /* IJSVGStrokeLayer.m */,
-				59EB75AC23905F6F00F5AE63 /* IJSVGStyle.h */,
-				59EB757523905F6C00F5AE63 /* IJSVGStyle.m */,
-				59EB756F23905F6C00F5AE63 /* IJSVGStyleSheet.h */,
-				59EB75D123905F7300F5AE63 /* IJSVGStyleSheet.m */,
-				59EB759B23905F6E00F5AE63 /* IJSVGStyleSheetRule.h */,
-				59EB756723905F6B00F5AE63 /* IJSVGStyleSheetRule.m */,
-				59EB759A23905F6E00F5AE63 /* IJSVGStyleSheetSelector.h */,
-				59EB75C423905F7100F5AE63 /* IJSVGStyleSheetSelector.m */,
-				59EB757F23905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.h */,
-				59EB758123905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.m */,
-				59EB756B23905F6B00F5AE63 /* IJSVGText.h */,
-				59EB75C023905F7100F5AE63 /* IJSVGText.m */,
-				59EB757923905F6C00F5AE63 /* IJSVGTransaction.h */,
-				59EB75B323905F6F00F5AE63 /* IJSVGTransaction.m */,
-				59EB75B023905F6F00F5AE63 /* IJSVGTransform.h */,
-				59EB75B423905F6F00F5AE63 /* IJSVGTransform.m */,
-				59EB757723905F6C00F5AE63 /* IJSVGUnitLength.h */,
-				59EB75BA23905F7000F5AE63 /* IJSVGUnitLength.m */,
-				59EB759423905F6D00F5AE63 /* IJSVGUtils.h */,
-				59EB758023905F6C00F5AE63 /* IJSVGUtils.m */,
 				59EB75CD23905F7200F5AE63 /* IJSVGView.h */,
 				59EB75C123905F7100F5AE63 /* IJSVGView.m */,
 				59EB756E23905F6C00F5AE63 /* IJSVGWriter.h */,
 				59EB758923905F6D00F5AE63 /* IJSVGWriter.m */,
 			);
+			path = Core;
+			sourceTree = "<group>";
+		};
+		59EB756423905F3100F5AE63 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				59DD1FD123A22CFD00E28C56 /* Core */,
+				592ABBEB2397A11800F44380 /* Additions */,
+				592ABBEA2397A10000F44380 /* Rendering */,
+				592ABBE92397A08500F44380 /* Exporter */,
+				592ABBE82397A06800F44380 /* Utils */,
+				592ABBE72397A02900F44380 /* Nodes */,
+				592ABBE62397A00C00F44380 /* Parsing */,
+				592ABBE523979FE100F44380 /* Layers */,
+				592ABBE423979FD200F44380 /* Colors */,
+				592ABBE323979FBB00F44380 /* Stylesheets */,
+				592ABBE223979F9B00F44380 /* Commands */,
+			);
 			path = Source;
 			sourceTree = "<group>";
 		};
@@ -7,7 +7,7 @@
 		<key>IJSVG.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
@@ -258,12 +258,13 @@ CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightnes
    }

    // is simply a clear color, dont fill
-    if ([[string lowercaseString] isEqualToString:@"none"]) {
+    if ([string.lowercaseString isEqualToString:@"none"] ||
+        [string.lowercaseString isEqualToString:@"transparent"]) {
        return [self computeColorSpace:NSColor.clearColor];
    }

    // is it RGB?
-    if ([[string substringToIndex:3] isEqualToString:@"rgb"]) {
+    if ([string hasPrefix:@"rgb"] == YES) {
        NSRange range = [IJSVGUtils rangeOfParentheses:string];
        NSString* rgbString = [string substringWithRange:range];
        NSArray* parts = [rgbString ijsvg_componentsSeparatedByChars:","];
@@ -278,7 +279,7 @@ CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightnes
    }

    // is it HSL?
-    if ([[string substringToIndex:3] isEqualToString:@"hsl"]) {
+    if ([string hasPrefix:@"hsl"]) {
        NSInteger count = 0;
        CGFloat* params = [IJSVGUtils commandParameters:string
                                                  count:&count];
@@ -309,7 +310,7 @@ CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightnes
 + (NSColor*)colorFromPredefinedColorName:(NSString*)name
 {
    NSNumber* hex = nil;
-    name = [name.lowercaseString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    name = [name.lowercaseString stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
    if ((hex = _colorTree[name]) == nil) {
        return nil;
    }
@@ -701,8 +702,7 @@ CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightnes

 + (BOOL)isColor:(NSString*)string
 {
-    return [[string substringToIndex:1] isEqualToString:@"#"] ||
-        [[string substringToIndex:3] isEqualToString:@"rgb"];
+    return [string hasPrefix:@"#"] || [string hasPrefix:@"rgb"];
 }

 + (BOOL)isHex:(NSString*)string
@@ -764,7 +764,7 @@ CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightnes
        return nil;
    }

-    if ([[string substringToIndex:1] isEqualToString:@"#"]) {
+    if ([string hasPrefix:@"#"] == YES) {
        string = [string substringFromIndex:1];
    }

@@ -12,8 +12,13 @@
 static const NSInteger IJSVGCustomVariableParameterCount = NSNotFound;

 typedef NS_ENUM(NSInteger, IJSVGCommandType) {
-    IJSVGCommandTypeAbsolute,
-    IJSVGCommandTypeRelative
+    kIJSVGCommandTypeAbsolute,
+    kIJSVGCommandTypeRelative
+};
+
+typedef NS_ENUM(NSUInteger, IJSVGPathDataSequence) {
+    kIJSVGPathDataSequenceTypeFloat,
+    kIJSVGPathDataSequenceTypeFlag
 };

@interface IJSVGCommand : NSObject {
@@ -21,7 +26,7 @@ typedef NS_ENUM(NSInteger, IJSVGCommandType) {
    NSString* command;
    CGFloat* parameters;
    NSInteger parameterCount;
-    NSMutableArray* subCommands;
+    NSArray<IJSVGCommand*>* subCommands;
    NSInteger requiredParameters;
    IJSVGCommandType type;
    IJSVGCommand* previousCommand;
@@ -35,7 +40,7 @@ typedef NS_ENUM(NSInteger, IJSVGCommandType) {
@property (nonatomic, assign) NSInteger parameterCount;
@property (nonatomic, assign) NSInteger requiredParameters;
@property (nonatomic, assign) IJSVGCommandType type;
-@property (nonatomic, retain) NSMutableArray<IJSVGCommand*>* subCommands;
+@property (nonatomic, retain) NSArray<IJSVGCommand*>* subCommands;
@property (nonatomic, assign) IJSVGCommand* previousCommand;
@property (nonatomic, assign) BOOL isSubCommand;

@@ -43,6 +48,7 @@ typedef NS_ENUM(NSInteger, IJSVGCommandType) {
 + (NSInteger)requiredParameterCount;
 + (NSPoint)readCoordinatePair:(CGFloat*)pairs
                        index:(NSInteger)index;
+ (IJSVGPathDataSequence*)pathDataSequence;
 + (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
              command:(IJSVGCommand*)currentCommand
@@ -42,6 +42,11 @@
    return 1;
 }

+ (IJSVGPathDataSequence*)pathDataSequence
+{
+    return NULL;
+}
+
 + (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
              command:(IJSVGCommand*)currentCommand
@@ -102,7 +107,9 @@
    (void)([commandString release]), commandString = nil;
    (void)([command release]), command = nil;
    (void)([subCommands release]), subCommands = nil;
-    (void)(free(parameters)), parameters = nil;
+    if (parameters) {
+        (void)(free(parameters)), parameters = nil;
+    }
    [super dealloc];
 }

@@ -113,43 +120,26 @@
        _currentIndex = 0;
        command = [[str substringToIndex:1] copy];
        type = [IJSVGUtils typeForCommandString:self.command];
-        parameters = [IJSVGUtils commandParameters:str
-                                             count:&parameterCount];
        requiredParameters = [self.class requiredParameterCount];
+        NSInteger sets = 0;
+        IJSVGPathDataSequence* sequence = [self.class pathDataSequence];
+        parameters = IJSVGParsePathDataSequence(str, sequence, requiredParameters, &sets);

-        // check what required params we need
-        if (requiredParameters == IJSVGCustomVariableParameterCount) {
-            // looks like we require variable params
-            subCommands = [[NSMutableArray alloc] init];
-
-            // parse the custom params
-            [self.class parseParams:parameters
-                         paramCount:parameterCount
-                          intoArray:subCommands
-                      parentCommand:self];
+        if (sets <= 1) {
+            CGFloat* subParams = [self parametersFromIndexOffset:0];
+            IJSVGCommand* command = [self subcommandWithParameters:subParams
+                                                   previousCommand:nil];
+            subCommands = @[ command ].retain;
        } else {
-            // now work out the sets of parameters we have
-            // each command could have a series of subcommands
-            // if there is a multiple of commands in a command
-            // then we need to work those out...
-            NSInteger sets = 1;
-            if (self.requiredParameters != 0) {
-                sets = (self.parameterCount / self.requiredParameters);
-            }

-            subCommands = [[NSMutableArray alloc] initWithCapacity:sets];
+            NSMutableArray<IJSVGCommand*>* subCommandArray = nil;
+            subCommandArray = [[NSMutableArray alloc] initWithCapacity:sets].autorelease;

            // interate over the sets
            IJSVGCommand* lastCommand = nil;
            for (NSInteger i = 0; i < sets; i++) {
                // memory for this will be handled by the created subcommand
-                CGFloat* subParams = 0;
-                if (self.requiredParameters != 0) {
-                    subParams = (CGFloat*)malloc(self.requiredParameters * sizeof(CGFloat));
-                    for (NSInteger p = 0; p < self.requiredParameters; p++) {
-                        subParams[p] = self.parameters[i * self.requiredParameters + p];
-                    }
-                }
+                CGFloat* subParams = [self parametersFromIndexOffset:i];

                // generate the subcommand
                IJSVGCommand* command = [self subcommandWithParameters:subParams
@@ -159,15 +149,27 @@
                // lose and the firey demons will run wild, namely, commands will break
                // if they are multiples of a set
                lastCommand = command;
-
-                // add it to our tree
-                [subCommands addObject:command];
+                [subCommandArray addObject:command];
            }
+
+            // store the retained value
+            subCommands = subCommandArray.copy;
        }
    }
    return self;
 }

+- (CGFloat*)parametersFromIndexOffset:(NSInteger)index
+{
+    CGFloat* subParams = 0;
+    NSInteger req = self.requiredParameters;
+    if (req != 0) {
+        subParams = (CGFloat*)malloc(req * sizeof(CGFloat));
+        memcpy(subParams, &self.parameters[index * req], sizeof(CGFloat) * req);
+    }
+    return subParams;
+}
+
 - (IJSVGCommand*)subcommandWithParameters:(CGFloat*)subParams
                          previousCommand:(IJSVGCommand*)aPreviousCommand
 {
@@ -22,7 +22,7 @@
                 type:(IJSVGCommandType)type
                 path:(IJSVGPath*)path
 {
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] curveToPoint:NSMakePoint(params[4], params[5])
                              controlPoint1:NSMakePoint(params[0], params[1])
                              controlPoint2:NSMakePoint(params[2], params[3])];
@@ -11,11 +11,28 @@

@implementation IJSVGCommandEllipticalArc

+static IJSVGPathDataSequence* _sequence;
+
 + (NSInteger)requiredParameterCount
 {
    return 7;
 }

+ (IJSVGPathDataSequence*)pathDataSequence
+{
+    if(_sequence == NULL) {
+        _sequence = (IJSVGPathDataSequence*)malloc(sizeof(IJSVGPathDataSequence) * 7);
+        _sequence[0] = kIJSVGPathDataSequenceTypeFloat;
+        _sequence[1] = kIJSVGPathDataSequenceTypeFloat;
+        _sequence[2] = kIJSVGPathDataSequenceTypeFloat;
+        _sequence[3] = kIJSVGPathDataSequenceTypeFlag;
+        _sequence[4] = kIJSVGPathDataSequenceTypeFlag;
+        _sequence[5] = kIJSVGPathDataSequenceTypeFloat;
+        _sequence[6] = kIJSVGPathDataSequenceTypeFloat;
+    }
+    return _sequence;
+}
+
 + (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
              command:(IJSVGCommand*)currentCommand
@@ -36,7 +53,7 @@
    sweepFlag = [currentCommand readBOOL];
    arcEndPoint = [currentCommand readPoint];

-    if (type == IJSVGCommandTypeRelative) {
+    if (type == kIJSVGCommandTypeRelative) {
        arcEndPoint.x += path.currentPoint.x;
        arcEndPoint.y += path.currentPoint.y;
    }
@@ -22,7 +22,7 @@
                 type:(IJSVGCommandType)type
                 path:(IJSVGPath*)path
 {
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] lineToPoint:NSMakePoint(params[0], [path currentSubpath].currentPoint.y)];
        return;
    }
@@ -22,7 +22,7 @@
                 type:(IJSVGCommandType)type
                 path:(IJSVGPath*)path
 {
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] lineToPoint:NSMakePoint(params[0], params[1])];
        return;
    }
@@ -36,7 +36,7 @@
    }

    // actual move to command
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] moveToPoint:NSMakePoint(params[0], params[1])];
        return;
    }
@@ -23,7 +23,7 @@
                 type:(IJSVGCommandType)type
                 path:(IJSVGPath*)path
 {
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint(params[2], params[3])
                                      controlPoint:NSMakePoint(params[0], params[1])];
        return;
@@ -28,7 +28,7 @@
    if (command != nil) {
        if (command.class == [IJSVGCommandCurve class] || command.class == self.class) {
            if (command.class == [IJSVGCommandCurve class]) {
-                if (command.type == IJSVGCommandTypeAbsolute) {
+                if (command.type == kIJSVGCommandTypeAbsolute) {
                    firstControl = NSMakePoint(-1 * command.parameters[2] + 2 * [path currentSubpath].currentPoint.x,
                        -1 * command.parameters[3] + 2 * [path currentSubpath].currentPoint.y);
                } else {
@@ -38,7 +38,7 @@
                        -1 * (command.parameters[3] + oldPoint.y) + 2 * [path currentSubpath].currentPoint.y);
                }
            } else {
-                if (command.type == IJSVGCommandTypeAbsolute) {
+                if (command.type == kIJSVGCommandTypeAbsolute) {
                    firstControl = NSMakePoint(-1 * command.parameters[0] + 2 * [path currentSubpath].currentPoint.x,
                        -1 * command.parameters[1] + 2 * [path currentSubpath].currentPoint.y);
                } else {
@@ -50,7 +50,7 @@
            }
        }
    }
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] curveToPoint:NSMakePoint(params[2], params[3])
                              controlPoint1:NSMakePoint(firstControl.x, firstControl.y)
                              controlPoint2:NSMakePoint(params[0], params[1])];
@@ -28,7 +28,7 @@
    if (command != nil) {
        if (command.class == IJSVGCommandQuadraticCurve.class) {
            // quadratic curve
-            if (command.type == IJSVGCommandTypeAbsolute) {
+            if (command.type == kIJSVGCommandTypeAbsolute) {
                commandPoint = NSMakePoint(-1 * command.parameters[0] + 2 * [path currentSubpath].currentPoint.x,
                    -1 * command.parameters[1] + 2 * [path currentSubpath].currentPoint.y);
            } else {
@@ -44,7 +44,7 @@
        }
    }
    path.lastControlPoint = commandPoint;
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint(params[0], params[1])
                                      controlPoint:commandPoint];
        return;
@@ -22,7 +22,7 @@
                 type:(IJSVGCommandType)type
                 path:(IJSVGPath*)path
 {
-    if (type == IJSVGCommandTypeAbsolute) {
+    if (type == kIJSVGCommandTypeAbsolute) {
        [[path currentSubpath] lineToPoint:NSMakePoint([path currentSubpath].currentPoint.x, params[0])];
        return;
    }
@@ -16,13 +16,10 @@
 #import "IJSVGParser.h"
 #import "IJSVGRendering.h"
 #import "IJSVGRenderingStyle.h"
+#import "IJSVGTransaction.h"
 #import <Foundation/Foundation.h>

@class IJSVG;
-@class IJSVGQuartzRenderer;
-
-void IJSVGBeginTransactionLock(void);
-void IJSVGEndTransactionLock(void);

@protocol IJSVGDelegate <NSObject, IJSVGParserDelegate>

@@ -52,7 +49,6 @@ void IJSVGEndTransactionLock(void);
    IJSVGRenderQuality _lastProposedRenderQuality;
    CGFloat _backingScale;
    NSMutableDictionary* _replacementColors;
-    IJSVGQuartzRenderer* _quartzRenderer;

    struct {
        unsigned int shouldHandleForeignObject : 1;
@@ -26,10 +26,9 @@
    (void)([_group release]), _group = nil;
    (void)([_layerTree release]), _layerTree = nil;
    (void)([_replacementColors release]), _replacementColors = nil;
-    (void)([_quartzRenderer release]), _quartzRenderer = nil;
    (void)([_style release]), _style = nil;
-    [super dealloc];
    IJSVGEndTransactionLock();
+    [super dealloc];
 }

 + (id)svgNamed:(NSString*)string error:(NSError**)error
@@ -166,25 +165,26 @@

 - (id)initWithFilePathURL:(NSURL*)aURL error:(NSError**)error
 {
-    return [self initWithFilePathURL:aURL useCache:YES error:error delegate:nil];
+    return [self initWithFilePathURL:aURL
+                            useCache:YES
+                               error:error
+                            delegate:nil];
 }

 - (id)initWithFilePathURL:(NSURL*)aURL useCache:(BOOL)useCache
 {
-    return
-        [self initWithFilePathURL:aURL
-                         useCache:useCache
-                            error:nil
-                         delegate:nil];
+    return [self initWithFilePathURL:aURL
+                            useCache:useCache
+                               error:nil
+                            delegate:nil];
 }

 - (id)initWithFilePathURL:(NSURL*)aURL delegate:(id<IJSVGDelegate>)delegate
 {
-    return
-        [self initWithFilePathURL:aURL
-                         useCache:YES
-                            error:nil
-                         delegate:delegate];
+    return [self initWithFilePathURL:aURL
+                            useCache:YES
+                               error:nil
+                            delegate:delegate];
 }

 - (id)initWithFilePathURL:(NSURL*)aURL
@@ -300,7 +300,7 @@
 {
    self.style = [[[IJSVGRenderingStyle alloc] init] autorelease];
    self.clipToViewport = YES;
-    self.renderQuality = IJSVGRenderQualityFullResolution;
+    self.renderQuality = kIJSVGRenderQualityFullResolution;

    // setup low level backing scale
    _lastProposedBackingScale = 0.f;
@@ -444,10 +444,8 @@

    // make sure we set the masks to path bits n bobs
    [self _beginVectorDraw];
-    {
-        // draw the icon
-        [self _drawInRect:(NSRect)box context:context error:error];
-    }
+    // draw the icon
+    [self _drawInRect:(NSRect)box context:context error:error];
    [self _endVectorDraw];

    CGContextEndPage(context);
@@ -568,74 +566,71 @@
              error:(NSError**)error
 {
    // prep for draw...
-    @synchronized(self)
-    {
-        CGContextSaveGState(ref);
-        @try {
-            [self _beginDraw:rect];
+    CGContextSaveGState(ref);
+    @try {
+        [self _beginDraw:rect];

-            // we also need to calculate the viewport so we can clip
-            // the drawing if needed
-            BOOL canDraw = NO;
-            NSRect viewPort = [self computeRectDrawingInRect:rect isValid:&canDraw];
-            // check the viewport
-            if (canDraw == NO) {
-                if (error != NULL) {
-                    *error = [[[NSError alloc] initWithDomain:IJSVGErrorDomain
-                                                         code:IJSVGErrorDrawing
-                                                     userInfo:nil] autorelease];
-                }
-            } else {
-                // clip to mask
-                if (self.clipToViewport == YES) {
-                    CGContextClipToRect(ref, viewPort);
-                }
-
-                // add the origin back onto the viewport
-                viewPort.origin.x -= (_viewBox.origin.x) * _scale;
-                viewPort.origin.y -= (_viewBox.origin.y) * _scale;
-
-                // transforms
-                CGContextTranslateCTM(ref, viewPort.origin.x, viewPort.origin.y);
-                CGContextScaleCTM(ref, _scale, _scale);
-
-                // render the layer, its really important we lock
-                // the transaction when drawing
-                IJSVGBeginTransactionLock();
-                // do we need to update the backing scales on the
-                // layers?
-                if (self.renderingBackingScaleHelper != nil) {
-                    [self _askHelperForBackingScale];
-                }
-
-                CGInterpolationQuality quality;
-                switch (self.renderQuality) {
-                case IJSVGRenderQualityLow: {
-                    quality = kCGInterpolationLow;
-                    break;
-                }
-                case IJSVGRenderQualityOptimized: {
-                    quality = kCGInterpolationMedium;
-                    break;
-                }
-                default: {
-                    quality = kCGInterpolationHigh;
-                }
-                }
-                CGContextSetInterpolationQuality(ref, quality);
-                [self.layer renderInContext:ref];
-                IJSVGEndTransactionLock();
-            }
-        } @catch (NSException* exception) {
-            // just catch and give back a drawing error to the caller
+        // we also need to calculate the viewport so we can clip
+        // the drawing if needed
+        BOOL canDraw = NO;
+        NSRect viewPort = [self computeRectDrawingInRect:rect isValid:&canDraw];
+        // check the viewport
+        if (canDraw == NO) {
            if (error != NULL) {
                *error = [[[NSError alloc] initWithDomain:IJSVGErrorDomain
                                                     code:IJSVGErrorDrawing
                                                 userInfo:nil] autorelease];
            }
+        } else {
+            // clip to mask
+            if (self.clipToViewport == YES) {
+                CGContextClipToRect(ref, viewPort);
+            }
+
+            // add the origin back onto the viewport
+            viewPort.origin.x -= (_viewBox.origin.x) * _scale;
+            viewPort.origin.y -= (_viewBox.origin.y) * _scale;
+
+            // transforms
+            CGContextTranslateCTM(ref, viewPort.origin.x, viewPort.origin.y);
+            CGContextScaleCTM(ref, _scale, _scale);
+
+            // render the layer, its really important we lock
+            // the transaction when drawing
+            IJSVGBeginTransactionLock();
+            // do we need to update the backing scales on the
+            // layers?
+            if (self.renderingBackingScaleHelper != nil) {
+                [self _askHelperForBackingScale];
+            }
+
+            CGInterpolationQuality quality;
+            switch (self.renderQuality) {
+            case kIJSVGRenderQualityLow: {
+                quality = kCGInterpolationLow;
+                break;
+            }
+            case kIJSVGRenderQualityOptimized: {
+                quality = kCGInterpolationMedium;
+                break;
+            }
+            default: {
+                quality = kCGInterpolationHigh;
+            }
+            }
+            CGContextSetInterpolationQuality(ref, quality);
+            [self.layer renderInContext:ref];
+            IJSVGEndTransactionLock();
+        }
+    } @catch (NSException* exception) {
+        // just catch and give back a drawing error to the caller
+        if (error != NULL) {
+            *error = [[[NSError alloc] initWithDomain:IJSVGErrorDomain
+                                                 code:IJSVGErrorDrawing
+                                             userInfo:nil] autorelease];
        }
-        CGContextRestoreGState(ref);
    }
+    CGContextRestoreGState(ref);
    return (error == nil);
 }

@@ -11,6 +11,7 @@
@class IJSVG;

 typedef void (^IJSVGCGPathHandler)(const CGPathElement* pathElement);
+typedef void (^IJSVGPathElementEnumerationBlock)(const CGPathElement* pathElement, CGPoint currentPoint);

 void IJSVGExporterPathCaller(void* info, const CGPathElement* pathElement);

@@ -35,6 +36,7 @@ typedef NS_OPTIONS(NSInteger, IJSVGExporterOptions) {
 };

 BOOL IJSVGExporterHasOption(IJSVGExporterOptions options, NSInteger option);
+void IJSVGEnumerateCGPathElements(CGPathRef path, IJSVGPathElementEnumerationBlock enumBlock);

@interface IJSVGExporter : NSObject {

@@ -1055,11 +1055,32 @@ NSString* IJSVGHash(NSString* key)
    return options;
 }

+- (NSString*)elementNameForPrimitiveType:(IJSVGPrimitivePathType)primitiveType
+{
+    switch (primitiveType) {
+    case IJSVGPrimitivePathTypeRect:
+        return @"rect";
+    case IJSVGPrimitivePathTypePolyLine:
+        return @"polyline";
+    case IJSVGPrimitivePathTypeEllipse:
+        return @"ellipse";
+    case IJSVGPrimitivePathTypeCircle:
+        return @"circle";
+    case IJSVGPrimitivePathTypeLine:
+        return @"line";
+    case IJSVGPrimitivePathTypePolygon:
+        return @"polygon";
+    case IJSVGPrimitivePathTypePath:
+    default:
+        return @"path";
+    }
+}
+
 - (NSXMLElement*)elementForShape:(IJSVGShapeLayer*)layer
                      fromParent:(NSXMLElement*)parent
 {
    NSXMLElement* e = [[[NSXMLElement alloc] init] autorelease];
-    e.name = @"path";
+    e.name = [self elementNameForPrimitiveType:layer.primitiveType];
    CGPathRef path = layer.path;

    // copy the path as we want to translate
@@ -1070,7 +1091,94 @@ NSString* IJSVGHash(NSString* key)
    NSMutableDictionary* dict = [[[NSMutableDictionary alloc] init] autorelease];

    // path
-    dict[@"d"] = [self pathFromCGPath:transformPath];
+    switch (layer.primitiveType) {
+    case IJSVGPrimitivePathTypeRect: {
+        __block BOOL radiusSet = NO;
+        IJSVGEnumerateCGPathElements(transformPath, ^(const CGPathElement* pathElement, CGPoint currentPoint) {
+            if (radiusSet == NO && pathElement->type == kCGPathElementAddCurveToPoint) {
+                radiusSet = YES;
+                CGFloat radX = fabs(pathElement->points[0].x - currentPoint.x);
+                CGFloat radY = fabs(pathElement->points[0].y - currentPoint.y);
+                dict[@"rx"] = IJSVGShortFloatString(radX);
+                if (radX != radY) {
+                    dict[@"ry"] = IJSVGShortFloatString(radY);
+                }
+            }
+        });
+        CGRect boundingBox = CGPathGetBoundingBox(transformPath);
+        if (boundingBox.origin.x != 0.f) {
+            dict[@"x"] = IJSVGShortFloatString(boundingBox.origin.x);
+        }
+        if (boundingBox.origin.y != 0.f) {
+            dict[@"y"] = IJSVGShortFloatString(boundingBox.origin.y);
+        }
+        dict[@"width"] = IJSVGShortFloatString(boundingBox.size.width);
+        dict[@"height"] = IJSVGShortFloatString(boundingBox.size.height);
+        break;
+    }
+    case IJSVGPrimitivePathTypeLine: {
+        IJSVGEnumerateCGPathElements(transformPath, ^(const CGPathElement* pathElement, CGPoint currentPoint) {
+            switch (pathElement->type) {
+            case kCGPathElementMoveToPoint: {
+                dict[@"x1"] = IJSVGShortFloatString(pathElement->points[0].x);
+                dict[@"y1"] = IJSVGShortFloatString(pathElement->points[0].y);
+                break;
+            }
+            case kCGPathElementAddLineToPoint: {
+                dict[@"x2"] = IJSVGShortFloatString(pathElement->points[0].x);
+                dict[@"y2"] = IJSVGShortFloatString(pathElement->points[0].y);
+                break;
+            }
+            default:
+                break;
+            }
+        });
+        break;
+    }
+    case IJSVGPrimitivePathTypePolygon:
+    case IJSVGPrimitivePathTypePolyLine: {
+        NSMutableArray<NSString*>* points = [[[NSMutableArray alloc] init] autorelease];
+        IJSVGEnumerateCGPathElements(transformPath, ^(const CGPathElement* pathElement, CGPoint currentPoint) {
+            switch (pathElement->type) {
+            case kCGPathElementMoveToPoint: {
+                [points addObject:IJSVGPointToCommandString(pathElement->points[0])];
+                break;
+            }
+            case kCGPathElementAddLineToPoint: {
+                [points addObject:IJSVGPointToCommandString(pathElement->points[0])];
+                break;
+            }
+            default:
+                break;
+            }
+        });
+        // polygon does not need the move to command
+        if (layer.primitiveType == IJSVGPrimitivePathTypePolygon) {
+            [points removeLastObject];
+        }
+        dict[@"points"] = [points componentsJoinedByString:@" "];
+        break;
+    }
+    case IJSVGPrimitivePathTypeEllipse: {
+        CGRect boundingBox = CGPathGetPathBoundingBox(transformPath);
+        dict[@"cx"] = IJSVGShortFloatString(boundingBox.origin.x + boundingBox.size.width / 2.f);
+        dict[@"cy"] = IJSVGShortFloatString(boundingBox.origin.y + boundingBox.size.height / 2.f);
+        dict[@"rx"] = IJSVGShortFloatString(boundingBox.size.width / 2.f);
+        dict[@"ry"] = IJSVGShortFloatString(boundingBox.size.height / 2.f);
+        break;
+    }
+    case IJSVGPrimitivePathTypeCircle: {
+        //        IJSVGCGPathHandler callback = ^(const CGPathElement * pathElement) {
+        CGRect boundingBox = CGPathGetPathBoundingBox(transformPath);
+        dict[@"cx"] = IJSVGShortFloatString(boundingBox.origin.x + boundingBox.size.width / 2.f);
+        dict[@"cy"] = IJSVGShortFloatString(boundingBox.origin.y + boundingBox.size.height / 2.f);
+        dict[@"r"] = IJSVGShortFloatString(boundingBox.size.width / 2.f);
+        break;
+    }
+    case IJSVGPrimitivePathTypePath:
+    default:
+        dict[@"d"] = [self pathFromCGPath:transformPath];
+    }

    CGPathRelease(transformPath);

@@ -1308,6 +1416,39 @@ void IJSVGExporterPathCaller(void* info, const CGPathElement* pathElement)
    handler(pathElement);
 };

+void IJSVGEnumerateCGPathElements(CGPathRef path, IJSVGPathElementEnumerationBlock enumBlock)
+{
+    __block CGPoint currentPoint = CGPointZero;
+    CGPathApplyWithBlock(path, ^(const CGPathElement* _Nonnull element) {
+        switch (element->type) {
+        case kCGPathElementMoveToPoint: {
+            enumBlock(element, currentPoint);
+            currentPoint = element->points[0];
+            break;
+        }
+        case kCGPathElementAddLineToPoint: {
+            enumBlock(element, currentPoint);
+            currentPoint = element->points[0];
+            break;
+        }
+        case kCGPathElementAddCurveToPoint: {
+            enumBlock(element, currentPoint);
+            currentPoint = element->points[2];
+            break;
+        }
+        case kCGPathElementAddQuadCurveToPoint: {
+            enumBlock(element, currentPoint);
+            currentPoint = element->points[1];
+            break;
+        }
+        case kCGPathElementCloseSubpath: {
+            enumBlock(element, currentPoint);
+            break;
+        }
+        }
+    });
+};
+
 - (void)sortAttributesOnElement:(NSXMLElement*)element
 {
    const NSArray* order = @[ @"id", @"width", @"height", @"x", @"x1", @"x2",
@@ -64,11 +64,11 @@
 - (void)setBackingScaleFactor:(CGFloat)backingScaleFactor
 {
    switch (self.renderQuality) {
-    case IJSVGRenderQualityOptimized: {
+    case kIJSVGRenderQualityOptimized: {
        backingScaleFactor = (backingScaleFactor * .35f);
        break;
    }
-    case IJSVGRenderQualityLow: {
+    case kIJSVGRenderQualityLow: {
        backingScaleFactor = (backingScaleFactor * .05f);
        break;
    }
@@ -61,20 +61,6 @@
    }
 }

- (void)addSublayer:(CALayer*)layer
-{
-    if ([layer isKindOfClass:[IJSVGLayer class]] == NO &&
-        [layer isKindOfClass:[IJSVGShapeLayer class]] == NO) {
-        NSString* r = [NSString stringWithFormat:@"The layer must be an instance of IJSVGLayer, %@ given.",
-                                [layer class]];
-        NSException* exception = [NSException exceptionWithName:@"IJSVGInvalidSublayerException"
-                                                         reason:r
-                                                       userInfo:nil];
-        @throw exception;
-    }
-    [super addSublayer:layer];
-}
-
 - (void)setBackingScaleFactor:(CGFloat)newFactor
 {
    if (self.backingScaleFactor == newFactor) {
@@ -28,6 +28,7 @@
@property (nonatomic, assign) CGPoint absoluteOrigin;
@property (nonatomic, assign) CGPoint originalPathOrigin;
@property (nonatomic, assign) BOOL convertMasksToPaths;
+@property (nonatomic, assign) IJSVGPrimitivePathType primitiveType;

 - (void)applySublayerMaskToContext:(CGContextRef)context
                       forSublayer:(IJSVGLayer*)sublayer
@@ -22,6 +22,7 @@
@synthesize convertMasksToPaths;
@synthesize originalPathOrigin;
@synthesize renderQuality;
+@synthesize primitiveType;

 - (void)dealloc
 {
@@ -29,20 +30,6 @@
    [super dealloc];
 }

- (void)addSublayer:(CALayer*)layer
-{
-    if ([layer isKindOfClass:[IJSVGLayer class]] == NO &&
-        [layer isKindOfClass:[IJSVGShapeLayer class]] == NO) {
-        NSString* r = [NSString stringWithFormat:@"The layer must be an instance of IJSVGLayer, %@ given.",
-                                [layer class]];
-        NSException* exception = [NSException exceptionWithName:@"IJSVGInvalidSublayerException"
-                                                         reason:r
-                                                       userInfo:nil];
-        @throw exception;
-    }
-    [super addSublayer:layer];
-}
-
 - (void)setBackingScaleFactor:(CGFloat)newFactor
 {
    if (self.backingScaleFactor == newFactor) {
@@ -12,6 +12,16 @@

@class IJSVGGroup;

+typedef NS_ENUM(NSInteger, IJSVGPrimitivePathType) {
+    IJSVGPrimitivePathTypePath,
+    IJSVGPrimitivePathTypeRect,
+    IJSVGPrimitivePathTypePolygon,
+    IJSVGPrimitivePathTypePolyLine,
+    IJSVGPrimitivePathTypeCircle,
+    IJSVGPrimitivePathTypeEllipse,
+    IJSVGPrimitivePathTypeLine
+};
+
@interface IJSVGPath : IJSVGNode {

    NSBezierPath* path;
@@ -19,10 +29,11 @@
    CGPoint lastControlPoint;
 }

+@property (nonatomic, assign) IJSVGPrimitivePathType primitiveType;
@property (nonatomic, readonly) NSBezierPath* path;
@property (nonatomic, readonly) NSBezierPath* subpath;
@property (nonatomic, assign) CGPoint lastControlPoint;
-@property (atomic, readonly) CGPathRef CGPath;
+@property (nonatomic, readonly) CGPathRef CGPath;

 - (NSBezierPath*)currentSubpath;
 - (void)close;
@@ -15,6 +15,7 @@
@synthesize subpath;
@synthesize lastControlPoint;
@synthesize CGPath = _CGPath;
+@synthesize primitiveType = _primitiveType;

 - (void)dealloc
 {
@@ -31,6 +32,7 @@
 - (id)init
 {
    if ((self = [super init]) != nil) {
+        _primitiveType = IJSVGPrimitivePathTypePath;
        subpath = NSBezierPath.bezierPath.retain;
        path = subpath; // for legacy use
    }
@@ -1064,7 +1064,8 @@
                              ignoreAttributes:nil];

        // from base64
-        [image loadFromBase64EncodedString:[[element attributeForName:(NSString*)IJSVGAttributeXLink] stringValue]];
+        NSString* string = [element attributeForName:(NSString*)IJSVGAttributeXLink].stringValue;
+        [image loadFromBase64EncodedString:string];

        // add to parent
        [parentGroup addChild:image];
@@ -1197,6 +1198,7 @@
 {
    // convert a line into a command,
    // basically MX1 Y1LX2 Y2
+    path.primitiveType = IJSVGPrimitivePathTypeLine;
    CGFloat x1 = [element attributeForName:(NSString*)IJSVGAttributeX1].stringValue.floatValue;
    CGFloat y1 = [element attributeForName:(NSString*)IJSVGAttributeY1].stringValue.floatValue;
    CGFloat x2 = [element attributeForName:(NSString*)IJSVGAttributeX2].stringValue.floatValue;
@@ -1214,6 +1216,7 @@
 - (void)_parseCircle:(NSXMLElement*)element
            intoPath:(IJSVGPath*)path
 {
+    path.primitiveType = IJSVGPrimitivePathTypeCircle;
    CGFloat cX = [element attributeForName:(NSString*)IJSVGAttributeCX].stringValue.floatValue;
    CGFloat cY = [element attributeForName:(NSString*)IJSVGAttributeCY].stringValue.floatValue;
    CGFloat r = [element attributeForName:(NSString*)IJSVGAttributeR].stringValue.floatValue;
@@ -1224,6 +1227,7 @@
 - (void)_parseEllipse:(NSXMLElement*)element
             intoPath:(IJSVGPath*)path
 {
+    path.primitiveType = IJSVGPrimitivePathTypeEllipse;
    CGFloat cX = [element attributeForName:(NSString*)IJSVGAttributeCX].stringValue.floatValue;
    CGFloat cY = [element attributeForName:(NSString*)IJSVGAttributeCY].stringValue.floatValue;
    CGFloat rX = [element attributeForName:(NSString*)IJSVGAttributeRX].stringValue.floatValue;
@@ -1235,6 +1239,7 @@
 - (void)_parsePolyline:(NSXMLElement*)element
              intoPath:(IJSVGPath*)path
 {
+    path.primitiveType = IJSVGPrimitivePathTypePolyLine;
    [self _parsePoly:element
            intoPath:path
           closePath:NO];
@@ -1243,6 +1248,7 @@
 - (void)_parsePolygon:(NSXMLElement*)element
             intoPath:(IJSVGPath*)path
 {
+    path.primitiveType = IJSVGPrimitivePathTypePolygon;
    [self _parsePoly:element
            intoPath:path
           closePath:YES];
@@ -1252,18 +1258,23 @@
          intoPath:(IJSVGPath*)path
         closePath:(BOOL)closePath
 {
-    NSString* points = [[element attributeForName:(NSString*)IJSVGAttributePoints] stringValue];
+    NSString* points = [element attributeForName:(NSString*)IJSVGAttributePoints].stringValue;
    NSInteger count = 0;
    CGFloat* params = [IJSVGUtils commandParameters:points
                                              count:&count];
+
+    // error occured, free the params
    if ((count % 2) != 0) {
-        // error occured, free the params
        free(params);
        return;
    }

    // construct a command
-    NSMutableString* str = [[[NSMutableString alloc] init] autorelease];
+    NSInteger capacity = count / 2;
+    if (closePath == YES) {
+        capacity += 1;
+    }
+    NSMutableString* str = [[[NSMutableString alloc] initWithCapacity:capacity] autorelease];
    [str appendFormat:@"M%f,%f L", params[0], params[1]];
    for (NSInteger i = 2; i < count; i += 2) {
        [str appendFormat:@"%f,%f ", params[i], params[i + 1]];
@@ -1279,18 +1290,18 @@
 - (void)_parseRect:(NSXMLElement*)element
          intoPath:(IJSVGPath*)path
 {
-
+    path.primitiveType = IJSVGPrimitivePathTypeRect;
    // width and height
-    CGFloat width = [IJSVGUtils floatValue:[[element attributeForName:(NSString*)IJSVGAttributeWidth] stringValue]
+    CGFloat width = [IJSVGUtils floatValue:[element attributeForName:(NSString*)IJSVGAttributeWidth].stringValue
                        fallBackForPercent:self.viewBox.size.width];

-    CGFloat height = [IJSVGUtils floatValue:[[element attributeForName:(NSString*)IJSVGAttributeHeight] stringValue]
+    CGFloat height = [IJSVGUtils floatValue:[element attributeForName:(NSString*)IJSVGAttributeHeight].stringValue
                         fallBackForPercent:self.viewBox.size.height];

    // rect uses x and y as start of path, not move path object -_-
-    CGFloat x = [IJSVGUtils floatValue:[[element attributeForName:(NSString*)IJSVGAttributeX] stringValue]
+    CGFloat x = [IJSVGUtils floatValue:[element attributeForName:(NSString*)IJSVGAttributeX].stringValue
                    fallBackForPercent:self.viewBox.size.width];
-    CGFloat y = [IJSVGUtils floatValue:[[element attributeForName:(NSString*)IJSVGAttributeY] stringValue]
+    CGFloat y = [IJSVGUtils floatValue:[element attributeForName:(NSString*)IJSVGAttributeY].stringValue
                    fallBackForPercent:self.viewBox.size.height];

    // radius
@@ -203,6 +203,7 @@
 {
    // setup path and layer
    IJSVGShapeLayer* layer = [[[IJSVGShapeLayer alloc] init] autorelease];
+    layer.primitiveType = path.primitiveType;
    CGPathRef introPath = path.CGPath;

    *originalBoundingBox = CGRectIntegral(CGPathGetBoundingBox(introPath));
@@ -11,9 +11,9 @@
 typedef CGFloat (^IJSVGRenderingBackingScaleFactorHelper)(void);

 typedef NS_ENUM(NSInteger, IJSVGRenderQuality) {
-    IJSVGRenderQualityFullResolution, // slowest to render
-    IJSVGRenderQualityOptimized, // best of both worlds
-    IJSVGRenderQualityLow // fast rendering
+    kIJSVGRenderQualityFullResolution, // slowest to render
+    kIJSVGRenderQualityOptimized, // best of both worlds
+    kIJSVGRenderQualityLow // fast rendering
 };

@interface IJSVGRendering : NSObject
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Curtis Hard	488a0c3654	Update all things!	2019-12-12 08:09:08 +00:00
Curtis Hard	7f7321e6a7	Merge branch 'feature/primitiveExportTypes'	2019-12-12 08:07:05 +00:00
Curtis Hard	d0878c9f1b	Added convenience method in	2019-12-11 15:47:12 +00:00
Curtis Hard	cd135ce271	Refactor and more performant string passing	2019-12-11 13:22:16 +00:00
Curtis Hard	b369891e96	Added sequences to float parsing	2019-12-10 22:25:21 +00:00
Curtis Hard	cde99fc501	Fixes memory leak	2019-12-06 12:03:44 +00:00
Curtis Hard	efc5f139f6	Formatting	2019-12-06 08:26:03 +00:00
Curtis Hard	f1c62ed828	Fixes a few things	2019-12-05 21:07:40 +00:00
Curtis Hard	d66332ad07	Added is main thread check to transaction	2019-12-05 11:12:45 +00:00
Curtis Hard	f2363769bf	replaced calls with prefix	2019-12-04 12:58:08 +00:00
Curtis Hard	ca1f0d9bf3	Performance increases and memory enhancements	2019-12-04 12:52:58 +00:00
Curtis Hard	8b7fc3171d	More goodies	2019-12-04 08:59:55 +00:00
Curtis Hard	38df2094c9	Refactor and moving of groups	2019-12-04 08:59:46 +00:00
Curtis Hard	2355e86ed7	Fixes memory leak	2019-12-03 22:43:25 +00:00
Curtis Hard	192a9259fe	Fixes performance here	2019-12-03 22:38:20 +00:00
Curtis Hard	2a9eb3cdc5	Added support for transparent	2019-12-03 14:26:11 +00:00
Curtis Hard	6ed4e3fb8e	Export primitive shapes if they were that on import	2019-12-03 14:17:31 +00:00
Curtis Hard	f6e1f1494e	Initial stuff	2019-12-03 09:22:46 +00:00