Performance increases and modern syntax things

This updates formatting to meet the WebKit standard
Fixes stuff
2019-12-02 22:30:52 +00:00 · 2019-12-02 21:05:12 +00:00 · 2019-11-28 21:56:56 +00:00 · 2019-11-28 20:33:04 +00:00 · 2019-11-28 13:26:37 +00:00 · 2019-11-28 13:21:08 +00:00
144 changed files with 34387 additions and 13564 deletions
@@ -0,0 +1,813 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		594CF55F238FF462009B251B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 594CF55E238FF462009B251B /* AppKit.framework */; };
+		594CF561238FF46C009B251B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 594CF560238FF46C009B251B /* Foundation.framework */; };
+		594CF563238FF473009B251B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 594CF562238FF473009B251B /* QuartzCore.framework */; };
+		599EB4D3238FF570004CB6BC /* libobjc.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 599EB4D2238FF535004CB6BC /* libobjc.tbd */; };
+		59EB75D623905F7300F5AE63 /* IJSVGLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756523905F6B00F5AE63 /* IJSVGLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75D723905F7300F5AE63 /* IJSVGGradientLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756623905F6B00F5AE63 /* IJSVGGradientLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75D823905F7300F5AE63 /* IJSVGStyleSheetRule.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB756723905F6B00F5AE63 /* IJSVGStyleSheetRule.m */; };
+		59EB75D923905F7300F5AE63 /* IJSVGCommandLineTo.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756823905F6B00F5AE63 /* IJSVGCommandLineTo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75DA23905F7300F5AE63 /* IJSVGDef.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB756923905F6B00F5AE63 /* IJSVGDef.m */; };
+		59EB75DB23905F7300F5AE63 /* IJSVG.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756A23905F6B00F5AE63 /* IJSVG.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75DC23905F7300F5AE63 /* IJSVGText.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756B23905F6B00F5AE63 /* IJSVGText.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75DD23905F7300F5AE63 /* IJSVGCommandQuadraticCurve.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB756C23905F6B00F5AE63 /* IJSVGCommandQuadraticCurve.m */; };
+		59EB75DE23905F7300F5AE63 /* IJSVGCommandVerticalLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756D23905F6C00F5AE63 /* IJSVGCommandVerticalLine.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75DF23905F7300F5AE63 /* IJSVGWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756E23905F6C00F5AE63 /* IJSVGWriter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E023905F7300F5AE63 /* IJSVGStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB756F23905F6C00F5AE63 /* IJSVGStyleSheet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E123905F7300F5AE63 /* IJSVGCommandSmoothCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757023905F6C00F5AE63 /* IJSVGCommandSmoothCurve.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E223905F7300F5AE63 /* IJSVGColorList.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757123905F6C00F5AE63 /* IJSVGColorList.m */; };
+		59EB75E323905F7300F5AE63 /* IJSVGRadialGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757223905F6C00F5AE63 /* IJSVGRadialGradient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E423905F7300F5AE63 /* IJSVGGradientUnitLength.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757323905F6C00F5AE63 /* IJSVGGradientUnitLength.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E523905F7300F5AE63 /* IJSVGStrokeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757423905F6C00F5AE63 /* IJSVGStrokeLayer.m */; };
+		59EB75E623905F7300F5AE63 /* IJSVGStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757523905F6C00F5AE63 /* IJSVGStyle.m */; };
+		59EB75E723905F7300F5AE63 /* IJSVGImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757623905F6C00F5AE63 /* IJSVGImage.m */; };
+		59EB75E823905F7300F5AE63 /* IJSVGUnitLength.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757723905F6C00F5AE63 /* IJSVGUnitLength.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75E923905F7300F5AE63 /* IJSVGStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757823905F6C00F5AE63 /* IJSVGStringAdditions.m */; };
+		59EB75EA23905F7300F5AE63 /* IJSVGTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757923905F6C00F5AE63 /* IJSVGTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75EB23905F7300F5AE63 /* IJSVGShapeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757A23905F6C00F5AE63 /* IJSVGShapeLayer.m */; };
+		59EB75EC23905F7300F5AE63 /* IJSVGLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757B23905F6C00F5AE63 /* IJSVGLayer.m */; };
+		59EB75ED23905F7300F5AE63 /* IJSVGFontConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757C23905F6C00F5AE63 /* IJSVGFontConverter.m */; };
+		59EB75EE23905F7300F5AE63 /* IJSVGImageRep.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB757D23905F6C00F5AE63 /* IJSVGImageRep.m */; };
+		59EB75EF23905F7300F5AE63 /* IJSVGCommandQuadraticCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757E23905F6C00F5AE63 /* IJSVGCommandQuadraticCurve.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75F023905F7300F5AE63 /* IJSVGStyleSheetSelectorRaw.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB757F23905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75F123905F7300F5AE63 /* IJSVGUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758023905F6C00F5AE63 /* IJSVGUtils.m */; };
+		59EB75F223905F7300F5AE63 /* IJSVGStyleSheetSelectorRaw.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758123905F6C00F5AE63 /* IJSVGStyleSheetSelectorRaw.m */; };
+		59EB75F323905F7300F5AE63 /* IJSVGGroupLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758223905F6C00F5AE63 /* IJSVGGroupLayer.m */; };
+		59EB75F423905F7300F5AE63 /* IJSVGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB758323905F6C00F5AE63 /* IJSVGColor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75F523905F7300F5AE63 /* IJSVGError.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB758423905F6C00F5AE63 /* IJSVGError.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75F623905F7300F5AE63 /* IJSVGColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758523905F6C00F5AE63 /* IJSVGColor.m */; };
+		59EB75F723905F7300F5AE63 /* IJSVGDef.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB758623905F6C00F5AE63 /* IJSVGDef.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75F823905F7300F5AE63 /* IJSVGCommandHorizontalLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758723905F6C00F5AE63 /* IJSVGCommandHorizontalLine.m */; };
+		59EB75F923905F7300F5AE63 /* IJSVGFontConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB758823905F6D00F5AE63 /* IJSVGFontConverter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75FA23905F7300F5AE63 /* IJSVGWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758923905F6D00F5AE63 /* IJSVGWriter.m */; };
+		59EB75FB23905F7300F5AE63 /* IJSVGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758A23905F6D00F5AE63 /* IJSVGPath.m */; };
+		59EB75FC23905F7300F5AE63 /* IJSVGGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB758B23905F6D00F5AE63 /* IJSVGGroup.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB75FD23905F7300F5AE63 /* IJSVGPatternLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758C23905F6D00F5AE63 /* IJSVGPatternLayer.m */; };
+		59EB75FE23905F7300F5AE63 /* IJSVGRenderingStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758D23905F6D00F5AE63 /* IJSVGRenderingStyle.m */; };
+		59EB75FF23905F7300F5AE63 /* IJSVGBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758E23905F6D00F5AE63 /* IJSVGBezierPathAdditions.m */; };
+		59EB760023905F7300F5AE63 /* IJSVGGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB758F23905F6D00F5AE63 /* IJSVGGradientLayer.m */; };
+		59EB760123905F7300F5AE63 /* IJSVGLayerTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759023905F6D00F5AE63 /* IJSVGLayerTree.m */; };
+		59EB760223905F7300F5AE63 /* IJSVGCommandVerticalLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759123905F6D00F5AE63 /* IJSVGCommandVerticalLine.m */; };
+		59EB760323905F7300F5AE63 /* IJSVGNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759223905F6D00F5AE63 /* IJSVGNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760423905F7300F5AE63 /* IJSVGCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759323905F6D00F5AE63 /* IJSVGCache.m */; };
+		59EB760523905F7300F5AE63 /* IJSVGUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759423905F6D00F5AE63 /* IJSVGUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760623905F7300F5AE63 /* IJSVGCommandHorizontalLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759523905F6D00F5AE63 /* IJSVGCommandHorizontalLine.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760723905F7300F5AE63 /* IJSVGNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759623905F6D00F5AE63 /* IJSVGNode.m */; };
+		59EB760823905F7300F5AE63 /* IJSVGShapeLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759723905F6D00F5AE63 /* IJSVGShapeLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760923905F7300F5AE63 /* IJSVGCommandCurve.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759823905F6E00F5AE63 /* IJSVGCommandCurve.m */; };
+		59EB760A23905F7300F5AE63 /* IJSVGCommandMove.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB759923905F6E00F5AE63 /* IJSVGCommandMove.m */; };
+		59EB760B23905F7300F5AE63 /* IJSVGStyleSheetSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759A23905F6E00F5AE63 /* IJSVGStyleSheetSelector.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760C23905F7300F5AE63 /* IJSVGStyleSheetRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759B23905F6E00F5AE63 /* IJSVGStyleSheetRule.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760D23905F7300F5AE63 /* IJSVGCommandCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759C23905F6E00F5AE63 /* IJSVGCommandCurve.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760E23905F7300F5AE63 /* IJSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759D23905F6E00F5AE63 /* IJSVGPath.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB760F23905F7300F5AE63 /* IJSVGCommandEllipticalArc.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759E23905F6E00F5AE63 /* IJSVGCommandEllipticalArc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761023905F7300F5AE63 /* IJSVGLinearGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB759F23905F6E00F5AE63 /* IJSVGLinearGradient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761123905F7300F5AE63 /* IJSVGCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75A023905F6E00F5AE63 /* IJSVGCommand.m */; };
+		59EB761223905F7300F5AE63 /* IJSVGRenderingStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75A123905F6E00F5AE63 /* IJSVGRenderingStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761323905F7300F5AE63 /* IJSVG.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75A223905F6E00F5AE63 /* IJSVG.m */; };
+		59EB761423905F7300F5AE63 /* IJSVGImageRep.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75A323905F6E00F5AE63 /* IJSVGImageRep.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761523905F7300F5AE63 /* IJSVGStrokeLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75A423905F6E00F5AE63 /* IJSVGStrokeLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761623905F7300F5AE63 /* IJSVGParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75A523905F6E00F5AE63 /* IJSVGParser.m */; };
+		59EB761723905F7300F5AE63 /* IJSVGRadialGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75A623905F6F00F5AE63 /* IJSVGRadialGradient.m */; };
+		59EB761823905F7300F5AE63 /* IJSVGParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75A723905F6F00F5AE63 /* IJSVGParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761923905F7300F5AE63 /* IJSVGCommandSmoothCurve.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75A823905F6F00F5AE63 /* IJSVGCommandSmoothCurve.m */; };
+		59EB761A23905F7300F5AE63 /* IJSVGColorList.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75A923905F6F00F5AE63 /* IJSVGColorList.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761B23905F7300F5AE63 /* IJSVGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75AA23905F6F00F5AE63 /* IJSVGPattern.m */; };
+		59EB761C23905F7300F5AE63 /* IJSVGGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75AB23905F6F00F5AE63 /* IJSVGGradient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761D23905F7300F5AE63 /* IJSVGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75AC23905F6F00F5AE63 /* IJSVGStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761E23905F7300F5AE63 /* IJSVGGroupLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75AD23905F6F00F5AE63 /* IJSVGGroupLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB761F23905F7300F5AE63 /* IJSVGCommandLineTo.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75AE23905F6F00F5AE63 /* IJSVGCommandLineTo.m */; };
+		59EB762023905F7300F5AE63 /* IJSVGCommandMove.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75AF23905F6F00F5AE63 /* IJSVGCommandMove.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762123905F7300F5AE63 /* IJSVGTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B023905F6F00F5AE63 /* IJSVGTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762223905F7300F5AE63 /* IJSVGMath.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75B123905F6F00F5AE63 /* IJSVGMath.m */; };
+		59EB762323905F7300F5AE63 /* IJSVGExporterPathInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B223905F6F00F5AE63 /* IJSVGExporterPathInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762423905F7300F5AE63 /* IJSVGTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75B323905F6F00F5AE63 /* IJSVGTransaction.m */; };
+		59EB762523905F7300F5AE63 /* IJSVGTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75B423905F6F00F5AE63 /* IJSVGTransform.m */; };
+		59EB762623905F7300F5AE63 /* IJSVGImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B523905F7000F5AE63 /* IJSVGImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762723905F7300F5AE63 /* IJSVGMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B623905F7000F5AE63 /* IJSVGMath.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762823905F7300F5AE63 /* IJSVGCommandClose.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B723905F7000F5AE63 /* IJSVGCommandClose.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762923905F7300F5AE63 /* IJSVGStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75B823905F7000F5AE63 /* IJSVGStringAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762A23905F7300F5AE63 /* IJSVGGradientUnitLength.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75B923905F7000F5AE63 /* IJSVGGradientUnitLength.m */; };
+		59EB762B23905F7300F5AE63 /* IJSVGUnitLength.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75BA23905F7000F5AE63 /* IJSVGUnitLength.m */; };
+		59EB762C23905F7300F5AE63 /* IJSVGPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75BB23905F7000F5AE63 /* IJSVGPattern.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762D23905F7300F5AE63 /* IJSVGLayerTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75BC23905F7000F5AE63 /* IJSVGLayerTree.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB762E23905F7300F5AE63 /* IJSVGExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75BD23905F7000F5AE63 /* IJSVGExporter.m */; };
+		59EB762F23905F7300F5AE63 /* IJSVGCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75BE23905F7000F5AE63 /* IJSVGCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763023905F7300F5AE63 /* IJSVGPatternLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75BF23905F7000F5AE63 /* IJSVGPatternLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763123905F7300F5AE63 /* IJSVGText.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C023905F7100F5AE63 /* IJSVGText.m */; };
+		59EB763223905F7300F5AE63 /* IJSVGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C123905F7100F5AE63 /* IJSVGView.m */; };
+		59EB763323905F7300F5AE63 /* IJSVGLinearGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C223905F7100F5AE63 /* IJSVGLinearGradient.m */; };
+		59EB763423905F7300F5AE63 /* IJSVGBezierPathAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75C323905F7100F5AE63 /* IJSVGBezierPathAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763523905F7300F5AE63 /* IJSVGStyleSheetSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C423905F7100F5AE63 /* IJSVGStyleSheetSelector.m */; };
+		59EB763623905F7300F5AE63 /* IJSVGImageLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C523905F7100F5AE63 /* IJSVGImageLayer.m */; };
+		59EB763723905F7300F5AE63 /* IJSVGCommandClose.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C623905F7100F5AE63 /* IJSVGCommandClose.m */; };
+		59EB763823905F7300F5AE63 /* IJSVGCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75C723905F7100F5AE63 /* IJSVGCommand.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763923905F7300F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C823905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m */; };
+		59EB763A23905F7300F5AE63 /* IJSVGForeignObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75C923905F7200F5AE63 /* IJSVGForeignObject.m */; };
+		59EB763B23905F7300F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75CA23905F7200F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763C23905F7300F5AE63 /* IJSVGCommandEllipticalArc.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75CB23905F7200F5AE63 /* IJSVGCommandEllipticalArc.m */; };
+		59EB763D23905F7300F5AE63 /* IJSVGGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75CC23905F7200F5AE63 /* IJSVGGroup.m */; };
+		59EB763E23905F7300F5AE63 /* IJSVGView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75CD23905F7200F5AE63 /* IJSVGView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB763F23905F7300F5AE63 /* IJSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75CE23905F7200F5AE63 /* IJSVGForeignObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB764023905F7300F5AE63 /* IJSVGExporterPathInstruction.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75CF23905F7200F5AE63 /* IJSVGExporterPathInstruction.m */; };
+		59EB764123905F7300F5AE63 /* IJSVGImageLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75D023905F7200F5AE63 /* IJSVGImageLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB764223905F7300F5AE63 /* IJSVGStyleSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75D123905F7300F5AE63 /* IJSVGStyleSheet.m */; };
+		59EB764323905F7300F5AE63 /* IJSVGGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75D223905F7300F5AE63 /* IJSVGGradient.m */; };
+		59EB764423905F7300F5AE63 /* IJSVGRendering.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75D323905F7300F5AE63 /* IJSVGRendering.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB764523905F7300F5AE63 /* IJSVGExporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB75D423905F7300F5AE63 /* IJSVGExporter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		59EB764623905F7300F5AE63 /* IJSVGRendering.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EB75D523905F7300F5AE63 /* IJSVGRendering.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		594CF46F238FF38E009B251B /* IJSVG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IJSVG.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		594CF473238FF38E009B251B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		594CF55E238FF462009B251B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		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>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		594CF46C238FF38E009B251B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				599EB4D3238FF570004CB6BC /* libobjc.tbd in Frameworks */,
+				594CF55F238FF462009B251B /* AppKit.framework in Frameworks */,
+				594CF561238FF46C009B251B /* Foundation.framework in Frameworks */,
+				594CF563238FF473009B251B /* QuartzCore.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		594CF465238FF38E009B251B = {
+			isa = PBXGroup;
+			children = (
+				594CF471238FF38E009B251B /* IJSVG */,
+				594CF470238FF38E009B251B /* Products */,
+				594CF55D238FF461009B251B /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		594CF470238FF38E009B251B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				594CF46F238FF38E009B251B /* IJSVG.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		594CF471238FF38E009B251B /* IJSVG */ = {
+			isa = PBXGroup;
+			children = (
+				59EB756423905F3100F5AE63 /* Source */,
+				594CF473238FF38E009B251B /* Info.plist */,
+			);
+			path = IJSVG;
+			sourceTree = "<group>";
+		};
+		594CF55D238FF461009B251B /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				599EB4D2238FF535004CB6BC /* libobjc.tbd */,
+				594CF562238FF473009B251B /* QuartzCore.framework */,
+				594CF560238FF46C009B251B /* Foundation.framework */,
+				594CF55E238FF462009B251B /* AppKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		59EB756423905F3100F5AE63 /* Source */ = {
+			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 = Source;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		594CF46A238FF38E009B251B /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				59EB762623905F7300F5AE63 /* IJSVGImage.h in Headers */,
+				59EB760823905F7300F5AE63 /* IJSVGShapeLayer.h in Headers */,
+				59EB75DF23905F7300F5AE63 /* IJSVGWriter.h in Headers */,
+				59EB760F23905F7300F5AE63 /* IJSVGCommandEllipticalArc.h in Headers */,
+				59EB75F523905F7300F5AE63 /* IJSVGError.h in Headers */,
+				59EB763E23905F7300F5AE63 /* IJSVGView.h in Headers */,
+				59EB75DB23905F7300F5AE63 /* IJSVG.h in Headers */,
+				59EB764423905F7300F5AE63 /* IJSVGRendering.h in Headers */,
+				59EB75DC23905F7300F5AE63 /* IJSVGText.h in Headers */,
+				59EB761C23905F7300F5AE63 /* IJSVGGradient.h in Headers */,
+				59EB75F923905F7300F5AE63 /* IJSVGFontConverter.h in Headers */,
+				59EB75EF23905F7300F5AE63 /* IJSVGCommandQuadraticCurve.h in Headers */,
+				59EB75FC23905F7300F5AE63 /* IJSVGGroup.h in Headers */,
+				59EB760323905F7300F5AE63 /* IJSVGNode.h in Headers */,
+				59EB762023905F7300F5AE63 /* IJSVGCommandMove.h in Headers */,
+				59EB762C23905F7300F5AE63 /* IJSVGPattern.h in Headers */,
+				59EB762923905F7300F5AE63 /* IJSVGStringAdditions.h in Headers */,
+				59EB761A23905F7300F5AE63 /* IJSVGColorList.h in Headers */,
+				59EB762123905F7300F5AE63 /* IJSVGTransform.h in Headers */,
+				59EB763F23905F7300F5AE63 /* IJSVGForeignObject.h in Headers */,
+				59EB75F423905F7300F5AE63 /* IJSVGColor.h in Headers */,
+				59EB760D23905F7300F5AE63 /* IJSVGCommandCurve.h in Headers */,
+				59EB763823905F7300F5AE63 /* IJSVGCommand.h in Headers */,
+				59EB760C23905F7300F5AE63 /* IJSVGStyleSheetRule.h in Headers */,
+				59EB75E323905F7300F5AE63 /* IJSVGRadialGradient.h in Headers */,
+				59EB760523905F7300F5AE63 /* IJSVGUtils.h in Headers */,
+				59EB763B23905F7300F5AE63 /* IJSVGCommandSmoothQuadraticCurve.h in Headers */,
+				59EB75E823905F7300F5AE63 /* IJSVGUnitLength.h in Headers */,
+				59EB762723905F7300F5AE63 /* IJSVGMath.h in Headers */,
+				59EB761523905F7300F5AE63 /* IJSVGStrokeLayer.h in Headers */,
+				59EB762F23905F7300F5AE63 /* IJSVGCache.h in Headers */,
+				59EB75DE23905F7300F5AE63 /* IJSVGCommandVerticalLine.h in Headers */,
+				59EB764123905F7300F5AE63 /* IJSVGImageLayer.h in Headers */,
+				59EB75E023905F7300F5AE63 /* IJSVGStyleSheet.h in Headers */,
+				59EB761423905F7300F5AE63 /* IJSVGImageRep.h in Headers */,
+				59EB761223905F7300F5AE63 /* IJSVGRenderingStyle.h in Headers */,
+				59EB760E23905F7300F5AE63 /* IJSVGPath.h in Headers */,
+				59EB75EA23905F7300F5AE63 /* IJSVGTransaction.h in Headers */,
+				59EB75D723905F7300F5AE63 /* IJSVGGradientLayer.h in Headers */,
+				59EB75F723905F7300F5AE63 /* IJSVGDef.h in Headers */,
+				59EB760623905F7300F5AE63 /* IJSVGCommandHorizontalLine.h in Headers */,
+				59EB762323905F7300F5AE63 /* IJSVGExporterPathInstruction.h in Headers */,
+				59EB761023905F7300F5AE63 /* IJSVGLinearGradient.h in Headers */,
+				59EB75E123905F7300F5AE63 /* IJSVGCommandSmoothCurve.h in Headers */,
+				59EB75D923905F7300F5AE63 /* IJSVGCommandLineTo.h in Headers */,
+				59EB75D623905F7300F5AE63 /* IJSVGLayer.h in Headers */,
+				59EB763023905F7300F5AE63 /* IJSVGPatternLayer.h in Headers */,
+				59EB75F023905F7300F5AE63 /* IJSVGStyleSheetSelectorRaw.h in Headers */,
+				59EB763423905F7300F5AE63 /* IJSVGBezierPathAdditions.h in Headers */,
+				59EB761823905F7300F5AE63 /* IJSVGParser.h in Headers */,
+				59EB761E23905F7300F5AE63 /* IJSVGGroupLayer.h in Headers */,
+				59EB761D23905F7300F5AE63 /* IJSVGStyle.h in Headers */,
+				59EB764523905F7300F5AE63 /* IJSVGExporter.h in Headers */,
+				59EB762823905F7300F5AE63 /* IJSVGCommandClose.h in Headers */,
+				59EB75E423905F7300F5AE63 /* IJSVGGradientUnitLength.h in Headers */,
+				59EB762D23905F7300F5AE63 /* IJSVGLayerTree.h in Headers */,
+				59EB760B23905F7300F5AE63 /* IJSVGStyleSheetSelector.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		594CF46E238FF38E009B251B /* IJSVG */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 594CF477238FF38E009B251B /* Build configuration list for PBXNativeTarget "IJSVG" */;
+			buildPhases = (
+				594CF46A238FF38E009B251B /* Headers */,
+				594CF46B238FF38E009B251B /* Sources */,
+				594CF46C238FF38E009B251B /* Frameworks */,
+				594CF46D238FF38E009B251B /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = IJSVG;
+			productName = IJSVG;
+			productReference = 594CF46F238FF38E009B251B /* IJSVG.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		594CF466238FF38E009B251B /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1100;
+				ORGANIZATIONNAME = "Curtis Hard";
+				TargetAttributes = {
+					594CF46E238FF38E009B251B = {
+						CreatedOnToolsVersion = 11.0;
+					};
+				};
+			};
+			buildConfigurationList = 594CF469238FF38E009B251B /* Build configuration list for PBXProject "IJSVG" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 594CF465238FF38E009B251B;
+			productRefGroup = 594CF470238FF38E009B251B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				594CF46E238FF38E009B251B /* IJSVG */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		594CF46D238FF38E009B251B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		594CF46B238FF38E009B251B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				59EB763123905F7300F5AE63 /* IJSVGText.m in Sources */,
+				59EB760223905F7300F5AE63 /* IJSVGCommandVerticalLine.m in Sources */,
+				59EB75FD23905F7300F5AE63 /* IJSVGPatternLayer.m in Sources */,
+				59EB763923905F7300F5AE63 /* IJSVGCommandSmoothQuadraticCurve.m in Sources */,
+				59EB75D823905F7300F5AE63 /* IJSVGStyleSheetRule.m in Sources */,
+				59EB75FB23905F7300F5AE63 /* IJSVGPath.m in Sources */,
+				59EB760123905F7300F5AE63 /* IJSVGLayerTree.m in Sources */,
+				59EB763A23905F7300F5AE63 /* IJSVGForeignObject.m in Sources */,
+				59EB761123905F7300F5AE63 /* IJSVGCommand.m in Sources */,
+				59EB760923905F7300F5AE63 /* IJSVGCommandCurve.m in Sources */,
+				59EB763323905F7300F5AE63 /* IJSVGLinearGradient.m in Sources */,
+				59EB761923905F7300F5AE63 /* IJSVGCommandSmoothCurve.m in Sources */,
+				59EB761323905F7300F5AE63 /* IJSVG.m in Sources */,
+				59EB763623905F7300F5AE63 /* IJSVGImageLayer.m in Sources */,
+				59EB75EC23905F7300F5AE63 /* IJSVGLayer.m in Sources */,
+				59EB75E523905F7300F5AE63 /* IJSVGStrokeLayer.m in Sources */,
+				59EB763223905F7300F5AE63 /* IJSVGView.m in Sources */,
+				59EB763523905F7300F5AE63 /* IJSVGStyleSheetSelector.m in Sources */,
+				59EB760723905F7300F5AE63 /* IJSVGNode.m in Sources */,
+				59EB75E923905F7300F5AE63 /* IJSVGStringAdditions.m in Sources */,
+				59EB761723905F7300F5AE63 /* IJSVGRadialGradient.m in Sources */,
+				59EB760423905F7300F5AE63 /* IJSVGCache.m in Sources */,
+				59EB75E223905F7300F5AE63 /* IJSVGColorList.m in Sources */,
+				59EB75ED23905F7300F5AE63 /* IJSVGFontConverter.m in Sources */,
+				59EB763C23905F7300F5AE63 /* IJSVGCommandEllipticalArc.m in Sources */,
+				59EB75E723905F7300F5AE63 /* IJSVGImage.m in Sources */,
+				59EB75FF23905F7300F5AE63 /* IJSVGBezierPathAdditions.m in Sources */,
+				59EB75E623905F7300F5AE63 /* IJSVGStyle.m in Sources */,
+				59EB75EB23905F7300F5AE63 /* IJSVGShapeLayer.m in Sources */,
+				59EB75F623905F7300F5AE63 /* IJSVGColor.m in Sources */,
+				59EB75F323905F7300F5AE63 /* IJSVGGroupLayer.m in Sources */,
+				59EB762523905F7300F5AE63 /* IJSVGTransform.m in Sources */,
+				59EB760023905F7300F5AE63 /* IJSVGGradientLayer.m in Sources */,
+				59EB762B23905F7300F5AE63 /* IJSVGUnitLength.m in Sources */,
+				59EB75F823905F7300F5AE63 /* IJSVGCommandHorizontalLine.m in Sources */,
+				59EB75FA23905F7300F5AE63 /* IJSVGWriter.m in Sources */,
+				59EB764623905F7300F5AE63 /* IJSVGRendering.m in Sources */,
+				59EB762E23905F7300F5AE63 /* IJSVGExporter.m in Sources */,
+				59EB761623905F7300F5AE63 /* IJSVGParser.m in Sources */,
+				59EB75DD23905F7300F5AE63 /* IJSVGCommandQuadraticCurve.m in Sources */,
+				59EB762423905F7300F5AE63 /* IJSVGTransaction.m in Sources */,
+				59EB75DA23905F7300F5AE63 /* IJSVGDef.m in Sources */,
+				59EB763723905F7300F5AE63 /* IJSVGCommandClose.m in Sources */,
+				59EB764323905F7300F5AE63 /* IJSVGGradient.m in Sources */,
+				59EB762A23905F7300F5AE63 /* IJSVGGradientUnitLength.m in Sources */,
+				59EB764223905F7300F5AE63 /* IJSVGStyleSheet.m in Sources */,
+				59EB764023905F7300F5AE63 /* IJSVGExporterPathInstruction.m in Sources */,
+				59EB75FE23905F7300F5AE63 /* IJSVGRenderingStyle.m in Sources */,
+				59EB75F223905F7300F5AE63 /* IJSVGStyleSheetSelectorRaw.m in Sources */,
+				59EB75EE23905F7300F5AE63 /* IJSVGImageRep.m in Sources */,
+				59EB762223905F7300F5AE63 /* IJSVGMath.m in Sources */,
+				59EB763D23905F7300F5AE63 /* IJSVGGroup.m in Sources */,
+				59EB761F23905F7300F5AE63 /* IJSVGCommandLineTo.m in Sources */,
+				59EB75F123905F7300F5AE63 /* IJSVGUtils.m in Sources */,
+				59EB760A23905F7300F5AE63 /* IJSVGCommandMove.m in Sources */,
+				59EB761B23905F7300F5AE63 /* IJSVGPattern.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		594CF475238FF38E009B251B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		594CF476238FF38E009B251B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		594CF478238FF38E009B251B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = NO;
+				DEVELOPMENT_TEAM = 9KTR4W9XX6;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = IJSVG/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MARKETING_VERSION = 2.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.iconjar.ijsvg;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		594CF479238FF38E009B251B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = NO;
+				DEVELOPMENT_TEAM = 9KTR4W9XX6;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = IJSVG/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MARKETING_VERSION = 2.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.iconjar.ijsvg;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		594CF469238FF38E009B251B /* Build configuration list for PBXProject "IJSVG" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				594CF475238FF38E009B251B /* Debug */,
+				594CF476238FF38E009B251B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		594CF477238FF38E009B251B /* Build configuration list for PBXNativeTarget "IJSVG" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				594CF478238FF38E009B251B /* Debug */,
+				594CF479238FF38E009B251B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 594CF466238FF38E009B251B /* Project object */;
+}
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:IJSVG.xcodeproj">
+   </FileRef>
+</Workspace>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1120"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "594CF46E238FF38E009B251B"
+               BuildableName = "IJSVG.framework"
+               BlueprintName = "IJSVG"
+               ReferencedContainer = "container:IJSVG.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "594CF46E238FF38E009B251B"
+            BuildableName = "IJSVG.framework"
+            BlueprintName = "IJSVG"
+            ReferencedContainer = "container:IJSVG.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>IJSVG.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>594CF46E238FF38E009B251B</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Curtis Hard. All rights reserved.</string>
+</dict>
+</plist>
@@ -7,6 +7,15 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		343A19181FB2212C000652A2 /* IJSVGGradientUnitLength.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A19171FB2212C000652A2 /* IJSVGGradientUnitLength.m */; };
+		59069A2922D0ED85004DDEA5 /* compuserver_msn_Ford_Focus.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59069A2822D0ED85004DDEA5 /* compuserver_msn_Ford_Focus.svg */; };
+		59069A2B22D0EE0E004DDEA5 /* test (1).svg in Resources */ = {isa = PBXBuildFile; fileRef = 59069A2A22D0EE0E004DDEA5 /* test (1).svg */; };
+		590C87EB201F9888004A1554 /* json.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87EA201F9888004A1554 /* json.svg */; };
+		590C87ED201FA08C004A1554 /* intertwingly.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87EC201FA08C004A1554 /* intertwingly.svg */; };
+		590C87EF201FA093004A1554 /* NewTux.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87EE201FA092004A1554 /* NewTux.svg */; };
+		590C87F1201FBF27004A1554 /* AJ_Digital_Camera.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87F0201FBF27004A1554 /* AJ_Digital_Camera.svg */; };
+		590C87F4201FC9E4004A1554 /* radialgradient2.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87F3201FC9E3004A1554 /* radialgradient2.svg */; };
+		590C87F6201FD0D4004A1554 /* car.svg in Resources */ = {isa = PBXBuildFile; fileRef = 590C87F5201FD0D4004A1554 /* car.svg */; };
 		591704CC1E2016E400012644 /* IJSVGExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 591704CB1E2016E400012644 /* IJSVGExporter.m */; };
 		591A13E11E19838F001D1629 /* IJSVGText.m in Sources */ = {isa = PBXBuildFile; fileRef = 591A13E01E19838F001D1629 /* IJSVGText.m */; };
 		59265CE81C4F840400F333F0 /* css.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59265CE71C4F840400F333F0 /* css.svg */; };
@@ -28,10 +37,13 @@
 		595665DE19B6309C00D805FF /* test.svg in Resources */ = {isa = PBXBuildFile; fileRef = 595665DD19B6309C00D805FF /* test.svg */; };
 		595665E119B630B600D805FF /* SVGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 595665E019B630B600D805FF /* SVGView.m */; };
 		597046A21E24352700A60138 /* IJSVGStrokeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 597046A11E24352700A60138 /* IJSVGStrokeLayer.m */; };
+		597AC83322CFD0FC007C0E42 /* home.svg in Resources */ = {isa = PBXBuildFile; fileRef = 597AC83222CFD0FC007C0E42 /* home.svg */; };
 		5986308719BA104800CF15EA /* linecap.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5986308619BA104800CF15EA /* linecap.svg */; };
 		5986308A19BA106D00CF15EA /* SVGExampleView5.m in Sources */ = {isa = PBXBuildFile; fileRef = 5986308919BA106D00CF15EA /* SVGExampleView5.m */; };
 		5986308C19BA180E00CF15EA /* dashed.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5986308B19BA180E00CF15EA /* dashed.svg */; };
 		598759F61E242C850024CC3F /* IJSVGExporterPathInstruction.m in Sources */ = {isa = PBXBuildFile; fileRef = 598759F51E242C850024CC3F /* IJSVGExporterPathInstruction.m */; };
+		5991A2A9201E30E600913E3B /* gradients.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5991A2A8201E30E600913E3B /* gradients.svg */; };
+		5991A2AB201E310200913E3B /* heart.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5991A2AA201E310200913E3B /* heart.svg */; };
 		599465DC1C4AA87200A2EEF3 /* IJSVGStyleSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 599465D51C4AA87200A2EEF3 /* IJSVGStyleSheet.m */; };
 		599465DD1C4AA87200A2EEF3 /* IJSVGStyleSheetRule.m in Sources */ = {isa = PBXBuildFile; fileRef = 599465D71C4AA87200A2EEF3 /* IJSVGStyleSheetRule.m */; };
 		599465DE1C4AA87200A2EEF3 /* IJSVGStyleSheetSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 599465D91C4AA87200A2EEF3 /* IJSVGStyleSheetSelector.m */; };
@@ -42,6 +54,7 @@
 		59A3DA6D1E283022003E59A9 /* IJSVGTransaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A3DA6C1E283022003E59A9 /* IJSVGTransaction.m */; };
 		59B93C6D19B7D1840063E823 /* paperplane.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59B93C6C19B7D1840063E823 /* paperplane.svg */; };
 		59B93C6F19B7D32C0063E823 /* products.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59B93C6E19B7D32C0063E823 /* products.svg */; };
+		59D1E3A0202279CA00C54672 /* Group.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59D1E39F202279CA00C54672 /* Group.svg */; };
 		59E0F5ED1E29964700F757F7 /* IJSVGUnitLength.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E0F5EC1E29964700F757F7 /* IJSVGUnitLength.m */; };
 		59E2645119BA240D008A6FDB /* IJSVG.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E2641C19BA240D008A6FDB /* IJSVG.m */; };
 		59E2645219BA240D008A6FDB /* IJSVGBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E2641E19BA240D008A6FDB /* IJSVGBezierPathAdditions.m */; };
@@ -76,6 +89,10 @@
 		59E8ABF31E2167D90032A80C /* IJSVGImageLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E8ABF21E2167D90032A80C /* IJSVGImageLayer.m */; };
 		59E8ABF61E2176340032A80C /* IJSVGGroupLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E8ABF51E2176340032A80C /* IJSVGGroupLayer.m */; };
 		59E8ABF91E219C860032A80C /* IJSVGMath.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E8ABF81E219C860032A80C /* IJSVGMath.m */; };
+		59EA311622CF395400DAB3B7 /* IJSVGStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EA310F22CF395400DAB3B7 /* IJSVGStringAdditions.m */; };
+		59EA311722CF395400DAB3B7 /* IJSVGRendering.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EA311022CF395400DAB3B7 /* IJSVGRendering.m */; };
+		59EA311822CF395400DAB3B7 /* IJSVGImageRep.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EA311322CF395400DAB3B7 /* IJSVGImageRep.m */; };
+		59EA311922CF395400DAB3B7 /* IJSVGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59EA311422CF395400DAB3B7 /* IJSVGView.m */; };
 		59F799E219B880CE00096CB7 /* htc_one.svg in Resources */ = {isa = PBXBuildFile; fileRef = 59F799E119B880CE00096CB7 /* htc_one.svg */; };
 /* End PBXBuildFile section */

@@ -90,6 +107,16 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		343A19161FB2212C000652A2 /* IJSVGGradientUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGGradientUnitLength.h; sourceTree = "<group>"; };
+		343A19171FB2212C000652A2 /* IJSVGGradientUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGradientUnitLength.m; sourceTree = "<group>"; };
+		59069A2822D0ED85004DDEA5 /* compuserver_msn_Ford_Focus.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = compuserver_msn_Ford_Focus.svg; sourceTree = "<group>"; };
+		59069A2A22D0EE0E004DDEA5 /* test (1).svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "test (1).svg"; sourceTree = "<group>"; };
+		590C87EA201F9888004A1554 /* json.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = json.svg; sourceTree = "<group>"; };
+		590C87EC201FA08C004A1554 /* intertwingly.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = intertwingly.svg; sourceTree = "<group>"; };
+		590C87EE201FA092004A1554 /* NewTux.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = NewTux.svg; sourceTree = "<group>"; };
+		590C87F0201FBF27004A1554 /* AJ_Digital_Camera.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = AJ_Digital_Camera.svg; sourceTree = "<group>"; };
+		590C87F3201FC9E3004A1554 /* radialgradient2.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = radialgradient2.svg; sourceTree = "<group>"; };
+		590C87F5201FD0D4004A1554 /* car.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = car.svg; sourceTree = "<group>"; };
 		591704CA1E2016E400012644 /* IJSVGExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGExporter.h; sourceTree = "<group>"; };
 		591704CB1E2016E400012644 /* IJSVGExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGExporter.m; sourceTree = "<group>"; };
 		591A13DF1E19838F001D1629 /* IJSVGText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGText.h; sourceTree = "<group>"; };
@@ -130,12 +157,15 @@
 		595665E019B630B600D805FF /* SVGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGView.m; sourceTree = "<group>"; };
 		597046A01E24352700A60138 /* IJSVGStrokeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStrokeLayer.h; sourceTree = "<group>"; };
 		597046A11E24352700A60138 /* IJSVGStrokeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStrokeLayer.m; sourceTree = "<group>"; };
+		597AC83222CFD0FC007C0E42 /* home.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = home.svg; sourceTree = "<group>"; };
 		5986308619BA104800CF15EA /* linecap.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = linecap.svg; sourceTree = "<group>"; };
 		5986308819BA106D00CF15EA /* SVGExampleView5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGExampleView5.h; sourceTree = "<group>"; };
 		5986308919BA106D00CF15EA /* SVGExampleView5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGExampleView5.m; sourceTree = "<group>"; };
 		5986308B19BA180E00CF15EA /* dashed.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dashed.svg; sourceTree = "<group>"; };
 		598759F41E242C850024CC3F /* IJSVGExporterPathInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGExporterPathInstruction.h; sourceTree = "<group>"; };
 		598759F51E242C850024CC3F /* IJSVGExporterPathInstruction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGExporterPathInstruction.m; sourceTree = "<group>"; };
+		5991A2A8201E30E600913E3B /* gradients.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gradients.svg; sourceTree = "<group>"; };
+		5991A2AA201E310200913E3B /* heart.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = heart.svg; sourceTree = "<group>"; };
 		599465D41C4AA87200A2EEF3 /* IJSVGStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheet.h; sourceTree = "<group>"; };
 		599465D51C4AA87200A2EEF3 /* IJSVGStyleSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStyleSheet.m; sourceTree = "<group>"; };
 		599465D61C4AA87200A2EEF3 /* IJSVGStyleSheetRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStyleSheetRule.h; sourceTree = "<group>"; };
@@ -154,6 +184,7 @@
 		59A3DA6C1E283022003E59A9 /* IJSVGTransaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGTransaction.m; sourceTree = "<group>"; };
 		59B93C6C19B7D1840063E823 /* paperplane.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = paperplane.svg; sourceTree = "<group>"; };
 		59B93C6E19B7D32C0063E823 /* products.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = products.svg; sourceTree = "<group>"; };
+		59D1E39F202279CA00C54672 /* Group.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Group.svg; sourceTree = "<group>"; };
 		59E0F5EB1E29964700F757F7 /* IJSVGUnitLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGUnitLength.h; sourceTree = "<group>"; };
 		59E0F5EC1E29964700F757F7 /* IJSVGUnitLength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGUnitLength.m; sourceTree = "<group>"; };
 		59E2641B19BA240D008A6FDB /* IJSVG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVG.h; sourceTree = "<group>"; };
@@ -222,6 +253,14 @@
 		59E8ABF51E2176340032A80C /* IJSVGGroupLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGGroupLayer.m; sourceTree = "<group>"; };
 		59E8ABF71E219C860032A80C /* IJSVGMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGMath.h; sourceTree = "<group>"; };
 		59E8ABF81E219C860032A80C /* IJSVGMath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGMath.m; sourceTree = "<group>"; };
+		59EA310E22CF395300DAB3B7 /* IJSVGImageRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGImageRep.h; sourceTree = "<group>"; };
+		59EA310F22CF395400DAB3B7 /* IJSVGStringAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGStringAdditions.m; sourceTree = "<group>"; };
+		59EA311022CF395400DAB3B7 /* IJSVGRendering.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGRendering.m; sourceTree = "<group>"; };
+		59EA311122CF395400DAB3B7 /* IJSVGRendering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGRendering.h; sourceTree = "<group>"; };
+		59EA311222CF395400DAB3B7 /* IJSVGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGView.h; sourceTree = "<group>"; };
+		59EA311322CF395400DAB3B7 /* IJSVGImageRep.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGImageRep.m; sourceTree = "<group>"; };
+		59EA311422CF395400DAB3B7 /* IJSVGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IJSVGView.m; sourceTree = "<group>"; };
+		59EA311522CF395400DAB3B7 /* IJSVGStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IJSVGStringAdditions.h; sourceTree = "<group>"; };
 		59F799E119B880CE00096CB7 /* htc_one.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = htc_one.svg; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -291,6 +330,18 @@
 		5956657A19B62F4600D805FF /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				59069A2A22D0EE0E004DDEA5 /* test (1).svg */,
+				59069A2822D0ED85004DDEA5 /* compuserver_msn_Ford_Focus.svg */,
+				597AC83222CFD0FC007C0E42 /* home.svg */,
+				59D1E39F202279CA00C54672 /* Group.svg */,
+				590C87F5201FD0D4004A1554 /* car.svg */,
+				590C87F3201FC9E3004A1554 /* radialgradient2.svg */,
+				590C87F0201FBF27004A1554 /* AJ_Digital_Camera.svg */,
+				590C87EC201FA08C004A1554 /* intertwingly.svg */,
+				590C87EE201FA092004A1554 /* NewTux.svg */,
+				590C87EA201F9888004A1554 /* json.svg */,
+				5991A2AA201E310200913E3B /* heart.svg */,
+				5991A2A8201E30E600913E3B /* gradients.svg */,
 				59265CE71C4F840400F333F0 /* css.svg */,
 				59459CEB19B906FE00CE493B /* clipped.svg */,
 				59F799E119B880CE00096CB7 /* htc_one.svg */,
@@ -335,6 +386,14 @@
 		59E2641A19BA240D008A6FDB /* source */ = {
 			isa = PBXGroup;
 			children = (
+				59EA310E22CF395300DAB3B7 /* IJSVGImageRep.h */,
+				59EA311322CF395400DAB3B7 /* IJSVGImageRep.m */,
+				59EA311122CF395400DAB3B7 /* IJSVGRendering.h */,
+				59EA311022CF395400DAB3B7 /* IJSVGRendering.m */,
+				59EA311522CF395400DAB3B7 /* IJSVGStringAdditions.h */,
+				59EA310F22CF395400DAB3B7 /* IJSVGStringAdditions.m */,
+				59EA311222CF395400DAB3B7 /* IJSVGView.h */,
+				59EA311422CF395400DAB3B7 /* IJSVGView.m */,
 				59A3DA6B1E283022003E59A9 /* IJSVGTransaction.h */,
 				59A3DA6C1E283022003E59A9 /* IJSVGTransaction.m */,
 				598759F41E242C850024CC3F /* IJSVGExporterPathInstruction.h */,
@@ -392,6 +451,8 @@
 				59E2643C19BA240D008A6FDB /* IJSVGForeignObject.m */,
 				59E2643D19BA240D008A6FDB /* IJSVGGradient.h */,
 				59E2643E19BA240D008A6FDB /* IJSVGGradient.m */,
+				343A19161FB2212C000652A2 /* IJSVGGradientUnitLength.h */,
+				343A19171FB2212C000652A2 /* IJSVGGradientUnitLength.m */,
 				59E2643F19BA240D008A6FDB /* IJSVGGroup.h */,
 				59E2644019BA240D008A6FDB /* IJSVGGroup.m */,
 				59E2644119BA240D008A6FDB /* IJSVGLinearGradient.h */,
@@ -483,7 +544,7 @@
 		5956656F19B62F4600D805FF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Curtis Hard";
 				TargetAttributes = {
 					5956657619B62F4600D805FF = {
@@ -500,6 +561,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -521,13 +583,25 @@
 			files = (
 				59B93C6D19B7D1840063E823 /* paperplane.svg in Resources */,
 				5956658219B62F4600D805FF /* Images.xcassets in Resources */,
+				590C87ED201FA08C004A1554 /* intertwingly.svg in Resources */,
+				590C87F1201FBF27004A1554 /* AJ_Digital_Camera.svg in Resources */,
+				59069A2B22D0EE0E004DDEA5 /* test (1).svg in Resources */,
+				590C87EF201FA093004A1554 /* NewTux.svg in Resources */,
 				59265CE81C4F840400F333F0 /* css.svg in Resources */,
 				595665DE19B6309C00D805FF /* test.svg in Resources */,
+				597AC83322CFD0FC007C0E42 /* home.svg in Resources */,
+				590C87EB201F9888004A1554 /* json.svg in Resources */,
+				59D1E3A0202279CA00C54672 /* Group.svg in Resources */,
 				59F799E219B880CE00096CB7 /* htc_one.svg in Resources */,
 				59B93C6F19B7D32C0063E823 /* products.svg in Resources */,
+				5991A2A9201E30E600913E3B /* gradients.svg in Resources */,
+				59069A2922D0ED85004DDEA5 /* compuserver_msn_Ford_Focus.svg in Resources */,
 				5986308719BA104800CF15EA /* linecap.svg in Resources */,
 				5956658519B62F4600D805FF /* MainMenu.xib in Resources */,
+				590C87F4201FC9E4004A1554 /* radialgradient2.svg in Resources */,
 				59459CEC19B906FE00CE493B /* clipped.svg in Resources */,
+				590C87F6201FD0D4004A1554 /* car.svg in Resources */,
+				5991A2AB201E310200913E3B /* heart.svg in Resources */,
 				5986308C19BA180E00CF15EA /* dashed.svg in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -550,6 +624,7 @@
 				59E2646919BA240D008A6FDB /* IJSVGStyle.m in Sources */,
 				59E2646419BA240D008A6FDB /* IJSVGLinearGradient.m in Sources */,
 				595665DC19B6302600D805FF /* README.md in Sources */,
+				59EA311922CF395400DAB3B7 /* IJSVGView.m in Sources */,
 				5941DAFD1CF9BC9B00B3A911 /* IJSVGImage.m in Sources */,
 				599465DE1C4AA87200A2EEF3 /* IJSVGStyleSheetSelector.m in Sources */,
 				5948DED61BB2BFE5004156FF /* IJSVGWriter.m in Sources */,
@@ -557,6 +632,7 @@
 				5986308A19BA106D00CF15EA /* SVGExampleView5.m in Sources */,
 				59E2645619BA240D008A6FDB /* IJSVGCommandArc.m in Sources */,
 				59E8ABF91E219C860032A80C /* IJSVGMath.m in Sources */,
+				343A19181FB2212C000652A2 /* IJSVGGradientUnitLength.m in Sources */,
 				59265CEB1C4F843E00F333F0 /* SVGExampleView6.m in Sources */,
 				5941DAFE1CF9BC9B00B3A911 /* IJSVGPattern.m in Sources */,
 				59E8ABF01E211EDB0032A80C /* IJSVGShapeLayer.m in Sources */,
@@ -577,6 +653,7 @@
 				5956658019B62F4600D805FF /* AppDelegate.m in Sources */,
 				59E2646519BA240D008A6FDB /* IJSVGNode.m in Sources */,
 				591A13E11E19838F001D1629 /* IJSVGText.m in Sources */,
+				59EA311822CF395400DAB3B7 /* IJSVGImageRep.m in Sources */,
 				59A11E6C19B89CEA00E44498 /* SVGExampleView1.m in Sources */,
 				59A3DA6D1E283022003E59A9 /* IJSVGTransaction.m in Sources */,
 				59E2646A19BA240D008A6FDB /* IJSVGTransform.m in Sources */,
@@ -588,6 +665,7 @@
 				598759F61E242C850024CC3F /* IJSVGExporterPathInstruction.m in Sources */,
 				59E2645E19BA240D008A6FDB /* IJSVGCommandSmoothCurve.m in Sources */,
 				59E2645819BA240D008A6FDB /* IJSVGCommandCommandSmoothQuadraticCurve.m in Sources */,
+				59EA311622CF395400DAB3B7 /* IJSVGStringAdditions.m in Sources */,
 				59E2645D19BA240D008A6FDB /* IJSVGCommandQuadraticCurve.m in Sources */,
 				59E2646719BA240D008A6FDB /* IJSVGPath.m in Sources */,
 				59E8ABED1E211EBE0032A80C /* IJSVGLayer.m in Sources */,
@@ -596,6 +674,7 @@
 				59A11E7219B89D6600E44498 /* SVGExampleView3.m in Sources */,
 				59E0F5ED1E29964700F757F7 /* IJSVGUnitLength.m in Sources */,
 				5956657D19B62F4600D805FF /* main.m in Sources */,
+				59EA311722CF395400DAB3B7 /* IJSVGRendering.m in Sources */,
 				59A11E6F19B89D2000E44498 /* SVGExampleView2.m in Sources */,
 				5948DED51BB2BFE5004156FF /* IJSVGFontConverter.m in Sources */,
 				59E2646319BA240D008A6FDB /* IJSVGGroup.m in Sources */,
@@ -676,7 +755,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx10.12;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -712,7 +791,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx10.12;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D72EFE5A8E718DCC42CFCBCE6A16E2165A4F6596",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "D72EFE5A8E718DCC42CFCBCE6A16E2165A4F6596" : 0,
+    "91965C60FB9217304DAC6A57C88233440365843F" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "83EE8FFF-CAF0-4D33-92A0-4CA5D3A6A33C",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "D72EFE5A8E718DCC42CFCBCE6A16E2165A4F6596" : "IJSVG\/",
+    "91965C60FB9217304DAC6A57C88233440365843F" : "..\/..\/.."
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "IJSVGExample",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "IJSVGExample\/IJSVGExample.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/daveyheuser\/Iconjar-mac.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "91965C60FB9217304DAC6A57C88233440365843F"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/curthard89\/IJSVG.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D72EFE5A8E718DCC42CFCBCE6A16E2165A4F6596"
+    }
+  ]
+}
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Bucket
+   uuid = "21141E92-29FD-4CF6-AB04-0D4E4FD9A4AC"
   type = "1"
   version = "2.0">
 </Bucket>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0920"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -37,10 +37,11 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -62,17 +63,22 @@
            ReferencedContainer = "container:IJSVGExample.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "5956657619B62F4600D805FF"
@@ -85,12 +91,13 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "5956657619B62F4600D805FF"
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14835.7"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -666,23 +667,24 @@
                    </menu>
                </menuItem>
            </items>
+            <point key="canvasLocation" x="139" y="154"/>
        </menu>
-        <window title="IJSVGExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="IJSVGExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" appearanceType="aqua" animationBehavior="default" id="QvC-M9-y7g">
            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="335" y="390" width="556" height="679"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="contentRect" x="335" y="390" width="600" height="479"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1669"/>
            <view key="contentView" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="556" height="679"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="479"/>
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
-                    <customView misplaced="YES" id="hhC-1S-CCX" customClass="SVGView">
-                        <rect key="frame" x="0.0" y="0.0" width="556" height="679"/>
+                    <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hhC-1S-CCX" customClass="SVGView">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="479"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                    </customView>
                </subviews>
            </view>
-            <point key="canvasLocation" x="550" y="495.5"/>
+            <point key="canvasLocation" x="98" y="496.5"/>
        </window>
    </objects>
 </document>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="193px" height="172px" viewBox="0 0 193 172" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>Group</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group">
+            <rect id="Rectangle-Copy" fill="#E80000" x="53" y="41" width="140" height="131"></rect>
+            <rect id="Rectangle" fill="#1813DF" x="0" y="0" width="140" height="131"></rect>
+        </g>
+    </g>
+</svg>
@@ -0,0 +1,72 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500pt" height="800">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#3f2600" stop-opacity=".6"/>
+      <stop offset="1" stop-color="#3f2600" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="d">
+      <stop offset="0" stop-color="#fff" stop-opacity=".65"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="e">
+      <stop offset="0" stop-color="#ffa63f"/>
+      <stop offset="1" stop-color="#ff0"/>
+    </linearGradient>
+    <linearGradient id="b">
+      <stop offset="0" stop-color="#ffeed7"/>
+      <stop offset="1" stop-color="#bdbfc2"/>
+    </linearGradient>
+    <linearGradient id="c">
+      <stop offset="0" stop-color="#fff" stop-opacity=".8"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    </linearGradient>
+    <radialGradient id="f" cx="446.77762" cy="1219.4125" r="195.07191" fx="446.77762" fy="1219.4125" gradientTransform="scale(1.04523 .95673)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+    <linearGradient id="g" x1="400.57785" x2="400.84448" y1="369.53015" y2="304.07886" gradientTransform="scale(.57526 1.73834)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="h" x1="303.01761" x2="297.0856" y1="237.93179" y2="330.09561" gradientTransform="scale(1.11607 .896)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+    <linearGradient id="i" x1="378.93771" x2="380.27319" y1="278.60202" y2="243.91606" gradientTransform="scale(.8165 1.22474)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="j" x1="381.38742" x2="380.5517" y1="277.495" y2="245.68338" gradientTransform="scale(.8165 1.22474)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="k" x1="379.09573" x2="376.79556" y1="240.92712" y2="281.01636" gradientTransform="scale(.8165 1.22474)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="l" x1="389.63535" x2="387.06866" y1="242.28218" y2="281.32513" gradientTransform="scale(.8165 1.22474)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="m" x1="437.57941" x2="437.57941" y1="528.87177" y2="394.10361" gradientTransform="scale(.81285 1.23023)" gradientUnits="userSpaceOnUse" spreadMethod="reflect" xlink:href="#b"/>
+    <linearGradient id="n" x1="375.17325" x2="377.48541" y1="419.78485" y2="324.03815" gradientTransform="scale(.64978 1.53897)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="o" x1="320.75104" x2="321.32224" y1="498.17776" y2="614.50439" gradientTransform="scale(1.0748 .9304)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+    <linearGradient id="p" x1="322.48257" x2="323.2514" y1="435.26761" y2="488.48251" gradientTransform="scale(1.077 .9285)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="q" x1="411.2215" x2="411.2215" y1="242.94365" y2="331.44858" gradientTransform="scale(.5717 1.74915)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="r" x1="867.34546" x2="867.33453" y1="234.73897" y2="314.83911" gradientTransform="scale(.57267 1.74621)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="s" x1="236.25362" x2="212.5099" y1="657.11133" y2="737.41229" gradientTransform="scale(1.01151 .98862)" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
+    <linearGradient id="t" x1="381.56607" x2="279.64313" y1="655.73102" y2="386.66583" gradientTransform="scale(1.0655 .93853)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+    <linearGradient id="u" x1="218.11714" x2="203.12654" y1="630.30475" y2="737.8537" gradientTransform="scale(1.00985 .99025)" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
+    <linearGradient id="v" x1="117.88966" x2="182.24524" y1="587.23602" y2="704.73077" gradientTransform="scale(1.00772 .99233)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="w" x1="223.10072" x2="230.53499" y1="570.41809" y2="710.97723" gradientTransform="scale(.9995 1.0005)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="x" x1="316.93988" x2="371.60889" y1="474.01779" y2="582.63507" gradientTransform="scale(1.0655 .93853)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+    <linearGradient id="y" x1="284.68652" x2="285.45923" y1="410.46326" y2="485.69934" gradientTransform="scale(1.21868 .82056)" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
+    <linearGradient id="z" x1="288.82358" x2="288.37628" y1="398.85422" y2="482.55939" gradientTransform="scale(1.22194 .81837)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+  </defs>
+  <path fill="url(#f)" d="M670.88202 1166.6423a203.89551 186.63016 0 1 1-407.79102 0 203.89551 186.63016 0 1 1 407.79102 0z" transform="matrix(1.4177 0 0 .41474 -349.5468 157.94132)"/>
+  <path d="M154.23535 558.54232c-27.985-40.27875-33.4425-171.23 31.85875-251.7875 32.3575-38.6475 40.6125-65.58125 43.16375-101.74125 1.73625-41.22375-29.15625-164.3025 87.35375-173.68 118.0075-9.415 111.67 107.075 110.99125 168.71875-.56375 52.05 38.2175 81.55125 64.745 122.11875 49.09875 74.5375 44.94625 202.875-9.24875 272.34-68.64625 86.96-127.44125 49.2475-166.4875 52.4125-73.11625 4.0025-75.53375 42.98875-162.37625-88.38125z"/>
+  <path fill="url(#g)" d="M246.571 470.864c-12.239 12.496-44.396 69.092 4.869 105.36 17.369 12.633-16.377 59.495-32.005 36.308-27.57-41.618-8.831-106.941 8.315-130.188 11.652-16.487 29.23-22.676 18.821-11.48z" transform="matrix(-1.67739 -.02245 -.02112 1.4709 862.8276 -357.26968)"/>
+  <path stroke="#000" stroke-width=".97729802" d="M256.513 459.837c-19.915 17.717-56.176 80.091-3.288 120.606 17.37 12.632-15.393 52.463-33.79 32.089-63.963-70.82 1.669-152.254 24.262-180.25 20.192-24.347 38.078 5.752 12.816 27.555z" transform="matrix(-1.67755 0 0 1.52374 863.8676 -382.33468)"/>
+  <path fill="url(#h)" d="M399.56879 258.15753a58.37323 46.863022 0 1 1-116.74646 0 58.37323 46.863022 0 1 1 116.74646 0z" transform="matrix(1.26626 -.07137 -.04598 1.19574 -108.6094 -190.01368)"/>
+  <path fill="url(#i)" d="M328.86324 320.64151a18.087479 27.131195 0 1 1-36.17496 0 18.087479 27.131195 0 1 1 36.17496 0z" transform="matrix(1.30445 -.07553 .07713 1.34257 -165.9954 -241.86968)"/>
+  <path fill="url(#j)" d="M328.86324 320.64151a18.087479 27.131195 0 1 1-36.17496 0 18.087479 27.131195 0 1 1 36.17496 0z" transform="matrix(-1.81082 .04951 .03173 1.55333 896.7076 -349.02968)"/>
+  <path d="M326.35672821 170.5767474a14.88487384 23.14205282 2.00317994 1 0 29.77908237.06371242 14.88487384 23.14205282 2.00317994 1 0-29.77908237-.06371242zm-52.12561644.13467082a10.82556484 19.2435689-4.93566296 1 1-21.50167273 2.6153013 10.82556484 19.2435689-4.93566296 1 1 21.50167273-2.6153013z"/>
+  <path fill="url(#k)" d="M328.86324 320.64151a18.087479 27.131195 0 1 1-36.17496 0 18.087479 27.131195 0 1 1 36.17496 0z" transform="matrix(-.48032 -.03645 -.0468 .4756 502.7436 22.75972)"/>
+  <path fill="url(#l)" d="M328.86324 320.64151a18.087479 27.131195 0 1 1-36.17496 0 18.087479 27.131195 0 1 1 36.17496 0z" transform="matrix(.35691 -.04082 .04132 .39854 138.5816 50.73832)"/>
+  <path fill="url(#m)" d="M258.702 495.425c12.836-29.103 40.114-80.226 40.695-119.758 0-31.442 94.179-38.951 101.737-7.558 7.558 31.393 26.741 78.483 38.95 101.156 12.208 22.672 47.809 94.695 9.884 157.546-34.157 55.644-137.725 99.666-193.01-7.557-18.603-37.207-15.285-83.315 1.744-123.829z" transform="matrix(1.25 0 0 1.25 -125.2984 -232.48268)"/>
+  <path fill="url(#n)" d="M242.905 473.815c-11.263 18.967-35.5 69.309 12.137 102.047 51.311 34.82 46.473 97.062-15.607 61.955-56.777-31.789-22.845-137.778-4.51-162.266 12.107-17.214 29.897-38.031 7.98-1.736z" transform="matrix(1.38936 -.11107 .10221 1.30214 -202.3394 -230.19068)"/>
+  <path stroke="#000" stroke-width="1.5625" d="M195.34285 330.39232c-21.83125 35.635-74.22125 119.76625-4.11 163.40375 94.46125 57.94375 67.71625 115.88875-18.49875 63.7175-121.38625-72.83-14.78125-219.52 33.91375-275.4225 55.555-62.75 10.6925 11.35875-11.305 48.30125z"/>
+  <path fill="url(#o)" d="M421.481 504.727c0 32.412-29.272 74.516-79.528 74.138-51.828.455-73.949-41.726-73.949-74.138 0-32.412 34.379-58.717 76.739-58.717 42.359 0 76.738 26.305 76.738 58.717z" font-size="12" transform="matrix(1.30209 0 0 1.22525 -140.7104 -217.80968)"/>
+  <path fill="url(#p)" d="M398.227 412.292c-.612 38.572-23.18 47.671-51.74 47.671-28.561 0-49.292-5.694-51.741-47.671 0-26.314 23.18-41.542 51.741-41.542 28.56 0 51.74 15.228 51.74 41.542z" font-size="12" transform="matrix(1.1868 0 0 1.06708 -100.1294 -164.33068)"/>
+  <path fill="url(#q)" d="M234.285 456.475c17.716-26.996 55.015-68.364 6.977 5.813-38.951 61.043-14.403 100.273-1.744 111.039 36.527 32.562 34.966 54.349 6.395 37.206-61.625-36.626-48.835-98.248-11.628-154.058z" transform="matrix(1.25 0 0 1.25 -125.2984 -231.75768)"/>
+  <path fill="url(#r)" d="M490.662 467.52c-15.319-31.701-64.134-111.902 2.326-18.603 60.461 84.297 18.022 143.013 10.464 148.827-7.557 5.813-33.137 17.44-25.579-2.907 7.557-20.347 45.234-58.973 12.789-127.317z" transform="matrix(1.25 0 0 1.25 -125.2984 -231.75768)"/>
+  <path fill="url(#s)" stroke="#e68c3f" stroke-width="6.25" d="M220.915 716.921c-40.442-21.416-99.252 4.124-77.902-54.066 4.276-13.238-6.375-33.008.581-45.926 8.139-15.698 25.58-12.209 36.045-22.674 10.318-10.891 16.859-29.649 36.044-26.742 19.184 2.907 31.945 26.461 45.344 55.229 9.883 20.638 44.941 49.664 42.65 72.758-2.696 35.5-43.027 42.19-82.762 21.421z" transform="matrix(1.25 0 0 1.25 -125.2984 -231.75768)"/>
+  <path fill="url(#t)" d="M415.072 495.764c-3.007 24.906-35.813 76.627-69.518 81.534-34.26 5.336-66.432-34.06-74.147-71.114-9.889-41.206 22.587-57.6 71.938-56.627 53.301 1.654 74.121 13.891 71.727 46.207z" font-size="12" transform="matrix(.5982 .26858 -.23962 .61721 389.8156 76.21132)"/>
+  <path fill="url(#u)" stroke="#e68c3f" stroke-width="6.25067997" d="M220.274 718.402c-41.327-23.59-99.894 5.605-77.261-55.547 4.736-13.068-6.596-33.552.36-46.47 8.139-15.698 25.801-11.665 36.266-22.13 10.318-10.891 18.827-27.868 38.012-24.961 19.184 2.907 29.977 24.68 43.376 53.448 9.883 20.638 43.415 48.971 41.124 72.065-2.696 35.5-42.724 45.471-81.877 23.595z" transform="matrix(-1.1685 .42314 .47528 1.16478 417.5906 -278.07368)"/>
+  <path fill="url(#v)" d="M216.482 675.68c-86.531-57.503-47.308-70.96-36.843-81.425 10.318-10.891 18.827-27.868 38.012-24.961 19.184 2.907 29.977 24.68 43.376 53.448 9.883 20.638 43.06 48.918 41.124 72.065-2.616 27.11-48.19 5.487-85.669-19.127z" transform="matrix(-.9451 .34375 .42408 .95606 403.5756 -128.59468)"/>
+  <path fill="url(#w)" d="M216.506 677.071c-86.531-57.503-46.797-73.57-33.946-81.28 15.399-9.942 15.158-30.831 34.343-27.924 19.184 2.907 30.725 26.107 44.124 54.875 9.883 20.638 43.06 48.918 41.124 72.065-2.616 27.11-48.166 6.878-85.645-17.736z" transform="matrix(1.00431 -.05229 -.0174 1.04575 -66.5614 -92.71798)"/>
+  <path d="M514.16392618 492.89388153c-6.69409764 11.6729672-34.29007759 30.19600752-52.6812594 25.36804862-18.76593057-4.73521422-27.21700072-31.1485461-23.54211688-51.13877146 3.41150018-22.51206827 23.54139341-23.63093696 48.7850296-12.52637614 27.13954878 12.29170413 35.346749 22.8266733 27.43834668 38.29709898z" font-size="12"/>
+  <path fill="url(#x)" d="M415.072 495.764c-3.007 24.906-35.813 76.627-69.518 81.534-34.26 5.336-66.432-34.06-74.147-71.114-9.889-41.206 22.587-57.6 71.938-56.627 53.301 1.654 74.121 13.891 71.727 46.207z" font-size="12" transform="matrix(.35123 .14946 -.12886 .34347 413.7696 254.03832)"/>
+  <path fill="url(#y)" stroke="#e68c3f" stroke-width="3.75" d="M309.954 338.729c7.147-6.77 24.811-27.066 57.961-5.755 6.162 4.01 11.162 4.377 23.021 9.455 23.726 9.749 12.382 33.259-12.744 41.108-10.758 3.489-20.536 16.556-40.129 15.439-16.734-.977-21.119-11.874-31.398-17.906-18.269-10.311-20.965-24.254-11.1-31.653 9.866-7.399 13.725-10.059 14.389-10.688z" transform="matrix(1.25 0 0 1.25 -125.2984 -231.75768)"/>
+  <path fill="none" stroke="#e68c3f" stroke-width="3.125" d="M363.76535 215.29857c-12.35375.72625-39.24125 27.61375-67.5825 27.61375-28.34125 0-45.055-26.16125-49.415-26.16125"/>
+  <path fill="url(#z)" d="M309.954 338.729c7.147-6.77 29.691-25.348 59.588-6.328 6.299 3.766 12.804 7.865 22.478 13.464 19.162 11.748 9.671 28.678-13.286 39.39-10.418 4.495-27.593 14.415-40.671 13.721-14.533-1.408-23.935-11.399-33.567-17.906-17.67-12.303-16.597-22.237-8.389-30.508 6.205-5.679 13.183-11.204 13.847-11.833z" transform="matrix(.62789 0 0 .59567 81.6136 -12.43538)"/>
+</svg>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="447px" height="336px" viewBox="0 0 447 336" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>Rectangle</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#1E54F6" offset="0%"></stop>
+            <stop stop-color="#EE2323" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="447" height="336"></rect>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Rectangle">
+            <use fill="#D8D8D8" fill-rule="evenodd" xlink:href="#path-2"></use>
+            <rect stroke="url(#linearGradient-1)" stroke-width="10" x="5" y="5" width="437" height="326"></rect>
+        </g>
+    </g>
+</svg>
@@ -12,7 +12,7 @@

 - (IJSVG *)svg
 {
-    return [[IJSVG svgNamed:@"paperplane"] retain];
+    return [[IJSVG svgNamed:@"heart"] retain];
 }

@end
@@ -11,10 +11,9 @@

@interface SVGView : NSView {
 
+@private
    IJSVG * svg;
    
 }

-
-
@end
@@ -22,8 +22,9 @@
    if( ( self = [super initWithFrame:frameRect] ) != nil )
    {
        svg = [self svg];
+        svg.renderQuality = IJSVGRenderQualityFullResolution;
        svg.renderingBackingScaleHelper = ^{
-            return [svg computeBackingScale:self.window.backingScaleFactor];
+            return self.window.backingScaleFactor;
        };
    }
    return self;
@@ -31,7 +32,7 @@

 - (IJSVG *)svg
 {
-    return [[IJSVG svgNamed:@"test"] retain];
+    return [IJSVG svgNamed:@"test (1)"];
 }

 - (void)drawRect:(NSRect)dirtyRect
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     width="595.279px" height="841.89px" viewBox="0 0 595.279 841.89" enable-background="new 0 0 595.279 841.89"
+     xml:space="preserve">
+<radialGradient id="SVGID_1_" cx="229.116" cy="650.3413" r="160.6544" gradientTransform="matrix(0.1736 0.9848 0.4924 -0.0868 -59.0956 137.9539)" gradientUnits="userSpaceOnUse">
+    <stop  offset="0" style="stop-color:#FFFFFF"/>
+    <stop  offset="0.0573" style="stop-color:#CECECE"/>
+    <stop  offset="0.1221" style="stop-color:#9E9E1F"/>
+    <stop  offset="0.1907" style="stop-color:#74D974"/>
+    <stop  offset="0.2638" style="stop-color:#5050D1"/>
+    <stop  offset="0.5767" style="stop-color:#D44033"/>
+    <stop  offset="0.6687" style="stop-color:#D000FF"/>
+    <stop  offset="0.773" style="stop-color:#0C0CE3"/>
+    <stop  offset="0.8528" style="stop-color:#030303"/>
+    <stop  offset="0.9632" style="stop-color:#000000"/>
+</radialGradient>
+<ellipse fill="url(#SVGID_1_)" stroke="#000000" stroke-miterlimit="10" cx="251.667" cy="315.818" rx="185.064" ry="131.819"/>
+</svg>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf8" standalone="no"?>
+<svg viewBox="0 0 372.77139 350.83377" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<clipPath id="clipPath4110">
+<path d="m1349.1479-106.15129v-302.89728c-47.8699-80.88268-146.0391-44.39418-170.2081,0-74.5507,130.56653 130.5076,196.53622 170.2081,302.89728z"/>
+<path d="m1349.1479-106.15129v-302.89728c47.8699-80.88268 146.0391-44.39418 170.2081,0 74.5507,130.56653-130.5076,196.53622-170.2081,302.89728z"/>
+</clipPath>
+<filter height="1.35511" id="filter4031" width="1.33422" x="-.16711" y="-.17756">
+<feGaussianBlur stdDeviation="25.9554"/>
+</filter>
+<linearGradient id="linearGradient4159">
+<stop offset="0" stop-color="#fff"/>
+<stop offset="1" stop-color="#fff" stop-opacity="0"/>
+</linearGradient>
+<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient4169" x2="0" xlink:href="#linearGradient4159" y1="386.94983" y2="490.03617"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient4165" x2="0" xlink:href="#linearGradient4159" y1="387.32314" y2="490.40948"/>
+</defs>
+<g transform="translate(-202.18571,-396.94529)">
+<g clip-path="url(#clipPath4110)" transform="translate(-960.57649,853.93036)">
+<path d="m1349.1479-106.15129v-302.89728c-47.8699-80.88268-146.0391-44.39418-170.2081,0-74.5507,130.56653 130.5076,196.53622 170.2081,302.89728z"/>
+<path d="m1349.1479-106.15129v-302.89728c47.8699-80.88268 146.0391-44.39418 170.2081,0 74.5507,130.56653-130.5076,196.53622-170.2081,302.89728z"/>
+</g>
+<g clip-path="url(#clipPath4110)" fill="#f00" filter="url(#filter4031)" transform="translate(-960.57649,853.93036)">
+<path d="m1349.1479-106.15129v-302.89728c-47.8699-80.88268-146.0391-44.39418-170.2081,0-74.5507,130.56653 130.5076,196.53622 170.2081,302.89728z" fill="#f00"/>
+<path d="m1349.1479-106.15129v-302.89728c47.8699-80.88268 146.0391-44.39418 170.2081,0 74.5507,130.56653-130.5076,196.53622-170.2081,302.89728z" fill="#f00"/>
+</g>
+<path d="m370.99493,455.63757c0,30.71925-28.70788,20.90496-64.58143,20.90496s-65.328,9.81429-65.328-20.90496 29.08123-55.62213 64.95466-55.62213 64.95477,24.90287 64.95477,55.62213z" fill="url(#linearGradient4165)"/>
+<path d="m535.62152,455.26427c0,30.71925-28.7079,20.90496-64.5815,20.90496s-65.328,9.81429-65.328-20.90496 29.0813-55.62213 64.9547-55.62213 64.9548,24.90287 64.9548,55.62213z" fill="url(#linearGradient4169)"/>
+</g>
+</svg>
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="508" height="508" version="1.1" viewBox="0 0 508 508" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!--Generated by IJSVG (https://github.com/iconjar/IJSVG)-->
+    <defs>
+        <linearGradient id="a" x1="0.145454" x2="0.599999" y1="0.257812" y2="0.570312" gradientTransform="matrix(1,0,0,1,-7.61378e-09,-1.86769e-08)">
+            <stop offset="0%" stop-color="#FBDDB2" stop-opacity="0.99"></stop>
+            <stop offset="100%" stop-color="#EFA81A" stop-opacity="0.95"></stop>
+        </linearGradient>
+        <linearGradient id="b" x1="-0.0270271" x2="0.783784" y1="0.46875" y2="0.476562" gradientTransform="matrix(1,0,0,1,3.52391e-08,-2.90476e-08)">
+            <stop offset="0%" stop-color="#787878" stop-opacity="0.99"></stop>
+            <stop offset="100%" stop-color="#FFF" stop-opacity="0.99"></stop>
+        </linearGradient>
+        <linearGradient id="c" x1="0.235289" x2="0.672269" y1="0.265619" y2="0.59375" gradientTransform="matrix(1,0,0,1,1.18803e-07,-1.01189e-08)" xlink:href="#b"></linearGradient>
+        <linearGradient id="d" x1="0.981639" x2="0.146789" y1="0.0312495" y2="0.601562" gradientTransform="matrix(1,0,0,1,-5.18186e-08,1.7497e-08)" xlink:href="#b"></linearGradient>
+        <linearGradient id="e" x1="1.20507" x2="0.102482" y1="0.523438" y2="0.515617" gradientTransform="matrix(1,0,0,1,8.20491e-05,8.70101e-06)" xlink:href="#b"></linearGradient>
+        <radialGradient id="f" fx="-0.0123102%" fy="-0.0135221%" cx="-0.000123102" cy="-0.000135221" r="0.981982" gradientTransform="matrix(0.897766,0,0,1.11388,0.194914,0.125151)" xlink:href="#a"></radialGradient>
+        <linearGradient id="g" x1="0.242009" x2="0.497717" y1="0.382812" y2="0.507812" gradientTransform="matrix(1,0,0,1,5.50934e-10,1.51001e-09)">
+            <stop offset="0%" stop-color="#CA536D" stop-opacity="0.99"></stop>
+            <stop offset="100%" stop-color="#A81837" stop-opacity="0.95"></stop>
+        </linearGradient>
+    </defs>
+    <g transform="scale(1.00011)">
+        <path fill="url(#a)" fill-rule="evenodd" stroke="#580400" stroke-width="11.905" d="M126.604,52.0403h51.3235v120.598h-51.3235Z"></path>
+        <path fill="none" fill-rule="evenodd" stroke="#154850" stroke-linejoin="round" stroke-width="11.905" d="M111.364,481.507c270.797,-1.602 272.4,0 272.4,0l-1.603,-227.534l-134.597,-132.995l-134.598,136.2c-1.603,1.602 1.42109e-14,222.727 -1.602,224.329Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+        <path fill="url(#b)" fill-rule="evenodd" d="M117.773,475.097c59.287,0 59.287,-1.602 59.287,-1.602c0,0 0,-171.451 0,-171.451c0,0 -57.685,-43.264 -57.685,-43.264c-3.205,1.602 -1.602,217.92 -1.602,216.317Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+        <path fill="url(#c)" fill-rule="evenodd" d="M117.773,258.78l124.983,-126.586l28.844,84.924l-94.54,84.926l-59.287,-43.264Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+        <path fill="url(#d)" fill-rule="evenodd" d="M229.938,205.902l22.433,-75.31l123.381,124.983l-59.288,51.275l-86.526,-100.948Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+        <path fill="url(#e)" fill-rule="evenodd" d="M314.862,475.098l-1.602,-173.054l64.094,-48.071l1.603,221.125h-64.095Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+        <path fill="url(#f)" fill-rule="evenodd" stroke="#580400" stroke-linejoin="round" stroke-width="11.9213" d="M177.06,486.314l-1.602,-153.826c0,-36.854 20.029,-62.491 62.491,-62.491c44.065,0 65.697,30.444 65.697,62.491v153.826c0,0 -126.586,-1.602 -126.586,0Z" transform="matrix(1.07519,0,0,1.07519,-5.19257,-47.0224)"></path>
+        <path fill="url(#g)" fill-rule="evenodd" stroke="#580400" stroke-width="11.905" d="M63.293,303.646c150.621,-144.212 150.621,-144.212 150.621,-144.212c0,0 68.901,-1.602 70.503,-1.602c1.603,0 139.405,137.802 139.405,137.802c0,0 32.048,-33.649 32.048,-33.649c0,0 -206.704,-206.704 -206.704,-206.704c0,-1.42109e-14 -216.318,214.716 -216.318,214.716c7.10543e-15,0 30.4448,33.649 30.4448,33.649Z" transform="matrix(1.07519,0,0,1.07519,-12.0839,-29.7941)"></path>
+    </g>
+</svg>
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <defs xmlns:xlink="http://www.w3.org/1999/xlink">
+    <radialGradient id="s1" fx=".4" fy=".2">
+      <stop stop-color="#FE8"/><stop stop-color="#D70" offset="1"/>
+    </radialGradient>
+    <radialGradient id="s2" fx=".8" fy=".5"  xlink:href="#s1"/>
+    <radialGradient id="s3" fx=".5" fy=".9"  xlink:href="#s1"/>
+    <radialGradient id="s4" fx=".1" fy=".5"  xlink:href="#s1"/>
+  </defs>
+  <g stroke="#940">
+    <path d="M73,29c-37-40-62-24-52,4l6-7c-8-16,7-26,42,9z" fill="url(#s1)"/>
+    <path d="M47,8c33-16,48,21,9,47l-6-5c38-27,20-44,5-37z" fill="url(#s2)"/>
+    <path d="M77,32c22,30,10,57-39,51l-1-8c3,3,67,5,36-36z" fill="url(#s3)"/>
+    <path d="M58,84c-4,20-38-4-8-24l-6-5c-36,43,15,56,23,27z" fill="url(#s4)"/>
+    <path d="M40,14c-40,37-37,52-9,68l1-8c-16-13-29-21,16-56z" fill="url(#s1)"/>
+    <path d="M31,33c19,23,20,7,35,41l-9,1.7c-4-19-8-14-31-37z" fill="url(#s2)"/>
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 102">
+  <radialGradient id="jsongrad" cx="65" cy="90" r="100" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#EEF"/><stop offset="1"/></radialGradient>
+  <path d="M61,02 A 49,49 0,0,0 39,98 C 9,79 10,24 45,25 C 72,24 65,75 50,75 C 93,79 91,21 62,02" id="jsonswirl" fill="url(#jsongrad)"/>
+  <use xlink:href="#jsonswirl" transform="rotate(180 50,50)"/>
+</svg>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="800" height="800" version="1.1" viewBox="0 0 800 800" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!--Generated by IJSVG (https://github.com/iconjar/IJSVG)-->
+    <defs>
+        <linearGradient id="b" x1="0" x2="1" gradientUnits="userSpaceOnUse" y1="0" y2="0" gradientTransform="matrix(0,1,1,0,0,200)">
+            <stop offset="0%" stop-color="#D83352"></stop>
+            <stop offset="50%" stop-color="#F6DC7B"></stop>
+            <stop offset="100%" stop-color="#F6DC7B"></stop>
+        </linearGradient>
+    </defs>
+    <rect x="100" y="100" width="600" height="600" fill="url(#b)"></rect>
+</svg>
@@ -1,20 +1,6 @@
-<?xml version="1.0"?>
-<svg width="120" height="120"
-     viewPort="0 0 120 120" version="1.1"
-     xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg">
+  <rect x="-3" y="-3" width="6" height="6" />

-    <line stroke-linecap="butt"
-          x1="30" y1="30" x2="30" y2="90"
-          stroke="black" stroke-width="20"/>
-
-    <line stroke-linecap="round"
-          x1="60" y1="30" x2="60" y2="90"
-          stroke="black" stroke-width="20"/>
-
-    <line stroke-linecap="square"
-          x1="90" y1="30" x2="90" y2="90"
-          stroke="black" stroke-width="20"/>
-
-    <path d="M30,30 L30,90 M60,30 L60,90 M90,30 L90,90"
-          stroke="white" />
-		  </svg>
+  <rect x="-3" y="-3" width="6" height="6" fill="red"
+        transform="skewY(30)" />
+</svg>
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="drawing.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs id="defs4">
+    <linearGradient id="linearGradient3193">
+      <stop style="stop-color:#0000ff;stop-opacity:1;" offset="0" id="stop3195" />
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="1" id="stop3197" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3193"
+       id="linearGradient3199"
+       x1="128.57143"
+       y1="289.50504"
+       x2="425.71428"
+       y2="289.50504"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.1,1.1) translate(20,20) rotate(10) scale(.9,.9)">
+    </linearGradient>
+    <radialGradient id="radialGradient3193">
+      <stop style="stop-color:#0000ff;stop-opacity:1;" offset="0"  />
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="1"  />
+    </radialGradient>
+    <radialGradient
+       xlink:href="#radialGradient3193"
+       id="radialGradient3199"
+       cx="300.57143"
+       cy="529.50504"
+       fx="400.57143"
+       fy="529.50504"
+       r="100.71428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.1,1.1) translate(20,20) rotate(10) scale(.9,.9)">
+    </radialGradient>
+ </defs>
+ <g>
+    <rect
+       style="fill:url(#linearGradient3199);fill-opacity:1"
+       id="rect3191"
+       width="397.14285"
+       height="157.14285"
+       x="128.57143"
+       y="160.93361" />
+    <rect
+       style="fill:url(#radialGradient3199);fill-opacity:1"
+       id="rect3192"
+       width="397.14285"
+       height="157.14285"
+       x="128.57143"
+       y="400.93361" />
+
+    <rect id='myrect' x="400" y="20" width="60" height="60" rx="3" ry="3"
+          style="opacity:0.5;fill:#0000FF;stroke:rgb(0, 255, 0);stroke-width:10px;stroke-opacity:0.8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:15;stroke-dasharray:5,3,2;stroke-dashoffset:3"/>
+    
+
+
+  </g>
+</svg>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="269" height="269" version="1.1" viewBox="0 0 269 269" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!--Generated by IJSVG (https://github.com/iconjar/IJSVG)-->
+    <defs>
+        <mask id="a" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox">
+            <use fill="#FFF" xlink:href="#d"></use>
+        </mask>
+        <linearGradient id="b" x1="0" x2="1" gradientUnits="userSpaceOnUse" y1="0" y2="0" gradientTransform="matrix(0,-197.994,-197.994,0,101.4,199.62)">
+            <stop offset="0%" stop-color="#D83352"></stop>
+            <stop offset="41.2669%" stop-color="#F6DC7B"></stop>
+            <stop offset="100%" stop-color="#F6DC7B"></stop>
+        </linearGradient>
+        <mask id="c" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox">
+            <path fill="#FFF" d="M0,202h202v-202h-202Z"></path>
+        </mask>
+        <path id="d" d="M2.404,100.624c0,-54.674 44.321,-98.998 98.995,-98.998v-4.88498e-15c54.675,0 98.997,44.324 98.997,98.998v0c0,54.674 -44.322,98.996 -98.997,98.996v0c-54.674,0 -98.995,-44.322 -98.995,-98.996"></path>
+    </defs>
+    <g transform="scale(0.998762)">
+        <g transform="matrix(1.33333,0,0,-1.33333,0,269.333)">
+            <use mask="url(#a)" fill="url(#b)" stroke="none" xlink:href="#d"></use>
+            <g mask="url(#c)">
+                <path fill="#231F20" stroke="none" d="M0,0c0,-6.725 -5.451,-12.175 -12.177,-12.175c-6.725,0 -12.176,5.45 -12.176,12.175c0,6.725 5.451,12.178 12.176,12.178c6.726,0 12.177,-5.453 12.177,-12.178" transform="matrix(1,0,0,1,75.0225,94.2754)"></path>
+                <path fill="none" stroke="#231F20" stroke-linecap="round" stroke-width="9" d="M0,0c14.428,-16.873 42.352,-15.393 42.352,-15.393" transform="matrix(1,0,0,1,41.2588,117.041)"></path>
+                <path fill="#231F20" stroke="none" d="M0,0c0,-6.725 -5.453,-12.176 -12.178,-12.176c-6.724,0 -12.176,5.451 -12.176,12.176c0,6.725 5.452,12.178 12.176,12.178c6.725,0 12.178,-5.453 12.178,-12.178" transform="matrix(1,0,0,1,146.952,94.3281)"></path>
+                <path fill="none" stroke="#231F20" stroke-linecap="round" stroke-width="9" d="M0,0c-14.428,-16.873 -42.352,-15.393 -42.352,-15.393" transform="matrix(1,0,0,1,161.54,117.094)"></path>
+                <path fill="none" stroke="#231F20" stroke-linecap="round" stroke-width="10" d="M0,0c29.782,24.805 58.656,-1.05 58.656,-1.05" transform="matrix(1,0,0,1,72.0713,41.6172)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -6,18 +6,6 @@ Orignaly written for IconJar (in development)

 It also supports the NSPasteboards writing protocol, an IJSVG object can be put onto the pasteboard and application like Sketch and Photoshop can paste them into the document as vector objects (generated PDF's on the fly).

-Example app
-====
-There is an example application provided, it will generate this test bed for SVG's
-
-The example screen contains six SVG's rendered in individual views, from left to right.
-* First example shows transforms and colours
-* Second example shows linear gradients
-* Third example shows defined paths being reused
-* Forth example shows transforms such as translate being used and stroke colours
-* Fith example shows clip paths being used
-* Sixth example shows dashed stroke array's being used
-
 Quick Start
 ====
 Add all the IJSVG library files into your project, import the IJSVG.h into the files you wish to use the SVG's. The easiest way to
@@ -39,12 +27,49 @@ IJSVG does allow you to directly draw the SVG into any focused drawing context f
      [svg drawInRect:self.bounds];
    }
    
+#### Helpers
+
+IJSVG provides a very simple way of helping out the backing scale factor of the drawing context when the SVG is drawn. Due to CALayers defaulting to 1.0 when custom drawing methods are implemented, they do not know about your backing scale factor. Luckily you can simply do this:
+
+    __block IJSVG * svg ....
+    svg.renderingBackingScaleHelper = ^{
+        return [svg computeBackingScale:someView.window.backingScaleFactor];
+    };
+    
+# Exporting
+#### Yes, thats right... CALayers -> SVG (whos idea was this?!)
+
+IJSVG provides a way of exporting the rendered layer tree back to an SVG file. This isnt 100% perfect but it does a good job of generating what IJSVG renders (have yet to find an issue).
+
+Its a simple as doing this:
+
+    IJSVG * svg ...
+    IJSVGExporter * exporter = [[IJSVGExporter alloc] initWithSVG:svg options:IJSVGExporterOptionAll];
+    NSString * svgString = [exporter SVGString];
+    
+Which will give you back the SVG code to put into a file, there are various options you can give it for more XML manipulation such s collpasing groups and converting transform's from matrix's back to their human readable counter parts.
+
+The fun part is you can actually create an SVG object from a IJSVGLayer and work with them without needing to load a file, for example:
+
+    // create group layer and a shape layer (subclass of CAShapeLayer)
+    IJSVGGroupLayer * baseSVGGroup = ....
+    IJSVGShapeLayer * shapeLayer = ....
+    [baseSVGGroup addSublayer:shapeLayer];
+    
+    // create the SVG - note the viewbox!
+    IJSVG * svg = [[IJSVG alloc] initWithSVGLayer:baseSVGGroup viewBox:NSMakeRect(0.f, 0.f, 50.f, 50.f)];
+    .... do what you want
+    
+and now you would have a usuable SVG to render where ever you would like and more importantly you can now export that back to an SVG file.
+
+All layers must be of generic type IJSVGLayer or IJSVGShapeLayer, it will throw an exception if you do not use these. Also if you go out the scope of what those layers can do, it wont render nor will it export (get malformed results).
+    
 # What it supports
 * Elements: def, use, g, path, clipPath, circle, elipse, rect, polyline, polygon and line (supports groups heirachy and inheritance, clip-paths etc)
 * Commands: A, M, L, H, V, C, S, T, Q and Z and full support for multiple parameters of each type
-* Transformations: matrix, rotate (not around a point - currently), translate, scale transformations
+* Transformations: matrix, rotate, translate, scale and skew transformations
 * Stroking: stroking, stroke color, stroke opacity, dashed, dashed offset and phase, stroke line cap style
-* Filling: fill color, fill mode (winding rules), fill opacity, linear gradients, radial gradients
+* Filling: fill color, fill mode (winding rules), fill opacity, linear gradients, radial gradients and patterns
 * Color: supports all predefined colors from the SVG spec and hex values
 * Caching: has basic caching implemenation
 * CSS: Basic embedded style sheets are support with very basic selectors
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
@@ -6,53 +6,59 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
-#import "IJSVGParser.h"
 #import "IJSVGBezierPathAdditions.h"
-#import "IJSVGLayerTree.h"
+#import "IJSVGColorList.h"
+#import "IJSVGExporter.h"
+#import "IJSVGGradientLayer.h"
 #import "IJSVGGroupLayer.h"
 #import "IJSVGImageLayer.h"
+#import "IJSVGLayerTree.h"
+#import "IJSVGParser.h"
+#import "IJSVGRendering.h"
+#import "IJSVGRenderingStyle.h"
+#import <Foundation/Foundation.h>

@class IJSVG;
+@class IJSVGQuartzRenderer;

-void IJSVGBeginTransactionLock();
-void IJSVGEndTransactionLock();
-void IJSVGObtainTransactionLock(dispatch_block_t block, BOOL renderOnMainThread);
+void IJSVGBeginTransactionLock(void);
+void IJSVGEndTransactionLock(void);

-@protocol IJSVGDelegate <NSObject,IJSVGParserDelegate>
+@protocol IJSVGDelegate <NSObject, IJSVGParserDelegate>

@optional
- (BOOL)svg:(IJSVG *)svg
-shouldHandleForeignObject:(IJSVGForeignObject *)foreignObject;
- (void)svg:(IJSVG *)svg
-handleForeignObject:(IJSVGForeignObject *)foreignObject
-   document:(NSXMLDocument *)document;
- (void)svg:(IJSVG *)svg
-foundSubSVG:(IJSVG *)subSVG
-withSVGString:(NSString *)subSVGString;
+- (BOOL)svg:(IJSVG*)svg
+    shouldHandleForeignObject:(IJSVGForeignObject*)foreignObject;
+- (void)svg:(IJSVG*)svg
+    handleForeignObject:(IJSVGForeignObject*)foreignObject
+               document:(NSXMLDocument*)document;
+- (void)svg:(IJSVG*)svg
+      foundSubSVG:(IJSVG*)subSVG
+    withSVGString:(NSString*)subSVGString;

@end

-typedef CGFloat (^IJSVGRenderingBackingScaleFactorHelper)();
-
@interface IJSVG : NSObject <NSPasteboardWriting, IJSVGParserDelegate> {
-    
+
@private
-    IJSVGParser * _group;
+    IJSVGParser* _group;
    CGFloat _scale;
    CGFloat _clipScale;
    id<IJSVGDelegate> _delegate;
-    IJSVGLayer * _layerTree;
+    IJSVGLayer* _layerTree;
    CGRect _viewBox;
    CGSize _proposedViewSize;
    CGFloat _lastProposedBackingScale;
-    
+    IJSVGRenderQuality _lastProposedRenderQuality;
+    CGFloat _backingScale;
+    NSMutableDictionary* _replacementColors;
+    IJSVGQuartzRenderer* _quartzRenderer;
+
    struct {
-        unsigned int shouldHandleForeignObject: 1;
-        unsigned int handleForeignObject: 1;
-        unsigned int shouldHandleSubSVG: 1;
+        unsigned int shouldHandleForeignObject : 1;
+        unsigned int handleForeignObject : 1;
+        unsigned int shouldHandleSubSVG : 1;
    } _respondsTo;
-    
 }

 // set this to be called when the layer is about to draw, it will call this
@@ -63,83 +69,100 @@ typedef CGFloat (^IJSVGRenderingBackingScaleFactorHelper)();

 // global overwriting rules for when rendering an SVG, this will overide any
 // fillColor, strokeColor, pattern and gradient fill
-@property (nonatomic, retain) NSColor * fillColor;
-@property (nonatomic, retain) NSColor * strokeColor;
+@property (nonatomic, assign) IJSVGRenderQuality renderQuality;
+@property (nonatomic, assign) BOOL clipToViewport;
+@property (nonatomic, retain) IJSVGRenderingStyle* style;

+- (void)prepForDrawingInView:(NSView*)view;
 - (BOOL)isFont;
+- (IJSVGGroup*)rootNode;
 - (NSRect)viewBox;
- (NSArray *)glyphs;
- (NSString *)identifier;
- (IJSVGLayer *)layer;
- (IJSVGLayer *)layerWithTree:(IJSVGLayerTree *)tree;
- (NSArray<IJSVG *> *)subSVGs:(BOOL)recursive;
+- (NSArray<IJSVGPath*>*)glyphs;
+- (NSString*)identifier;
+- (IJSVGLayer*)layer;
+- (IJSVGLayer*)layerWithTree:(IJSVGLayerTree*)tree;
+- (NSArray<IJSVG*>*)subSVGs:(BOOL)recursive;
+- (NSString*)SVGStringWithOptions:(IJSVGExporterOptions)options;

 - (CGFloat)computeBackingScale:(CGFloat)scale;
 - (void)discardDOM;

-+ (id)svgNamed:(NSString *)string;
-+ (id)svgNamed:(NSString *)string
+ (id)svgNamed:(NSString*)string;
+ (id)svgNamed:(NSString*)string
      delegate:(id<IJSVGDelegate>)delegate;
-+ (id)svgNamed:(NSString *)string
+ (id)svgNamed:(NSString*)string
      useCache:(BOOL)useCache
      delegate:(id<IJSVGDelegate>)delegate;

- (id)initWithImage:(NSImage *)image;
+- (id)initWithImage:(NSImage*)image;

- (id)initWithSVGLayer:(IJSVGGroupLayer *)group
+- (id)initWithSVGLayer:(IJSVGGroupLayer*)group
               viewBox:(NSRect)viewBox;

- (id)initWithSVGString:(NSString *)string
-                  error:(NSError **)error
+- (id)initWithSVGString:(NSString*)string
+                  error:(NSError**)error
               delegate:(id<IJSVGDelegate>)delegate;

- (id)initWithSVGString:(NSString *)string;
- (id)initWithSVGString:(NSString *)string
-                  error:(NSError **)error;
+- (id)initWithSVGString:(NSString*)string;
+- (id)initWithSVGString:(NSString*)string
+                  error:(NSError**)error;

- (id)initWithFile:(NSString *)file
+- (id)initWithFile:(NSString*)file
          useCache:(BOOL)useCache;
- (id)initWithFile:(NSString *)file;
- (id)initWithFile:(NSString *)file
-             error:(NSError **)error;
- (id)initWithFile:(NSString *)file
+- (id)initWithFile:(NSString*)file;
+- (id)initWithFile:(NSString*)file
+             error:(NSError**)error;
+- (id)initWithFile:(NSString*)file
          delegate:(id<IJSVGDelegate>)delegate;
- (id)initWithFile:(NSString *)file
-             error:(NSError **)error
+- (id)initWithFile:(NSString*)file
+             error:(NSError**)error
          delegate:(id<IJSVGDelegate>)delegate;
- (id)initWithFile:(NSString *)file
+- (id)initWithFile:(NSString*)file
          useCache:(BOOL)useCache
-             error:(NSError **)error
+             error:(NSError**)error
          delegate:(id<IJSVGDelegate>)delegate;
- (id)initWithFilePathURL:(NSURL *)aURL;
- (id)initWithFilePathURL:(NSURL *)aURL
+- (id)initWithFilePathURL:(NSURL*)aURL;
+- (id)initWithFilePathURL:(NSURL*)aURL
                 useCache:(BOOL)useCache;
- (id)initWithFilePathURL:(NSURL *)aURL
-                    error:(NSError **)error;
- (id)initWithFilePathURL:(NSURL *)aURL
+- (id)initWithFilePathURL:(NSURL*)aURL
+                    error:(NSError**)error;
+- (id)initWithFilePathURL:(NSURL*)aURL
                 delegate:(id<IJSVGDelegate>)delegate;
- (id)initWithFilePathURL:(NSURL *)aURL
+- (id)initWithFilePathURL:(NSURL*)aURL
                 useCache:(BOOL)useCache
-                    error:(NSError **)error
+                    error:(NSError**)error
                 delegate:(id<IJSVGDelegate>)delegate;
- (NSImage *)imageWithSize:(NSSize)aSize;
- (NSImage *)imageWithSize:(NSSize)aSize
-                     error:(NSError **)error;
- (NSImage *)imageWithSize:(NSSize)aSize
-                   flipped:(BOOL)flipped;
+- (NSImage*)imageWithSize:(NSSize)aSize;
+- (NSImage*)imageWithSize:(NSSize)aSize
+                    error:(NSError**)error;
+- (NSImage*)imageWithSize:(NSSize)aSize
+                  flipped:(BOOL)flipped;
+- (NSImage*)imageByMaintainingAspectRatioWithSize:(NSSize)aSize
+                                          flipped:(BOOL)flipped
+                                            error:(NSError**)error;
 - (BOOL)drawAtPoint:(NSPoint)point
               size:(NSSize)size;
 - (BOOL)drawAtPoint:(NSPoint)point
               size:(NSSize)aSize
-              error:(NSError **)error;
+              error:(NSError**)error;
 - (BOOL)drawInRect:(NSRect)rect;
 - (BOOL)drawInRect:(NSRect)rect
-             error:(NSError **)error;
+             error:(NSError**)error;
+- (void)drawInRect:(NSRect)rect
+           context:(CGContextRef)context;

- (NSData *)PDFData;
- (NSData *)PDFData:(NSError **)error;
- (NSData *)PDFDataWithRect:(NSRect)rect;
- (NSData *)PDFDataWithRect:(NSRect)rect
-                      error:(NSError **)error;
+- (NSData*)PDFData;
+- (NSData*)PDFData:(NSError**)error;
+- (NSData*)PDFDataWithRect:(NSRect)rect;
+- (NSData*)PDFDataWithRect:(NSRect)rect
+                     error:(NSError**)error;

+- (void)beginVectorDraw;
+- (void)endVectorDraw;
+
+- (NSRect)computeOriginalDrawingFrameWithSize:(NSSize)aSize;
+- (void)setNeedsDisplay;
+
+// colors
+- (IJSVGColorList*)computedColorList:(BOOL*)hasPatternFills;
@end
@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

+#import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

@interface NSBezierPath (IJSVGAdditions)
@@ -15,9 +15,9 @@
 {
    CGPoint QP0 = [self currentPoint];
    CGPoint CP3 = QP2;
-    CGPoint CP1 = CGPointMake( QP0.x + ((2.0 / 3.0) * (QP1.x - QP0.x)), QP0.y + ((2.0 / 3.0) * (QP1.y - QP0.y)));
-    CGPoint CP2 = CGPointMake( QP2.x + (2.0 / 3.0) * (QP1.x - QP2.x), QP2.y + (2.0 / 3.0) * (QP1.y - QP2.y) );
-    
+    CGPoint CP1 = CGPointMake(QP0.x + ((2.0 / 3.0) * (QP1.x - QP0.x)), QP0.y + ((2.0 / 3.0) * (QP1.y - QP0.y)));
+    CGPoint CP2 = CGPointMake(QP2.x + (2.0 / 3.0) * (QP1.x - QP2.x), QP2.y + (2.0 / 3.0) * (QP1.y - QP2.y));
+
    [self curveToPoint:CP3
         controlPoint1:CP1
         controlPoint2:CP2];
@@ -6,20 +6,19 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

+#import "IJSVG.h"
 #import <Foundation/Foundation.h>
 #import <sys/stat.h>
-#import "IJSVG.h"

@interface IJSVGCache : NSObject {
-    
 }

-+ (IJSVG *)cachedSVGForFileURL:(NSURL *)aURL;
-+ (void)cacheSVG:(IJSVG *)svg fileURL:(NSURL *)aURL;
+ (IJSVG*)cachedSVGForFileURL:(NSURL*)aURL;
+ (void)cacheSVG:(IJSVG*)svg fileURL:(NSURL*)aURL;
 + (void)flushCache;
 + (BOOL)enabled;
 + (void)setEnabled:(BOOL)flag;
-+ (void)purgeCachedSVGForFileURL:(NSURL *)aURL;
+ (void)purgeCachedSVGForFileURL:(NSURL*)aURL;
 + (void)setEvictItemsAfter:(NSInteger)count;

@end
@@ -12,7 +12,7 @@
@implementation IJSVGCache

 static NSInteger _maxCacheItems = 20;
-static NSCache * _cache = nil;
+static NSCache* _cache = nil;
 static BOOL _enabled = YES;

 + (void)load
@@ -26,23 +26,23 @@ static BOOL _enabled = YES;
    [_cache setTotalCostLimit:_maxCacheItems];
 }

-+ (IJSVG *)cachedSVGForFileURL:(NSURL *)aURL
+ (IJSVG*)cachedSVGForFileURL:(NSURL*)aURL
 {
-    if( ![[self class] enabled] || _cache == nil )
+    if (![self.class enabled] || _cache == nil)
        return nil;
-    IJSVG * svg = nil;
-    if( ( svg = [_cache objectForKey:aURL] ) == nil )
+    IJSVG* svg = nil;
+    if ((svg = [_cache objectForKey:aURL]) == nil)
        return nil;
    return svg;
 }

-+ (void)purgeCachedSVGForFileURL:(NSURL *)aURL
+ (void)purgeCachedSVGForFileURL:(NSURL*)aURL
 {
    [_cache removeObjectForKey:aURL];
 }

-+ (void)cacheSVG:(IJSVG *)svg
-         fileURL:(NSURL *)aURL
+ (void)cacheSVG:(IJSVG*)svg
+         fileURL:(NSURL*)aURL
 {
    [_cache setObject:svg
               forKey:aURL
@@ -52,13 +52,13 @@ static BOOL _enabled = YES;
 + (void)setEnabled:(BOOL)flag
 {
    _enabled = flag;
-    if( !flag ) {
-        [[self class] flushCache];
+    if (!flag) {
+        [self.class flushCache];
        return;
    }
-    
+
    // create a new cache if allowed
-    if( _cache == nil ) {
+    if (_cache == nil) {
        _cache = [[NSCache alloc] init];
        [_cache setTotalCostLimit:_maxCacheItems];
    }
@@ -6,9 +6,18 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

+#import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

-typedef NS_ENUM( NSInteger, IJSVGPredefinedColor ) {
+typedef NS_OPTIONS(NSInteger, IJSVGColorStringOptions) {
+    IJSVGColorStringOptionNone = 1 << 0,
+    IJSVGColorStringOptionForceHEX = 1 << 1,
+    IJSVGColorStringOptionAllowShortHand = 1 << 2,
+    IJSVGColorStringOptionAllowRRGGBBAA = 1 << 3,
+    IJSVGColorStringOptionDefault = IJSVGColorStringOptionAllowShortHand
+};
+
+typedef NS_ENUM(NSInteger, IJSVGPredefinedColor) {
    IJSVGColorAliceblue,
    IJSVGColorAntiquewhite,
    IJSVGColorAqua,
@@ -160,17 +169,29 @@ typedef NS_ENUM( NSInteger, IJSVGPredefinedColor ) {

@interface IJSVGColor : NSObject

-+ (BOOL)isColor:(NSString *)string;
-+ (NSString *)colorStringFromColor:(NSColor *)color
-                          forceHex:(BOOL)forceHex;
-+ (NSString *)colorStringFromColor:(NSColor *)color;
-+ (NSColor *)computeColor:(id)colour;
-+ (NSColor *)colorFromString:(NSString *)string;
-+ (NSColor *)colorFromHEXString:(NSString *)string
-                          alpha:(CGFloat)alpha;
-+ (NSColor *)colorFromPredefinedColorName:(NSString *)name;
-+ (NSString *)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
-+ (NSColor *)changeAlphaOnColor:(NSColor *)color
-                             to:(CGFloat)alphaValue;
+CGFloat* IJSVGColorCSSHSLToHSB(CGFloat hue, CGFloat saturation, CGFloat lightness);
+
+ (NSColor*)computeColorSpace:(NSColor*)color;
+ (NSColorSpace*)defaultColorSpace;
+ (BOOL)isColor:(NSString*)string;
+ (NSString*)colorStringFromColor:(NSColor*)color
+                          options:(IJSVGColorStringOptions)options;
+ (NSString*)colorStringFromColor:(NSColor*)color;
+ (NSColor*)colorFromHEXInteger:(NSInteger)hex;
+ (NSColor*)computeColor:(id)colour;
+ (NSColor*)colorFromString:(NSString*)string;
+ (NSColor*)colorFromHEXString:(NSString*)string;
+ (NSColor*)colorFromHEXString:(NSString*)string
+        containsAlphaComponent:(BOOL*)containsAlphaComponent;
+ (BOOL)HEXContainsAlphaComponent:(NSUInteger)hex;
+ (unsigned long)lengthOfHEXInteger:(NSUInteger)hex;
+ (NSColor*)colorFromRString:(NSString*)rString
+                     gString:(NSString*)gString
+                     bString:(NSString*)bString
+                     aString:(NSString*)aString;
+ (NSColor*)colorFromPredefinedColorName:(NSString*)name;
+ (NSString*)colorNameFromPredefinedColor:(IJSVGPredefinedColor)color;
+ (NSColor*)changeAlphaOnColor:(NSColor*)color
+                            to:(CGFloat)alphaValue;

@end
@@ -0,0 +1,31 @@
+//
+//  IJSVGColorList.h
+//  IconJar
+//
+//  Created by Curtis Hard on 07/07/2019.
+//  Copyright © 2019 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGColor.h"
+#import <Foundation/Foundation.h>
+
+@interface IJSVGColorList : NSObject <NSCopying> {
+
+@private
+    NSMutableDictionary<NSColor*, NSColor*>* _replacementColorTree;
+    NSMutableSet<NSColor*>* _colors;
+}
+
+- (NSColor*)proposedColorForColor:(NSColor*)color;
+- (void)removeAllReplacementColors;
+- (void)removeReplacementColor:(NSColor*)color;
+- (void)setReplacementColor:(NSColor*)newColor
+                   forColor:(NSColor*)color;
+- (void)setReplacementColors:(NSDictionary<NSColor*, NSColor*>*)colors
+         clearExistingColors:(BOOL)clearExistingColors;
+
+- (void)addColorsFromList:(IJSVGColorList*)sheet;
+- (NSSet<NSColor*>*)colors;
+- (void)addColor:(NSColor*)color;
+
+@end
@@ -0,0 +1,112 @@
+//
+//  IJSVGColorList.m
+//  IconJar
+//
+//  Created by Curtis Hard on 07/07/2019.
+//  Copyright © 2019 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGColorList.h"
+
+@implementation IJSVGColorList
+
+- (void)dealloc
+{
+    (void)([_replacementColorTree release]), _replacementColorTree = nil;
+    (void)([_colors release]), _colors = nil;
+    [super dealloc];
+}
+
+- (instancetype)init
+{
+    if ((self = [super init]) != nil) {
+        _replacementColorTree = [[NSMutableDictionary alloc] init];
+        _colors = [[NSMutableSet alloc] init];
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone*)zone
+{
+    IJSVGColorList* sheet = [[self.class alloc] init];
+    [sheet setReplacementColors:[_replacementColorTree.copy autorelease]
+            clearExistingColors:YES];
+    return sheet;
+}
+
+- (NSColor*)proposedColorForColor:(NSColor*)color
+{
+    // nothing found, just return color
+    if (_replacementColorTree == nil || _replacementColorTree.count == 0) {
+        return color;
+    }
+
+    // check the mappings
+    NSColor* found = nil;
+    color = [IJSVGColor computeColorSpace:color];
+    if ((found = _replacementColorTree[color]) != nil) {
+        return found;
+    }
+    return color;
+}
+
+- (void)_invalidateColorTree
+{
+    (void)([_replacementColorTree release]), _replacementColorTree = nil;
+    _replacementColorTree = [[NSMutableDictionary alloc] init];
+}
+
+- (void)removeAllReplacementColors
+{
+    [self _invalidateColorTree];
+}
+
+- (void)removeReplacementColor:(NSColor*)color
+{
+    if (_replacementColorTree == nil) {
+        return;
+    }
+    [_replacementColorTree removeObjectForKey:[IJSVGColor computeColorSpace:color]];
+}
+
+- (void)setReplacementColor:(NSColor*)newColor
+                   forColor:(NSColor*)color
+{
+    color = [IJSVGColor computeColorSpace:color];
+    newColor = [IJSVGColor computeColorSpace:newColor];
+    _replacementColorTree[color] = newColor;
+}
+
+- (void)setReplacementColors:(NSDictionary<NSColor*, NSColor*>*)colors
+         clearExistingColors:(BOOL)clearExistingColors
+{
+    if (clearExistingColors == YES) {
+        [self _invalidateColorTree];
+    }
+    for (NSColor* oldColor in colors) {
+        [self setReplacementColor:colors[oldColor]
+                         forColor:oldColor];
+    }
+}
+
+- (NSSet<NSColor*>*)colors
+{
+    return [NSSet setWithSet:_colors];
+}
+
+- (void)addColorsFromList:(IJSVGColorList*)sheet
+{
+    [_colors addObjectsFromArray:sheet.colors.allObjects];
+}
+
+- (void)addColor:(NSColor*)color
+{
+    [_colors addObject:[IJSVGColor computeColorSpace:color]];
+}
+
+- (void)removeColor:(NSColor*)color
+{
+    [_colors removeObject:[IJSVGColor computeColorSpace:color]];
+}
+
+@end
@@ -6,62 +6,57 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGPath.h"
+#import <Foundation/Foundation.h>

-typedef NS_ENUM( NSInteger, IJSVGCommandType ) {
+static const NSInteger IJSVGCustomVariableParameterCount = NSNotFound;
+
+typedef NS_ENUM(NSInteger, IJSVGCommandType) {
    IJSVGCommandTypeAbsolute,
    IJSVGCommandTypeRelative
 };

-@class IJSVGCommand;
-
-@protocol IJSVGCommandProtocol <NSObject>
-
-@required
-+ (void)runWithParams:(CGFloat *)params
-           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
-                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path;
-
-+ (NSInteger)requiredParameterCount;
-
-@end
-
@interface IJSVGCommand : NSObject {
-    NSString * commandString;
-    NSString * command;
-    CGFloat * parameters;
+    NSString* commandString;
+    NSString* command;
+    CGFloat* parameters;
    NSInteger parameterCount;
-    NSMutableArray * subCommands;
+    NSMutableArray* subCommands;
    NSInteger requiredParameters;
    IJSVGCommandType type;
-    IJSVGCommand * previousCommand;
+    IJSVGCommand* previousCommand;
    NSInteger _currentIndex;
-    Class<IJSVGCommandProtocol> commandClass;
+    BOOL isSubCommand;
 }

-@property ( nonatomic, copy ) NSString * commandString;
-@property ( nonatomic, copy ) NSString * command;
-@property ( nonatomic, assign ) CGFloat * parameters;
-@property ( nonatomic, assign ) NSInteger parameterCount;
-@property ( nonatomic, assign ) NSInteger requiredParameters;
-@property ( nonatomic, assign ) IJSVGCommandType type;
-@property ( nonatomic, retain ) NSMutableArray * subCommands;
-@property ( nonatomic, assign ) Class<IJSVGCommandProtocol> commandClass;
-@property ( nonatomic, assign ) IJSVGCommand * previousCommand;
+@property (nonatomic, copy) NSString* commandString;
+@property (nonatomic, copy) NSString* command;
+@property (nonatomic, assign) CGFloat* parameters;
+@property (nonatomic, assign) NSInteger parameterCount;
+@property (nonatomic, assign) NSInteger requiredParameters;
+@property (nonatomic, assign) IJSVGCommandType type;
+@property (nonatomic, retain) NSMutableArray<IJSVGCommand*>* subCommands;
+@property (nonatomic, assign) IJSVGCommand* previousCommand;
+@property (nonatomic, assign) BOOL isSubCommand;

- (id)initWithCommandString:(NSString *)commandString;
-
-+ (NSPoint)readCoordinatePair:(CGFloat *)pairs
+ (Class)commandClassForCommandChar:(char)aChar;
+ (NSInteger)requiredParameterCount;
+ (NSPoint)readCoordinatePair:(CGFloat*)pairs
                        index:(NSInteger)index;
+ (void)runWithParams:(CGFloat*)params
+           paramCount:(NSInteger)count
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
+                 type:(IJSVGCommandType)type
+                 path:(IJSVGPath*)path;
+ (void)parseParams:(CGFloat*)params
+         paramCount:(NSInteger)paramCount
+          intoArray:(NSMutableArray<IJSVGCommand*>*)commands
+      parentCommand:(IJSVGCommand*)parentCommand;

-+ (void)registerClass:(Class)aClass
-           forCommand:(NSString *)command;
-+ (NSDictionary *)registeredCommandClasses;
-+ (Class<IJSVGCommandProtocol>)commandClassForCommandLetter:(NSString *)str;
+- (id)initWithCommandString:(NSString*)commandString;
+- (IJSVGCommand*)subcommandWithParameters:(CGFloat*)subParams
+                          previousCommand:(IJSVGCommand*)command;

 - (CGFloat)readFloat;
 - (NSPoint)readPoint;
@@ -9,6 +9,17 @@
 #import "IJSVGCommand.h"
 #import "IJSVGUtils.h"

+#import "IJSVGCommandClose.h"
+#import "IJSVGCommandCurve.h"
+#import "IJSVGCommandEllipticalArc.h"
+#import "IJSVGCommandHorizontalLine.h"
+#import "IJSVGCommandLineTo.h"
+#import "IJSVGCommandMove.h"
+#import "IJSVGCommandQuadraticCurve.h"
+#import "IJSVGCommandSmoothCurve.h"
+#import "IJSVGCommandSmoothQuadraticCurve.h"
+#import "IJSVGCommandVerticalLine.h"
+
@implementation IJSVGCommand

@synthesize commandString;
@@ -16,91 +27,41 @@
@synthesize parameterCount;
@synthesize parameters;
@synthesize subCommands;
-@synthesize commandClass;
@synthesize requiredParameters;
@synthesize type;
@synthesize previousCommand;
+@synthesize isSubCommand;

-static NSMutableDictionary * _classes = nil;
-
- (void)dealloc
+ (BOOL)requiresCustomParameterParsing
 {
-    [commandString release], commandString = nil;
-    [command release], command = nil;
-    [subCommands release], subCommands = nil;
-    free( parameters );
-    [super dealloc];
+    return NO;
 }

- (id)initWithCommandString:(NSString *)str
+ (NSInteger)requiredParameterCount
 {
-    if( ( self = [super init] ) != nil )
-    {
-        // work out the basics
-        _currentIndex = 0;
-        subCommands = [[NSMutableArray alloc] init];
-        command = [[str substringToIndex:1] copy];
-        type = [IJSVGUtils typeForCommandString:self.command];
-        commandClass = [[self class] commandClassForCommandLetter:self.command];
-        parameters = [IJSVGUtils commandParameters:str count:&parameterCount];
-        requiredParameters = [self.commandClass requiredParameterCount];
-        
-        // 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;
-        }
-        
-        // interate over the sets
-        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];
-                }
-            }
-            
-            // create a subcommand per set
-            IJSVGCommand * c = [[[[self class] alloc] init] autorelease];
-            c.parameterCount = self.requiredParameters;
-            c.parameters = subParams;
-            c.type = self.type;
-            c.command = self.command;
-            c.previousCommand = [self.subCommands lastObject];
-            c.commandClass = self.commandClass;
-            
-            // add it to our tree
-            [self.subCommands addObject:c];
-        }
-    }
-    return self;
+    return 1;
 }

-+ (NSPoint)readCoordinatePair:(CGFloat *)pairs
+ (void)runWithParams:(CGFloat*)params
+           paramCount:(NSInteger)count
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
+                 type:(IJSVGCommandType)type
+                 path:(IJSVGPath*)path
+{
+}
+
+ (void)parseParams:(CGFloat*)params
+         paramCount:(NSInteger)paramCount
+          intoArray:(NSMutableArray<IJSVGCommand*>*)commands
+      parentCommand:(IJSVGCommand*)parentCommand
+{
+}
+
+ (NSPoint)readCoordinatePair:(CGFloat*)pairs
                        index:(NSInteger)index
 {
-    return NSMakePoint( pairs[index*2], pairs[index*2+1]);
-}
-
-+ (void)registerClass:(Class)aClass
-           forCommand:(NSString *)command
-{
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _classes = [[NSMutableDictionary alloc] init];
-    });
-    [_classes setObject:NSStringFromClass(aClass)
-                 forKey:command];
-}
-
-+ (NSDictionary *)registeredCommandClasses
-{
-    return _classes;
+    return NSMakePoint(pairs[index * 2], pairs[index * 2 + 1]);
 }

 + (void)load
@@ -108,12 +69,117 @@ static NSMutableDictionary * _classes = nil;
    // register here...
 }

-+ (Class<IJSVGCommandProtocol>)commandClassForCommandLetter:(NSString *)str
+ (Class)commandClassForCommandChar:(char)aChar
 {
-    NSString * command = nil;
-    if( ( command = [_classes objectForKey:[str lowercaseString]] ) == nil )
-        return nil;
-    return NSClassFromString(command);
+    aChar = tolower(aChar);
+    switch (aChar) {
+    case 'a':
+        return IJSVGCommandEllipticalArc.class;
+    case 'c':
+        return IJSVGCommandCurve.class;
+    case 'h':
+        return IJSVGCommandHorizontalLine.class;
+    case 'l':
+        return IJSVGCommandLineTo.class;
+    case 'm':
+        return IJSVGCommandMove.class;
+    case 'q':
+        return IJSVGCommandQuadraticCurve.class;
+    case 's':
+        return IJSVGCommandSmoothCurve.class;
+    case 't':
+        return IJSVGCommandSmoothQuadraticCurve.class;
+    case 'v':
+        return IJSVGCommandVerticalLine.class;
+    case 'z':
+        return IJSVGCommandClose.class;
+    }
+    return nil;
+}
+
+- (void)dealloc
+{
+    (void)([commandString release]), commandString = nil;
+    (void)([command release]), command = nil;
+    (void)([subCommands release]), subCommands = nil;
+    (void)(free(parameters)), parameters = nil;
+    [super dealloc];
+}
+
+- (id)initWithCommandString:(NSString*)str
+{
+    if ((self = [super init]) != nil) {
+        // work out the basics
+        _currentIndex = 0;
+        command = [[str substringToIndex:1] copy];
+        type = [IJSVGUtils typeForCommandString:self.command];
+        parameters = [IJSVGUtils commandParameters:str
+                                             count:&parameterCount];
+        requiredParameters = [self.class requiredParameterCount];
+
+        // 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];
+        } 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];
+
+            // 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];
+                    }
+                }
+
+                // generate the subcommand
+                IJSVGCommand* command = [self subcommandWithParameters:subParams
+                                                       previousCommand:lastCommand];
+
+                // make sure we assign the last command or hell breaks
+                // 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];
+            }
+        }
+    }
+    return self;
+}
+
+- (IJSVGCommand*)subcommandWithParameters:(CGFloat*)subParams
+                          previousCommand:(IJSVGCommand*)aPreviousCommand
+{
+    // create a subcommand per set
+    IJSVGCommand* c = [[[self.class alloc] init] autorelease];
+    c.parameterCount = self.requiredParameters;
+    c.parameters = subParams;
+    c.type = self.type;
+    c.command = self.command;
+    c.previousCommand = aPreviousCommand;
+    c.isSubCommand = aPreviousCommand != nil;
+    return c;
 }

 - (CGFloat)readFloat
@@ -126,9 +192,9 @@ static NSMutableDictionary * _classes = nil;
 - (NSPoint)readPoint
 {
    CGFloat x = parameters[_currentIndex];
-    CGFloat y = parameters[_currentIndex+1];
-    _currentIndex+=2;
-    return NSMakePoint( x, y );
+    CGFloat y = parameters[_currentIndex + 1];
+    _currentIndex += 2;
+    return NSMakePoint(x, y);
 }

 - (BOOL)readBOOL
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandClose : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandClose : IJSVGCommand

@end
@@ -10,23 +10,17 @@

@implementation IJSVGCommandClose

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"z"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 0;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
    [path close];
 }
@@ -1,66 +0,0 @@
-//
-//  IJSVGCommandCommandQuadraticCurve.m
-//  IconJar
-//
-//  Created by Curtis Hard on 30/08/2014.
-//  Copyright (c) 2014 Curtis Hard. All rights reserved.
-//
-
-#import "IJSVGCommandCommandSmoothQuadraticCurve.h"
-#import "IJSVGUtils.h"
-#import "IJSVGCommandQuadraticCurve.h"
-
-@implementation IJSVGCommandCommandSmoothQuadraticCurve
-
-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"t"];
-}
-
-+ (NSInteger)requiredParameterCount
-{
-    return 2;
-}
-
-+ (void)runWithParams:(CGFloat *)params
-           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
-                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
-{
-    NSPoint commandPoint = NSMakePoint( [path currentSubpath].currentPoint.x, [path currentSubpath].currentPoint.y );
-    if( command != nil )
-    {
-        if( command.commandClass == [IJSVGCommandQuadraticCurve class] )
-        {
-            // quadratic curve
-            if( command.type == IJSVGCommandTypeAbsolute )
-            {
-                commandPoint =  NSMakePoint(-1*command.parameters[0] + 2*[path currentSubpath].currentPoint.x,
-                                            -1*command.parameters[1] + 2*[path currentSubpath].currentPoint.y);
-            } else {
-                NSPoint oldPoint = CGPointMake([path currentSubpath].currentPoint.x - command.parameters[2],
-                                               [path currentSubpath].currentPoint.y - command.parameters[3]);
-                commandPoint = CGPointMake(-1*(command.parameters[0] + oldPoint.x) + 2*([path currentSubpath].currentPoint.x),
-                                           -1*(command.parameters[1] + oldPoint.y) + 2*[path currentSubpath].currentPoint.y);
-            }
-        } else if( command.commandClass == [self class] ) {
-            // smooth quadratic curve
-            commandPoint = CGPointMake(-1*(path.lastControlPoint.x) + 2*([path currentSubpath].currentPoint.x),
-                                       -1*(path.lastControlPoint.y) + 2*[path currentSubpath].currentPoint.y);
-        }
-    }
-    path.lastControlPoint = commandPoint;
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint(params[0], params[1])
-                                      controlPoint:commandPoint];
-        return;
-    }
-    [[path currentSubpath] addQuadCurveToPoint:NSMakePoint([path currentSubpath].currentPoint.x + params[0], [path currentSubpath].currentPoint.y + params[1])
-                                  controlPoint:commandPoint];
-}
-
-@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandCurve : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandCurve : IJSVGCommand

@end
@@ -10,36 +10,27 @@

@implementation IJSVGCommandCurve

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"c"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 6;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] curveToPoint:NSMakePoint( params[4], params[5])
-                              controlPoint1:NSMakePoint( params[0], params[1])
-                              controlPoint2:NSMakePoint( params[2], params[3])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] curveToPoint:NSMakePoint(params[4], params[5])
+                              controlPoint1:NSMakePoint(params[0], params[1])
+                              controlPoint2:NSMakePoint(params[2], params[3])];
        return;
    }
-    NSPoint point = [[path currentSubpath] currentPoint];
-    [[path currentSubpath] curveToPoint:NSMakePoint( point.x + params[4], point.y + params[5])
-                          controlPoint1:NSMakePoint( point.x + params[0], point.y + params[1])
-                          controlPoint2:NSMakePoint( point.x + params[2], point.y + params[3])];
-    
+    [[path currentSubpath] relativeCurveToPoint:NSMakePoint(params[4], params[5])
+                                  controlPoint1:NSMakePoint(params[0], params[1])
+                                  controlPoint2:NSMakePoint(params[2], params[3])];
 }

@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandArc : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandEllipticalArc : IJSVGCommand

@end
@@ -6,97 +6,102 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import "IJSVGCommandArc.h"
+#import "IJSVGCommandEllipticalArc.h"
 #import "IJSVGUtils.h"

-@implementation IJSVGCommandArc
-
-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"a"];
-}
+@implementation IJSVGCommandEllipticalArc

 + (NSInteger)requiredParameterCount
 {
    return 7;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    
-    // command was taken from: https://github.com/jmenter/JAMSVGImage/blob/89b375c0c3203355a0c693e3b805458415bf4e29/Classes/JAMSVGImage/Path%20and%20Parser/JAMStyledBezierPathFactory.m
-    // and modified to purpose inside this to be converted into degrees and not radians
-    
    CGPoint radii = CGPointZero;
    CGPoint arcEndPoint = CGPointZero;
    CGPoint arcStartPoint = path.currentPoint;
    CGFloat xAxisRotation = 0;
    BOOL largeArcFlag = 0;
    BOOL sweepFlag = 0;
-    
+
    radii = [currentCommand readPoint];
    xAxisRotation = [currentCommand readFloat];
    largeArcFlag = [currentCommand readBOOL];
    sweepFlag = [currentCommand readBOOL];
    arcEndPoint = [currentCommand readPoint];
-    
-    if ( type == IJSVGCommandTypeRelative ) {
+
+    if (type == IJSVGCommandTypeRelative) {
        arcEndPoint.x += path.currentPoint.x;
        arcEndPoint.y += path.currentPoint.y;
    }
-    
+
    xAxisRotation *= M_PI / 180.f;
    CGPoint currentPoint = CGPointMake(cos(xAxisRotation) * (arcStartPoint.x - arcEndPoint.x) / 2.0 + sin(xAxisRotation) * (arcStartPoint.y - arcEndPoint.y) / 2.0, -sin(xAxisRotation) * (arcStartPoint.x - arcEndPoint.x) / 2.0 + cos(xAxisRotation) * (arcStartPoint.y - arcEndPoint.y) / 2.0);
-    
+
    CGFloat radiiAdjustment = pow(currentPoint.x, 2) / pow(radii.x, 2) + pow(currentPoint.y, 2) / pow(radii.y, 2);
    radii.x *= (radiiAdjustment > 1) ? sqrt(radiiAdjustment) : 1;
    radii.y *= (radiiAdjustment > 1) ? sqrt(radiiAdjustment) : 1;
-    
+
    CGFloat sweep = (largeArcFlag == sweepFlag ? -1 : 1) * sqrt(((pow(radii.x, 2) * pow(radii.y, 2)) - (pow(radii.x, 2) * pow(currentPoint.y, 2)) - (pow(radii.y, 2) * pow(currentPoint.x, 2))) / (pow(radii.x, 2) * pow(currentPoint.y, 2) + pow(radii.y, 2) * pow(currentPoint.x, 2)));
    sweep = (sweep != sweep) ? 0 : sweep;
    CGPoint preCenterPoint = CGPointMake(sweep * radii.x * currentPoint.y / radii.y, sweep * -radii.y * currentPoint.x / radii.x);
-    
+
    CGPoint centerPoint = CGPointMake((arcStartPoint.x + arcEndPoint.x) / 2.0 + cos(xAxisRotation) * preCenterPoint.x - sin(xAxisRotation) * preCenterPoint.y, (arcStartPoint.y + arcEndPoint.y) / 2.0 + sin(xAxisRotation) * preCenterPoint.x + cos(xAxisRotation) * preCenterPoint.y);
-    
-    CGFloat startAngle = angle(CGPointMake(1, 0), CGPointMake((currentPoint.x-preCenterPoint.x)/radii.x,
-                                                              (currentPoint.y-preCenterPoint.y)/radii.y));
-    
+
+    CGFloat startAngle = angle(CGPointMake(1, 0), CGPointMake((currentPoint.x - preCenterPoint.x) / radii.x, (currentPoint.y - preCenterPoint.y) / radii.y));
+
    CGPoint deltaU = CGPointMake((currentPoint.x - preCenterPoint.x) / radii.x,
-                                 (currentPoint.y - preCenterPoint.y) / radii.y);
+        (currentPoint.y - preCenterPoint.y) / radii.y);
    CGPoint deltaV = CGPointMake((-currentPoint.x - preCenterPoint.x) / radii.x,
-                                 (-currentPoint.y - preCenterPoint.y) / radii.y);
+        (-currentPoint.y - preCenterPoint.y) / radii.y);
    CGFloat angleDelta = (deltaU.x * deltaV.y < deltaU.y * deltaV.x ? -1 : 1) * acos(ratio(deltaU, deltaV));
-    
+
    angleDelta = (ratio(deltaU, deltaV) <= -1) ? M_PI : (ratio(deltaU, deltaV) >= 1) ? 0 : angleDelta;
-    
+
+    // check for actually numbers, if this is not valid
+    // kill it, blame WWDC 2017 SVG background for this...
+    if (isnan(startAngle) || isnan(angleDelta)) {
+        return;
+    }
+
    CGFloat radius = MAX(radii.x, radii.y);
    CGPoint scale = (radii.x > radii.y) ? CGPointMake(1, radii.y / radii.x) : CGPointMake(radii.x / radii.y, 1);
-    
-    NSAffineTransform * trans = [NSAffineTransform transform];
+
+    NSAffineTransform* trans = NSAffineTransform.transform;
    [trans translateXBy:-centerPoint.x yBy:-centerPoint.y];
-    [trans rotateByRadians:-xAxisRotation];
-    [trans scaleXBy:(1/scale.x) yBy:(1/scale.y)];
-    
    [path.currentSubpath transformUsingAffineTransform:trans];
+
+    trans = NSAffineTransform.transform;
+    [trans rotateByRadians:-xAxisRotation];
+    [path.currentSubpath transformUsingAffineTransform:trans];
+
+    trans = NSAffineTransform.transform;
+    [trans scaleXBy:(1 / scale.x) yBy:(1 / scale.y)];
+    [path.currentSubpath transformUsingAffineTransform:trans];
+
    [path.currentSubpath appendBezierPathWithArcWithCenter:NSZeroPoint
                                                    radius:radius
                                                startAngle:radians_to_degrees(startAngle)
                                                  endAngle:radians_to_degrees(startAngle + angleDelta)
                                                 clockwise:!sweepFlag];
-    
-    trans = [NSAffineTransform transform];
-    [trans translateXBy:centerPoint.x yBy:centerPoint.y];
-    [trans rotateByRadians:xAxisRotation];
+
+    trans = NSAffineTransform.transform;
    [trans scaleXBy:scale.x yBy:scale.y];
    [path.currentSubpath transformUsingAffineTransform:trans];
-    
-    
+
+    trans = NSAffineTransform.transform;
+    [trans rotateByRadians:xAxisRotation];
+    [path.currentSubpath transformUsingAffineTransform:trans];
+
+    trans = NSAffineTransform.transform;
+    [trans translateXBy:centerPoint.x yBy:centerPoint.y];
+    [path.currentSubpath transformUsingAffineTransform:trans];
 }

@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandHorizontalLine : NSObject <IJSVGCommandProtocol>
+@interface IJSVGCommandHorizontalLine : IJSVGCommand

@end
@@ -10,30 +10,23 @@

@implementation IJSVGCommandHorizontalLine

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"h"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 1;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] lineToPoint:NSMakePoint( params[0], [path currentSubpath].currentPoint.y)];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] lineToPoint:NSMakePoint(params[0], [path currentSubpath].currentPoint.y)];
        return;
    }
-    [[path currentSubpath] relativeLineToPoint:NSMakePoint( params[0], 0.f)];
+    [[path currentSubpath] relativeLineToPoint:NSMakePoint(params[0], 0.f)];
 }

@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandLineTo : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandLineTo : IJSVGCommand

@end
@@ -10,31 +10,24 @@

@implementation IJSVGCommandLineTo

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"l"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 2;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] lineToPoint:NSMakePoint( params[0], params[1])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] lineToPoint:NSMakePoint(params[0], params[1])];
        return;
    }
-    NSPoint point = NSMakePoint( [path currentSubpath].currentPoint.x + params[0],
-                                [path currentSubpath].currentPoint.y + params[1]);
+    NSPoint point = NSMakePoint([path currentSubpath].currentPoint.x + params[0],
+        [path currentSubpath].currentPoint.y + params[1]);
    [[path currentSubpath] lineToPoint:point];
 }

@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandMove : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandMove : IJSVGCommand

@end
@@ -6,34 +6,26 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import "IJSVGCommandMove.h"
 #import "IJSVGCommandLineTo.h"
-
+#import "IJSVGCommandMove.h"

@implementation IJSVGCommandMove

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"m"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 2;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
    // move to's allow more then one move to, but if there are more then one,
    // we need to run the line to instead...who knew!
-    if( command.commandClass == [self class])
-    {
+    if (command.class == self.class && currentCommand.isSubCommand == YES) {
        [IJSVGCommandLineTo runWithParams:params
                               paramCount:count
                                  command:currentCommand
@@ -42,18 +34,17 @@
                                     path:path];
        return;
    }
-    
+
    // actual move to command
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] moveToPoint:NSMakePoint( params[0], params[1])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] moveToPoint:NSMakePoint(params[0], params[1])];
        return;
    }
    @try {
-        [[path currentSubpath] relativeMoveToPoint:NSMakePoint( params[0], params[1])];
+        [[path currentSubpath] relativeMoveToPoint:NSMakePoint(params[0], params[1])];
    }
-    @catch (NSException *exception) {
-        [[path currentSubpath] moveToPoint:NSMakePoint( params[0], params[1])];
+    @catch (NSException* exception) {
+        [[path currentSubpath] moveToPoint:NSMakePoint(params[0], params[1])];
    }
 }

@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandQuadraticCurve : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandQuadraticCurve : IJSVGCommand

@end
@@ -11,28 +11,21 @@

@implementation IJSVGCommandQuadraticCurve

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"q"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 4;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint( params[2], params[3])
-                          controlPoint:NSMakePoint( params[0], params[1])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint(params[2], params[3])
+                                      controlPoint:NSMakePoint(params[0], params[1])];
        return;
    }
    [[path currentSubpath] addQuadCurveToPoint:NSMakePoint([path currentSubpath].currentPoint.x + params[2], [path currentSubpath].currentPoint.y + params[3])
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandSmoothCurve : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandSmoothCurve : IJSVGCommand

@end
@@ -6,70 +6,59 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import "IJSVGCommandSmoothCurve.h"
 #import "IJSVGCommandCurve.h"
+#import "IJSVGCommandSmoothCurve.h"
 #import "IJSVGUtils.h"

@implementation IJSVGCommandSmoothCurve

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"s"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 4;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    NSPoint firstControl = NSMakePoint( [path currentSubpath].currentPoint.x, [path currentSubpath].currentPoint.y );
-    if( command != nil )
-    {
-        if( command.commandClass == [IJSVGCommandCurve class] || command.commandClass == [self class] )
-        {
-            if( command.commandClass == [IJSVGCommandCurve class] )
-            {
-                if( command.type == IJSVGCommandTypeAbsolute )
-                {
-                    firstControl = NSMakePoint(-1*command.parameters[2] + 2*[path currentSubpath].currentPoint.x,
-                                               -1*command.parameters[3] + 2*[path currentSubpath].currentPoint.y);
+    NSPoint firstControl = NSMakePoint([path currentSubpath].currentPoint.x, [path currentSubpath].currentPoint.y);
+    if (command != nil) {
+        if (command.class == [IJSVGCommandCurve class] || command.class == self.class) {
+            if (command.class == [IJSVGCommandCurve class]) {
+                if (command.type == IJSVGCommandTypeAbsolute) {
+                    firstControl = NSMakePoint(-1 * command.parameters[2] + 2 * [path currentSubpath].currentPoint.x,
+                        -1 * command.parameters[3] + 2 * [path currentSubpath].currentPoint.y);
                } else {
                    NSPoint oldPoint = NSMakePoint([path currentSubpath].currentPoint.x - command.parameters[4],
-                                                   [path currentSubpath].currentPoint.y - command.parameters[5]);
-                    firstControl = NSMakePoint(-1*(command.parameters[2] + oldPoint.x) + 2*[path currentSubpath].currentPoint.x,
-                                               -1*(command.parameters[3] + oldPoint.y) + 2*[path currentSubpath].currentPoint.y);
+                        [path currentSubpath].currentPoint.y - command.parameters[5]);
+                    firstControl = NSMakePoint(-1 * (command.parameters[2] + oldPoint.x) + 2 * [path currentSubpath].currentPoint.x,
+                        -1 * (command.parameters[3] + oldPoint.y) + 2 * [path currentSubpath].currentPoint.y);
                }
            } else {
-                if( command.type == IJSVGCommandTypeAbsolute ) {
-                    firstControl = NSMakePoint(-1*command.parameters[0] + 2*[path currentSubpath].currentPoint.x,
-                                               -1*command.parameters[1] + 2*[path currentSubpath].currentPoint.y);
+                if (command.type == IJSVGCommandTypeAbsolute) {
+                    firstControl = NSMakePoint(-1 * command.parameters[0] + 2 * [path currentSubpath].currentPoint.x,
+                        -1 * command.parameters[1] + 2 * [path currentSubpath].currentPoint.y);
                } else {
                    NSPoint oldPoint = NSMakePoint([path currentSubpath].currentPoint.x - command.parameters[2],
-                                                   [path currentSubpath].currentPoint.y - command.parameters[3]);
-                    firstControl = NSMakePoint(-1*(command.parameters[0] + oldPoint.x) + 2*[path currentSubpath].currentPoint.x,
-                                               -1*(command.parameters[1] + oldPoint.y) + 2*[path currentSubpath].currentPoint.y);
+                        [path currentSubpath].currentPoint.y - command.parameters[3]);
+                    firstControl = NSMakePoint(-1 * (command.parameters[0] + oldPoint.x) + 2 * [path currentSubpath].currentPoint.x,
+                        -1 * (command.parameters[1] + oldPoint.y) + 2 * [path currentSubpath].currentPoint.y);
                }
            }
        }
    }
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] curveToPoint:NSMakePoint( params[2], params[3])
-                  controlPoint1:NSMakePoint( firstControl.x, firstControl.y )
-                  controlPoint2:NSMakePoint(params[0], params[1])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] curveToPoint:NSMakePoint(params[2], params[3])
+                              controlPoint1:NSMakePoint(firstControl.x, firstControl.y)
+                              controlPoint2:NSMakePoint(params[0], params[1])];
        return;
    }
-    [[path currentSubpath] curveToPoint:NSMakePoint( [path currentSubpath].currentPoint.x + params[2], [path currentSubpath].currentPoint.y + params[3])
-              controlPoint1:NSMakePoint( firstControl.x, firstControl.y )
-              controlPoint2:NSMakePoint( [path currentSubpath].currentPoint.x + params[0], [path currentSubpath].currentPoint.y + params[1])];
+    [[path currentSubpath] curveToPoint:NSMakePoint([path currentSubpath].currentPoint.x + params[2], [path currentSubpath].currentPoint.y + params[3])
+                          controlPoint1:NSMakePoint(firstControl.x, firstControl.y)
+                          controlPoint2:NSMakePoint([path currentSubpath].currentPoint.x + params[0], [path currentSubpath].currentPoint.y + params[1])];
 }

@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandCommandSmoothQuadraticCurve : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandSmoothQuadraticCurve : IJSVGCommand

@end
@@ -0,0 +1,56 @@
+//
+//  IJSVGCommandCommandQuadraticCurve.m
+//  IconJar
+//
+//  Created by Curtis Hard on 30/08/2014.
+//  Copyright (c) 2014 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGCommandQuadraticCurve.h"
+#import "IJSVGCommandSmoothQuadraticCurve.h"
+#import "IJSVGUtils.h"
+
+@implementation IJSVGCommandSmoothQuadraticCurve
+
+ (NSInteger)requiredParameterCount
+{
+    return 2;
+}
+
+ (void)runWithParams:(CGFloat*)params
+           paramCount:(NSInteger)count
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
+                 type:(IJSVGCommandType)type
+                 path:(IJSVGPath*)path
+{
+    NSPoint commandPoint = NSMakePoint([path currentSubpath].currentPoint.x, [path currentSubpath].currentPoint.y);
+    if (command != nil) {
+        if (command.class == IJSVGCommandQuadraticCurve.class) {
+            // quadratic curve
+            if (command.type == IJSVGCommandTypeAbsolute) {
+                commandPoint = NSMakePoint(-1 * command.parameters[0] + 2 * [path currentSubpath].currentPoint.x,
+                    -1 * command.parameters[1] + 2 * [path currentSubpath].currentPoint.y);
+            } else {
+                NSPoint oldPoint = CGPointMake([path currentSubpath].currentPoint.x - command.parameters[2],
+                    [path currentSubpath].currentPoint.y - command.parameters[3]);
+                commandPoint = CGPointMake(-1 * (command.parameters[0] + oldPoint.x) + 2 * ([path currentSubpath].currentPoint.x),
+                    -1 * (command.parameters[1] + oldPoint.y) + 2 * [path currentSubpath].currentPoint.y);
+            }
+        } else if (command.class == self.class) {
+            // smooth quadratic curve
+            commandPoint = CGPointMake(-1 * (path.lastControlPoint.x) + 2 * ([path currentSubpath].currentPoint.x),
+                -1 * (path.lastControlPoint.y) + 2 * [path currentSubpath].currentPoint.y);
+        }
+    }
+    path.lastControlPoint = commandPoint;
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] addQuadCurveToPoint:NSMakePoint(params[0], params[1])
+                                      controlPoint:commandPoint];
+        return;
+    }
+    [[path currentSubpath] addQuadCurveToPoint:NSMakePoint([path currentSubpath].currentPoint.x + params[0], [path currentSubpath].currentPoint.y + params[1])
+                                  controlPoint:commandPoint];
+}
+
+@end
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGCommand.h"
+#import <Foundation/Foundation.h>

-@interface IJSVGCommandVerticalLine : IJSVGCommand <IJSVGCommandProtocol>
+@interface IJSVGCommandVerticalLine : IJSVGCommand

@end
@@ -10,30 +10,23 @@

@implementation IJSVGCommandVerticalLine

-+ (void)load
-{
-    [IJSVGCommand registerClass:[self class]
-                     forCommand:@"v"];
-}
-
 + (NSInteger)requiredParameterCount
 {
    return 1;
 }

-+ (void)runWithParams:(CGFloat *)params
+ (void)runWithParams:(CGFloat*)params
           paramCount:(NSInteger)count
-              command:(IJSVGCommand *)currentCommand
-      previousCommand:(IJSVGCommand *)command
+              command:(IJSVGCommand*)currentCommand
+      previousCommand:(IJSVGCommand*)command
                 type:(IJSVGCommandType)type
-                 path:(IJSVGPath *)path
+                 path:(IJSVGPath*)path
 {
-    if( type == IJSVGCommandTypeAbsolute )
-    {
-        [[path currentSubpath] lineToPoint:NSMakePoint( [path currentSubpath].currentPoint.x, params[0])];
+    if (type == IJSVGCommandTypeAbsolute) {
+        [[path currentSubpath] lineToPoint:NSMakePoint([path currentSubpath].currentPoint.x, params[0])];
        return;
    }
-    [[path currentSubpath] relativeLineToPoint:NSMakePoint( 0.f, params[0])];
+    [[path currentSubpath] relativeLineToPoint:NSMakePoint(0.f, params[0])];
 }

@end
@@ -6,16 +6,15 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGNode.h"
+#import <Foundation/Foundation.h>

@interface IJSVGDef : IJSVGNode {

@private
-    NSMutableDictionary * _dict;
-    
+    NSMutableDictionary* _dict;
 }

- (void)addDef:(IJSVGNode *)aDef;
+- (void)addDef:(IJSVGNode*)aDef;

@end
@@ -12,28 +12,28 @@

 - (void)dealloc
 {
-    [_dict release], _dict = nil;
+    (void)([_dict release]), _dict = nil;
    [super dealloc];
 }

 - (id)init
 {
-    if( ( self = [super initWithDef:NO] ) != nil ) {
+    if ((self = [super initWithDef:NO]) != nil) {
        _dict = [[NSMutableDictionary alloc] init];
    }
    return self;
 }

- (void)addDef:(IJSVGNode *)aDef
+- (void)addDef:(IJSVGNode*)aDef
 {
-    if( aDef.identifier == nil ) {
+    if (aDef.identifier == nil) {
        return;
    }
    [_dict setObject:aDef
              forKey:aDef.identifier];
 }

- (IJSVGDef *)defForID:(NSString *)anID
+- (IJSVGDef*)defForID:(NSString*)anID
 {
    return [_dict objectForKey:anID];
 }
@@ -8,9 +8,9 @@

 #import <Foundation/Foundation.h>

-static NSString * const IJSVGErrorDomain = @"IJSVGErrorDomain";
+static NSString* const IJSVGErrorDomain = @"IJSVGErrorDomain";

-NS_ENUM(NSInteger) {
+NS_ENUM(NSInteger){
    IJSVGErrorReadingFile,
    IJSVGErrorParsingFile,
    IJSVGErrorParsingSVG,
@@ -10,48 +10,52 @@

@class IJSVG;

-typedef void (^IJSVGCGPathHandler)(const CGPathElement * pathElement);
+typedef void (^IJSVGCGPathHandler)(const CGPathElement* pathElement);

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

-typedef NS_OPTIONS( NSInteger, IJSVGExporterOptions) {
+typedef NS_OPTIONS(NSInteger, IJSVGExporterOptions) {
+    IJSVGExporterOptionNone = 1 << 0,
    IJSVGExporterOptionRemoveUselessGroups = 1 << 1,
    IJSVGExporterOptionRemoveUselessDef = 1 << 2,
    IJSVGExporterOptionMoveAttributesToGroup = 1 << 3,
    IJSVGExporterOptionCreateUseForPaths = 1 << 4,
    IJSVGExporterOptionSortAttributes = 1 << 5,
    IJSVGExporterOptionCollapseGroups = 1 << 6,
-    IJSVGExporteroptionCleanupPaths = 1 << 7,
-    IJSVGExporterOptionAll = IJSVGExporterOptionRemoveUselessDef|
-        IJSVGExporterOptionRemoveUselessGroups|
-        IJSVGExporterOptionCreateUseForPaths|
-        IJSVGExporterOptionMoveAttributesToGroup|
-        IJSVGExporterOptionSortAttributes|
-        IJSVGExporterOptionCollapseGroups|
-        IJSVGExporteroptionCleanupPaths
+    IJSVGExporterOptionCleanupPaths = 1 << 7,
+    IJSVGExporterOptionRemoveHiddenElements = 1 << 8,
+    IJSVGExporterOptionScaleToSizeIfNecessary = 1 << 9,
+    IJSVGExporterOptionCompressOutput = 1 << 10,
+    IJSVGExporterOptionCollapseGradients = 1 << 11,
+    IJSVGExporterOptionCreateClasses = 1 << 12,
+    IJSVGExporterOptionRemoveWidthHeightAttributes = 1 << 13,
+    IJSVGExporterOptionColorAllowRRGGBBAA = 1 << 14,
+    IJSVGExporterOptionRemoveComments = 1 << 15,
+    IJSVGExporterOptionAll = IJSVGExporterOptionRemoveUselessDef | IJSVGExporterOptionRemoveUselessGroups | IJSVGExporterOptionCreateUseForPaths | IJSVGExporterOptionMoveAttributesToGroup | IJSVGExporterOptionSortAttributes | IJSVGExporterOptionCollapseGroups | IJSVGExporterOptionCleanupPaths | IJSVGExporterOptionRemoveHiddenElements | IJSVGExporterOptionScaleToSizeIfNecessary | IJSVGExporterOptionCompressOutput | IJSVGExporterOptionCollapseGradients | IJSVGExporterOptionRemoveWidthHeightAttributes | IJSVGExporterOptionColorAllowRRGGBBAA | IJSVGExporterOptionRemoveComments
 };

+BOOL IJSVGExporterHasOption(IJSVGExporterOptions options, NSInteger option);
+
@interface IJSVGExporter : NSObject {
-    
+
@private
-    IJSVG * _svg;
+    IJSVG* _svg;
+    CGSize _size;
    IJSVGExporterOptions _options;
-    NSXMLDocument * _dom;
-    NSXMLElement * _defElement;
-    NSInteger _gradCount;
-    NSInteger _patternCount;
-    NSInteger _imageCount;
-    NSInteger _maskCount;
-    NSInteger _pathCount;
-    
+    NSXMLDocument* _dom;
+    NSXMLElement* _defElement;
+    NSXMLElement* _scaledRootNode;
+    NSInteger _idCount;
+    NSInteger _shortIdCount;
 }

-@property (nonatomic, copy) NSString * title;
-@property (nonatomic, copy) NSString * description;
+@property (nonatomic, copy) NSString* title;
+@property (nonatomic, copy) NSString* description;

- (id)initWithSVG:(IJSVG *)svg
+- (id)initWithSVG:(IJSVG*)svg
+             size:(CGSize)size
          options:(IJSVGExporterOptions)options;
- (NSString *)SVGString;
- (NSData *)SVGData;
+- (NSString*)SVGString;
+- (NSData*)SVGData;

@end
@@ -9,24 +9,24 @@
 #import <Foundation/Foundation.h>

@interface IJSVGExporterPathInstruction : NSObject {
-    
+
@private
    NSInteger _dataCount;
    char _instruction;
-    CGFloat * _data;
+    CGFloat* _data;
 }

-+ (NSArray<IJSVGExporterPathInstruction *> *)instructionsFromPath:(CGPathRef)path;
+ (NSArray<IJSVGExporterPathInstruction*>*)instructionsFromPath:(CGPathRef)path;

 - (id)initWithInstruction:(char)instruction
                dataCount:(NSInteger)floatCount;

 - (void)setInstruction:(char)newInstruction;
 - (char)instruction;
- (CGFloat *)data;
+- (CGFloat*)data;
 - (NSInteger)dataLength;

-+ (void)convertInstructionsToRelativeCoordinates:(NSArray<IJSVGExporterPathInstruction *> *)instructions;
-+ (NSString *)pathStringFromInstructions:(NSArray<IJSVGExporterPathInstruction *> *)instructions;
+ (void)convertInstructionsToRelativeCoordinates:(NSArray<IJSVGExporterPathInstruction*>*)instructions;
+ (NSString*)pathStringFromInstructions:(NSArray<IJSVGExporterPathInstruction*>*)instructions;

@end
@@ -6,14 +6,14 @@
 //  Copyright © 2017 Curtis Hard. All rights reserved.
 //

-#import "IJSVGExporterPathInstruction.h"
 #import "IJSVGExporter.h"
+#import "IJSVGExporterPathInstruction.h"

@implementation IJSVGExporterPathInstruction

 - (void)dealloc
 {
-    if(_data != NULL) {
+    if (_data != NULL) {
        free(_data);
    }
    [super dealloc];
@@ -22,12 +22,12 @@
 - (id)initWithInstruction:(char)instruction
                dataCount:(NSInteger)floatCount
 {
-    if((self = [super init]) != nil) {
+    if ((self = [super init]) != nil) {
        _instruction = instruction;
-        
+
        // only allocate if not zero
-        if(floatCount != 0) {
-            _data = (CGFloat *)calloc(sizeof(CGFloat), floatCount);
+        if (floatCount != 0) {
+            _data = (CGFloat*)calloc(sizeof(CGFloat), floatCount);
        }
    }
    return self;
@@ -48,306 +48,316 @@
    return _instruction;
 }

- (CGFloat *)data
+- (CGFloat*)data
 {
    return _data;
 }

-+ (NSString *)pathStringFromInstructions:(NSArray<IJSVGExporterPathInstruction *> *)instructions
+ (NSString*)pathStringFromInstructions:(NSArray<IJSVGExporterPathInstruction*>*)instructions
 {
-    NSMutableArray * pathData = [[[NSMutableArray alloc] init] autorelease];
-    for(IJSVGExporterPathInstruction * instruction in instructions) {
-        CGFloat * data = instruction.data;
-        NSString * str = nil;
-        switch(instruction.instruction) {
-                
-                // move
-            case 'M':
-            case 'm': {
-                str = [NSString stringWithFormat:@"%c%g,%g",
-                       instruction.instruction,data[0],data[1]];
-                [pathData addObject:str];
-                break;
-            }
-                
-                // vertical and horizonal line
-            case 'V':
-            case 'v':
-            case 'H':
-            case 'h': {
-                str = [NSString stringWithFormat:@"%c%g",
-                       instruction.instruction,data[0]];
-                [pathData addObject:str];
-                break;
-            }
-                
-                // line
-            case 'L':
-            case 'l': {
-                str = [NSString stringWithFormat:@"%c%g,%g",
-                       instruction.instruction, data[0], data[1]];
-                [pathData addObject:str];
-                break;
-            }
-                
-                // curve
-            case 'C':
-            case 'c': {
-                str = [NSString stringWithFormat:@"%c%g,%g %g,%g %g,%g",
-                       instruction.instruction, data[0], data[1],
-                       data[2], data[3], data[4], data[5]];
-                [pathData addObject:str];
-                break;
-            }
-                
-                // quadratic curve
-            case 'Q':
-            case 'q': {
-                str = [NSString stringWithFormat:@"%c%g,%g %g,%g",
-                       instruction.instruction, data[0], data[1],
-                       data[2], data[3]];
-                [pathData addObject:str];
-                break;
-            }
-                
-                // close path
-            case 'Z':
-            case 'z': {
-                str = [NSString stringWithFormat:@"%c",instruction.instruction];
-                [pathData addObject:str];
-            }
+    NSMutableArray* pathData = [[[NSMutableArray alloc] init] autorelease];
+    for (IJSVGExporterPathInstruction* instruction in instructions) {
+        CGFloat* data = instruction.data;
+        NSString* str = nil;
+        switch (instruction.instruction) {
+
+            // move
+        case 'M':
+        case 'm': {
+            char* buffer;
+            asprintf(&buffer, "%c%g,%g", instruction.instruction, data[0], data[1]);
+            str = [NSString stringWithCString:buffer
+                                     encoding:NSUTF8StringEncoding];
+            free(buffer);
+            [pathData addObject:str];
+            break;
+        }
+
+            // vertical and horizonal line
+        case 'V':
+        case 'v':
+        case 'H':
+        case 'h': {
+            char* buffer;
+            asprintf(&buffer, "%c%g", instruction.instruction, data[0]);
+            str = [NSString stringWithCString:buffer
+                                     encoding:NSUTF8StringEncoding];
+            free(buffer);
+            [pathData addObject:str];
+            break;
+        }
+
+            // line
+        case 'L':
+        case 'l': {
+            char* buffer;
+            asprintf(&buffer, "%c%g,%g", instruction.instruction, data[0], data[1]);
+            str = [NSString stringWithCString:buffer
+                                     encoding:NSUTF8StringEncoding];
+            free(buffer);
+            [pathData addObject:str];
+            break;
+        }
+
+            // curve
+        case 'C':
+        case 'c': {
+            char* buffer;
+            asprintf(&buffer, "%c%g,%g %g,%g %g,%g", instruction.instruction,
+                data[0], data[1], data[2], data[3], data[4], data[5]);
+            str = [NSString stringWithCString:buffer
+                                     encoding:NSUTF8StringEncoding];
+            free(buffer);
+            [pathData addObject:str];
+            break;
+        }
+
+            // quadratic curve
+        case 'Q':
+        case 'q': {
+            char* buffer;
+            asprintf(&buffer, "%c%g,%g %g,%g", instruction.instruction,
+                data[0], data[1], data[2], data[3]);
+            str = [NSString stringWithCString:buffer
+                                     encoding:NSUTF8StringEncoding];
+            free(buffer);
+            [pathData addObject:str];
+            break;
+        }
+
+            // close path
+        case 'Z':
+        case 'z': {
+            str = [NSString stringWithFormat:@"%c", instruction.instruction];
+            [pathData addObject:str];
+        }
        }
    }
    return [pathData componentsJoinedByString:@""];
 }

-+ (void)convertInstructionsToRelativeCoordinates:(NSArray<IJSVGExporterPathInstruction *> *)instructions
+ (void)convertInstructionsToRelativeCoordinates:(NSArray<IJSVGExporterPathInstruction*>*)instructions
 {
-    CGFloat point[2] = {0,0};
-    CGFloat subpathPoint[2] = {0,0};
-    
+    CGFloat point[2] = { 0, 0 };
+    CGFloat subpathPoint[2] = { 0, 0 };
+
    NSInteger index = 0;
-    for(IJSVGExporterPathInstruction * anInstruction in instructions) {
+    for (IJSVGExporterPathInstruction* anInstruction in instructions) {
        char instruction = anInstruction.instruction;
-        CGFloat * data = anInstruction.data;
+        CGFloat* data = anInstruction.data;
        NSInteger length = anInstruction.dataLength;
-        
-        if(data != NULL) {
-            
+
+        if (data != NULL) {
+
            // already relative
-            if(instruction == 'm' || instruction == 'c' || instruction == 's' ||
-               instruction == 'l' || instruction == 'q' || instruction == 't' ||
-               instruction == 'a') {
-                
-                point[0] += data[length-2];
-                point[1] += data[length-1];
-                
-                if(instruction == 'm') {
+            if (instruction == 'm' || instruction == 'c' || instruction == 's' || instruction == 'l' || instruction == 'q' || instruction == 't' || instruction == 'a') {
+
+                point[0] += data[length - 2];
+                point[1] += data[length - 1];
+
+                if (instruction == 'm') {
                    subpathPoint[0] = point[0];
                    subpathPoint[1] = point[1];
                }
-                
-            } else if(instruction == 'h') {
+
+            } else if (instruction == 'h') {
                point[0] += data[0];
-            } else if(instruction == 'v') {
+            } else if (instruction == 'v') {
                point[1] += data[0];
            }
-            
+
            // convert absolute to relative
-            if(instruction == 'M') {
-                if(index > 0) {
+            if (instruction == 'M') {
+                if (index > 0) {
                    instruction = 'm';
                }
-                
+
                data[0] -= point[0];
                data[1] -= point[1];
-                
+
                subpathPoint[0] = point[0] += data[0];
                subpathPoint[1] = point[1] += data[1];
-                
-            } else if(instruction == 'L' || instruction == 'T') {
-                
+
+            } else if (instruction == 'L' || instruction == 'T') {
+
                instruction = tolower(instruction);
-                
+
                data[0] -= point[0];
                data[1] -= point[1];
-                
+
                point[0] += data[0];
                point[1] += data[1];
-                
-            } else if(instruction == 'C') {
-                
+
+            } else if (instruction == 'C') {
+
                instruction = 'c';
-                
+
                data[0] -= point[0];
                data[1] -= point[1];
                data[2] -= point[0];
                data[3] -= point[1];
                data[4] -= point[0];
                data[5] -= point[1];
-                
+
                point[0] += data[4];
                point[1] += data[5];
-                
-            } else if(instruction == 'S' || instruction == 'Q') {
-                
+
+            } else if (instruction == 'S' || instruction == 'Q') {
+
                instruction = tolower(instruction);
-                
+
                data[0] -= point[0];
                data[1] -= point[1];
                data[2] -= point[0];
                data[3] -= point[1];
-                
+
                point[0] += data[2];
                point[1] += data[3];
-                
-            } else if(instruction == 'A') {
-                
+
+            } else if (instruction == 'A') {
+
                instruction = 'a';
-                
+
                data[5] -= point[0];
                data[6] -= point[1];
-                
+
                point[0] += data[5];
                point[1] += data[6];
-                
-            } else if(instruction == 'H') {
-                
+
+            } else if (instruction == 'H') {
+
                instruction = 'h';
-                
+
                data[0] -= point[0];
-                
+
                point[0] += data[0];
-                
-            } else if(instruction == 'V') {
-                
+
+            } else if (instruction == 'V') {
+
                instruction = 'v';
-                
+
                data[0] -= point[1];
-                
+
                point[1] += data[0];
-                
            }
-            
+
            // reset the instruction
            [anInstruction setInstruction:instruction];
-            
-        } else if(instruction == 'Z' || instruction == 'z') {
+
+        } else if (instruction == 'Z' || instruction == 'z') {
            point[0] = subpathPoint[0];
            point[1] = subpathPoint[1];
        }
-        
+
        // increment index
        index++;
    }
 }

-+ (NSArray<IJSVGExporterPathInstruction *> *)instructionsFromPath:(CGPathRef)path
+ (NSArray<IJSVGExporterPathInstruction*>*)instructionsFromPath:(CGPathRef)path
 {
-    
+
    // keep track of the current point
    __block CGPoint currentPoint = CGPointZero;
-    NSMutableArray * instructions = [[[NSMutableArray alloc] init] autorelease];
-    
+    NSMutableArray* instructions = [[[NSMutableArray alloc] init] autorelease];
+
    // create the path callback
-    IJSVGCGPathHandler callback = ^(const CGPathElement * pathElement) {
-        IJSVGExporterPathInstruction * instruction = nil;
+    IJSVGCGPathHandler callback = ^(const CGPathElement* pathElement) {
+        IJSVGExporterPathInstruction* instruction = nil;
        // work out what to do
-        switch(pathElement->type) {
-                
-            case kCGPathElementMoveToPoint: {
-                // move to command
-                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'M'
+        switch (pathElement->type) {
+
+        case kCGPathElementMoveToPoint: {
+            // move to command
+            instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'M'
+                                                                           dataCount:2] autorelease];
+            CGPoint point = pathElement->points[0];
+            instruction.data[0] = point.x;
+            instruction.data[1] = point.y;
+            currentPoint = point;
+
+            [instructions addObject:instruction];
+            break;
+        }
+
+        case kCGPathElementAddLineToPoint: {
+            // line to command
+            CGPoint point = pathElement->points[0];
+            if (point.x == currentPoint.x) {
+                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'V'
+                                                                               dataCount:1] autorelease];
+                instruction.data[0] = point.y;
+            } else if (point.y == currentPoint.y) {
+                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'H'
+                                                                               dataCount:1] autorelease];
+                instruction.data[0] = point.x;
+            } else {
+                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'L'
                                                                               dataCount:2] autorelease];
-                CGPoint point = pathElement->points[0];
                instruction.data[0] = point.x;
                instruction.data[1] = point.y;
-                currentPoint = point;
-                
-                [instructions addObject:instruction];
-                break;
-            }
-                
-            case kCGPathElementAddLineToPoint: {
-                // line to command
-                CGPoint point = pathElement->points[0];
-                if(point.x == currentPoint.x) {
-                    instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'V'
-                                                                                   dataCount:1] autorelease];
-                    instruction.data[0] = point.y;
-                } else if(point.y == currentPoint.y) {
-                    instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'H'
-                                                                                   dataCount:1] autorelease];
-                    instruction.data[0] = point.x;
-                } else {
-                    instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'L'
-                                                                                   dataCount:2] autorelease];
-                    instruction.data[0] = point.x;
-                    instruction.data[1] = point.y;
-                }
-                currentPoint = point;
-                
-                [instructions addObject:instruction];
-                break;
-            }
-                
-            case kCGPathElementAddQuadCurveToPoint: {
-                // quad curve to command
-                CGPoint controlPoint = pathElement->points[0];
-                CGPoint point = pathElement->points[1];
-                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'Q'
-                                                                               dataCount:4] autorelease];
-                instruction.data[0] = controlPoint.x;
-                instruction.data[1] = controlPoint.y;
-                instruction.data[2] = point.x;
-                instruction.data[3] = point.y;
-                currentPoint = point;
-                
-                [instructions addObject:instruction];
-                break;
-            }
-                
-            case kCGPathElementAddCurveToPoint: {
-                // curve to command
-                CGPoint controlPoint1 = pathElement->points[0];
-                CGPoint controlPoint2 = pathElement->points[1];
-                CGPoint point = pathElement->points[2];
-                currentPoint = point;
-                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'C'
-                                                                               dataCount:6] autorelease];
-                instruction.data[0] = controlPoint1.x;
-                instruction.data[1] = controlPoint1.y;
-                instruction.data[2] = controlPoint2.x;
-                instruction.data[3] = controlPoint2.y;
-                instruction.data[4] = point.x;
-                instruction.data[5] = point.y;
-                
-                [instructions addObject:instruction];
-                break;
-            }
-                
-            case kCGPathElementCloseSubpath: {
-                // close command
-                instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'Z'
-                                                                               dataCount:0] autorelease];
-                [instructions addObject:instruction];
-                break;
            }
+            currentPoint = point;
+
+            [instructions addObject:instruction];
+            break;
+        }
+
+        case kCGPathElementAddQuadCurveToPoint: {
+            // quad curve to command
+            CGPoint controlPoint = pathElement->points[0];
+            CGPoint point = pathElement->points[1];
+            instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'Q'
+                                                                           dataCount:4] autorelease];
+            instruction.data[0] = controlPoint.x;
+            instruction.data[1] = controlPoint.y;
+            instruction.data[2] = point.x;
+            instruction.data[3] = point.y;
+            currentPoint = point;
+
+            [instructions addObject:instruction];
+            break;
+        }
+
+        case kCGPathElementAddCurveToPoint: {
+            // curve to command
+            CGPoint controlPoint1 = pathElement->points[0];
+            CGPoint controlPoint2 = pathElement->points[1];
+            CGPoint point = pathElement->points[2];
+            currentPoint = point;
+            instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'C'
+                                                                           dataCount:6] autorelease];
+            instruction.data[0] = controlPoint1.x;
+            instruction.data[1] = controlPoint1.y;
+            instruction.data[2] = controlPoint2.x;
+            instruction.data[3] = controlPoint2.y;
+            instruction.data[4] = point.x;
+            instruction.data[5] = point.y;
+
+            [instructions addObject:instruction];
+            break;
+        }
+
+        case kCGPathElementCloseSubpath: {
+            // close command
+            instruction = [[[IJSVGExporterPathInstruction alloc] initWithInstruction:'Z'
+                                                                           dataCount:0] autorelease];
+            [instructions addObject:instruction];
+            break;
+        }
        }
    };
-    
+
    // apply the
    CGPathApply(path, (__bridge void*)callback, IJSVGExporterPathCaller);
-    
+
    // remove last instruction if it was Z -> M
-    IJSVGExporterPathInstruction * lastInstruction = instructions.lastObject;
-    if(lastInstruction.instruction == 'M' ||
-       lastInstruction.instruction == 'm') {
-        if(instructions.count >= 2) {
-            NSInteger index = [instructions indexOfObject:lastInstruction]-1;
-            IJSVGExporterPathInstruction * prevInstruction = instructions[index];
-            if(prevInstruction.instruction == 'z' ||
-               prevInstruction.instruction == 'Z') {
+    IJSVGExporterPathInstruction* lastInstruction = instructions.lastObject;
+    if (lastInstruction.instruction == 'M' || lastInstruction.instruction == 'm') {
+        if (instructions.count >= 2) {
+            NSInteger index = [instructions indexOfObject:lastInstruction] - 1;
+            IJSVGExporterPathInstruction* prevInstruction = instructions[index];
+            if (prevInstruction.instruction == 'z' || prevInstruction.instruction == 'Z') {
                [instructions removeLastObject];
            }
        }
@@ -6,19 +6,24 @@
 //  Copyright (c) 2015 Curtis Hard. All rights reserved.
 //

+#import "IJSVG.h"
 #import <Foundation/Foundation.h>

+typedef void (^IJSVGFontConverterEnumerateBlock)(NSString* unicode, IJSVG* svg);
+
@interface IJSVGFontConverter : NSObject {
-    
+
@private
-    NSURL * _url;
-    NSFont * _font;
-    NSMutableDictionary * _paths;
+    NSURL* _url;
+    NSFont* _font;
+    NSMutableDictionary<NSString*, id>* _transformedPaths;
 }

- (id)initWithFontAtFileURL:(NSURL *)url;
- (NSDictionary *)paths;
-+ (NSBezierPath *)bezierpathFromCGPath:(CGPathRef)path;
- (NSFont *)font;
+- (id)initWithFontAtFileURL:(NSURL*)url;
+- (NSFont*)font;
+- (void)enumerateUsingBlock:(IJSVGFontConverterEnumerateBlock)block;
+
+ (IJSVG*)convertIJSVGPathToSVG:(IJSVGPath*)path;
+ (IJSVG*)convertPathToSVG:(CGPathRef)path;

@end
@@ -6,32 +6,32 @@
 //  Copyright (c) 2015 Curtis Hard. All rights reserved.
 //

-#import "IJSVGFontConverter.h"
 #import "IJSVGBezierPathAdditions.h"
+#import "IJSVGFontConverter.h"
+#import "IJSVGShapeLayer.h"

@implementation IJSVGFontConverter

 - (void)dealloc
 {
-    [_paths release], _paths = nil;
-    [_url release], _url = nil;
-    [_font release], _font = nil;
+    (void)([_transformedPaths release]), _transformedPaths = nil;
+    (void)([_url release]), _url = nil;
+    (void)([_font release]), _font = nil;
    [super dealloc];
 }

- (id)initWithFontAtFileURL:(NSURL *)url
+- (id)initWithFontAtFileURL:(NSURL*)url
 {
-    if( ( self = [super init] ) != nil )
-    {
+    if ((self = [super init]) != nil) {
        _url = [url copy];
-        
+
        // load the font
        CGDataProviderRef dataProvider = CGDataProviderCreateWithURL((CFURLRef)_url);
        CGFontRef fontRef = CGFontCreateWithDataProvider(dataProvider);
-        CTFontRef font = CTFontCreateWithGraphicsFont( fontRef, 30.f, NULL, NULL );
-        
+        CTFontRef font = CTFontCreateWithGraphicsFont(fontRef, 30.f, NULL, NULL);
+
        // toll free bridge between NSFont at CTFont :)
-        _font = [(NSFont *)font copy];
+        _font = [(NSFont*)font copy];
        CGFontRelease(fontRef);
        CGDataProviderRelease(dataProvider);
        CFRelease(font);
@@ -39,29 +39,25 @@
    return self;
 }

- (NSFont *)font
+- (NSFont*)font
 {
    return _font;
 }

- (NSArray *)allCharacters
+- (NSArray*)allCharacters
 {
-    NSCharacterSet * charSet = _font.coveredCharacterSet;
-    NSMutableArray * array = [[[NSMutableArray alloc] init] autorelease];
-    for( int plane = 0; plane <= 16; plane++ )
-    {
-        if( [charSet hasMemberInPlane:plane] )
-        {
+    NSCharacterSet* charSet = _font.coveredCharacterSet;
+    NSMutableArray* array = [[[NSMutableArray alloc] init] autorelease];
+    NSStringEncoding encoding = NSUTF32LittleEndianStringEncoding;
+    for (int plane = 0; plane <= 16; plane++) {
+        if ([charSet hasMemberInPlane:plane]) {
            UTF32Char c;
-            for( c = plane << 16; c < (plane+1) << 16; c++ )
-            {
-                if( [charSet longCharacterIsMember:c] )
-                {
+            for (c = plane << 16; c < (plane + 1) << 16; c++) {
+                if ([charSet longCharacterIsMember:c]) {
                    UTF32Char c1 = NSSwapHostIntToLittle(c);
-                    // add it...
                    [array addObject:[[[NSString alloc] initWithBytes:&c1
                                                               length:4
-                                                             encoding:NSUTF32LittleEndianStringEncoding] autorelease]];
+                                                             encoding:encoding] autorelease]];
                }
            }
        }
@@ -71,111 +67,64 @@

 - (void)generateMap
 {
-    // we have already been made!
-    if( _paths.count != 0 )
-        return;
-    
-    _paths = [[NSMutableDictionary alloc] init];
    CTFontRef font = (CTFontRef)_font;
-    for( NSString * charString in [self allCharacters] )
-    {
+    for (NSString* charString in [self allCharacters]) {
        // get the characters in each char
        NSUInteger count = charString.length;
        unichar characters[count];
        [charString getCharacters:characters
-                            range:NSMakeRange( 0, count )];
-        
+                            range:NSMakeRange(0, count)];
+
        // get the glyphs
        CGGlyph glyphs[count];
-        CTFontGetGlyphsForCharacters( font, characters, glyphs, count);
-        CGPathRef path = CTFontCreatePathForGlyph( font, glyphs[0], NULL );
-        if( path != NULL )
-        {
-            NSString * k = [NSString stringWithFormat:@"%04x",[charString characterAtIndex:0]];
-            [self parseCGPath:path
-           forCharacterString:k];
+        CTFontGetGlyphsForCharacters(font, characters, glyphs, count);
+        CGPathRef path = CTFontCreatePathForGlyph(font, glyphs[0], NULL);
+        if (path != NULL) {
+            // add SVG to the dictionary
+            NSString* key = [NSString stringWithFormat:@"%04x", [charString characterAtIndex:0]];
+            CGPathRef flippedPath = [IJSVGUtils newFlippedCGPath:path];
+            _transformedPaths[key] = (id)flippedPath;
+            CGPathRelease(flippedPath);
        }
        CGPathRelease(path);
    }
 }

- (void)parseCGPath:(CGPathRef)path
- forCharacterString:(NSString *)string
+- (void)enumerateUsingBlock:(IJSVGFontConverterEnumerateBlock)block
 {
-    [_paths setObject:[[self class] bezierpathFromCGPath:path]
-               forKey:string];
-}
+    if (_transformedPaths == nil) {
+        _transformedPaths = [[NSMutableDictionary alloc] init];
+        [self generateMap];
+    }

- (NSDictionary *)paths
-{
-    [self generateMap];
-    return _paths;
-}
-
-static void IJSVGCGPathCallback(void * info, const CGPathElement * element)
-{
-    NSBezierPath * path = (NSBezierPath *)info;
-    CGPoint * points = element->points;
-    switch( element->type )
-    {
-        // move to
-        case kCGPathElementMoveToPoint:
-        {
-            [path moveToPoint:NSMakePoint( points[0].x, points[0].y)];
-            break;
-        }
-            
-        // line to
-        case kCGPathElementAddLineToPoint:
-        {
-            [path lineToPoint:NSMakePoint( points[0].x, points[0].y)];;
-            break;
-        }
-            
-        // quad curve
-        case kCGPathElementAddQuadCurveToPoint:
-        {
-            [path addQuadCurveToPoint:points[1] controlPoint:points[0]];
-            break;
-        }
-            
-        // curve to
-        case kCGPathElementAddCurveToPoint:
-        {
-            [path curveToPoint:NSMakePoint(points[2].x, points[2].y)
-                 controlPoint1:NSMakePoint( points[0].x, points[0].y)
-                 controlPoint2:NSMakePoint( points[1].x, points[1].y)];
-            break;
-        }
-            
-        // close
-        case kCGPathElementCloseSubpath: {
-            [path closePath];
-            break;
-        }
+    for (NSString* key in _transformedPaths.allKeys) {
+        block(key, [self.class convertPathToSVG:(CGPathRef)_transformedPaths[key]]);
    }
 }

-+ (NSBezierPath *)bezierpathFromCGPath:(CGPathRef)path
+ (IJSVG*)convertIJSVGPathToSVG:(IJSVGPath*)path
 {
-    NSBezierPath * bezPath = [NSBezierPath bezierPath];
-    
-    // pass the path
-    CGPathApply( path, bezPath, IJSVGCGPathCallback );
-    
-    // the glyph will be upside down, so we need to turn it up the right way!
-    NSAffineTransform * trans = [NSAffineTransform transform];
-    
-    // scale -1 on the Y axis so its now correct but to far up
-    [trans scaleXBy:1.f
-                yBy:-1.f];
-    
-    // move it back down by its height
-    [trans translateXBy:0.f
-                    yBy:bezPath.controlPointBounds.size.height];
-    
-    [bezPath transformUsingAffineTransform:trans];
-    return bezPath;
+    CGPathRef cgPath = [IJSVGUtils newCGPathFromBezierPath:path.path];
+    CGPathRef flippedPath = [IJSVGUtils newFlippedCGPath:cgPath];
+    IJSVG* svg = [self convertPathToSVG:flippedPath];
+    CGPathRelease(flippedPath);
+    CGPathRelease(cgPath);
+    return svg;
+}
+
+ (IJSVG*)convertPathToSVG:(CGPathRef)path
+{
+    __block IJSVG* svg = nil;
+    IJSVGBeginTransactionLock();
+    IJSVGGroupLayer* layer = [[[IJSVGGroupLayer alloc] init] autorelease];
+    IJSVGShapeLayer* shape = [[[IJSVGShapeLayer alloc] init] autorelease];
+    [layer addSublayer:shape];
+    shape.path = path;
+    CGRect box = CGPathGetPathBoundingBox(path);
+    svg = [[IJSVG alloc] initWithSVGLayer:layer
+                                  viewBox:box];
+    IJSVGEndTransactionLock();
+    return [svg autorelease];
 }

@end
@@ -10,7 +10,7 @@
 #import "IJSVGNode.h"

@interface IJSVGForeignObject : IJSVGNode {
-    
+
    NSString * requiredExtension;
    
 }
@@ -14,7 +14,7 @@

 - (void)dealloc
 {
-    [requiredExtension release], requiredExtension = nil;
+    (void)([requiredExtension release]), requiredExtension = nil;
    [super dealloc];
 }

@@ -6,26 +6,33 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
+#import "IJSVGColorList.h"
 #import "IJSVGDef.h"
 #import "IJSVGTransform.h"
+#import <Foundation/Foundation.h>

@interface IJSVGGradient : IJSVGNode

-@property ( nonatomic, retain ) NSGradient * gradient;
-@property ( nonatomic, assign ) CGFloat angle;
-@property ( nonatomic, assign ) CGPoint startPoint;
-@property ( nonatomic, assign ) CGPoint endPoint;
-@property ( nonatomic, assign ) CGGradientRef CGGradient;
-@property ( nonatomic, retain ) IJSVGUnitLength * x1;
-@property ( nonatomic, retain ) IJSVGUnitLength * x2;
-@property ( nonatomic, retain ) IJSVGUnitLength * y1;
-@property ( nonatomic, retain ) IJSVGUnitLength * y2;
+@property (nonatomic, retain) NSGradient* gradient;
+@property (nonatomic, assign) CGGradientRef CGGradient;
+@property (nonatomic, retain) IJSVGUnitLength* x1;
+@property (nonatomic, retain) IJSVGUnitLength* x2;
+@property (nonatomic, retain) IJSVGUnitLength* y1;
+@property (nonatomic, retain) IJSVGUnitLength* y2;
+@property (nonatomic, retain) IJSVGColorList* colorList;

-+ (CGFloat *)computeColorStopsFromString:(NSXMLElement *)element
-                                  colors:(NSArray **)someColors;
+ (CGFloat*)computeColorStopsFromString:(NSXMLElement*)element
+                                 colors:(NSArray**)someColors;
 - (CGGradientRef)CGGradient;
 - (void)drawInContextRef:(CGContextRef)ctx
-                    rect:(NSRect)rect;
+              objectRect:(NSRect)objectRect
+       absoluteTransform:(CGAffineTransform)absoluteTransform
+                viewPort:(CGRect)viewBox;
+
+- (void)_debugStart:(CGPoint)startPoint
+                end:(CGPoint)endPoint
+            context:(CGContextRef)ctx;
+
+- (IJSVGColorList*)computedColorList;

@end
@@ -11,129 +11,169 @@
@implementation IJSVGGradient

@synthesize gradient, CGGradient;
-@synthesize angle, startPoint, endPoint;
@synthesize x1, x2, y1, y2;
+@synthesize colorList = _colorList;

 - (void)dealloc
 {
-    [x1 release], x1 = nil;
-    [x2 release], x2 = nil;
-    [y1 release], y1 = nil;
-    [y2 release], y2 = nil;
-    [gradient release], gradient = nil;
-    if( CGGradient != nil ) {
+    (void)([x1 release]), x1 = nil;
+    (void)([x2 release]), x2 = nil;
+    (void)([y1 release]), y1 = nil;
+    (void)([y2 release]), y2 = nil;
+    (void)([gradient release]), gradient = nil;
+    (void)([_colorList release]), _colorList = nil;
+    if (CGGradient != nil) {
        CGGradientRelease(CGGradient);
    }
    [super dealloc];
 }

- (id)copyWithZone:(NSZone *)zone
+- (id)copyWithZone:(NSZone*)zone
 {
-    IJSVGGradient * clone = [super copyWithZone:zone];
+    IJSVGGradient* clone = [super copyWithZone:zone];
    clone.gradient = [[self.gradient copy] autorelease];
-    clone.startPoint = self.startPoint;
-    clone.endPoint = self.endPoint;
    return clone;
 }

-+ (CGFloat *)computeColorStopsFromString:(NSXMLElement *)element
-                                  colors:(NSArray **)someColors
+- (void)setColorList:(IJSVGColorList*)list
+{
+    (void)([_colorList release]), _colorList = nil;
+    _colorList = list.retain;
+    if (CGGradient != nil) {
+        CGGradientRelease(CGGradient);
+    }
+}
+
+ (CGFloat*)computeColorStopsFromString:(NSXMLElement*)element
+                                 colors:(NSArray**)someColors
 {
    // find each stop element
-    NSArray * stops = [element nodesForXPath:@"stop"
-                                       error:nil];
-    
-    NSMutableArray * colors = [[[NSMutableArray alloc] init] autorelease];
-    CGFloat * stopsParams = (CGFloat *)malloc(stops.count*sizeof(CGFloat));
+    NSArray* stops = [element children];
+    NSMutableArray* colors = [[[NSMutableArray alloc] initWithCapacity:stops.count] autorelease];
+    CGFloat* stopsParams = (CGFloat*)malloc(stops.count * sizeof(CGFloat));
    NSInteger i = 0;
-    for( NSXMLElement * stop in stops )
-    {
+    for (NSXMLElement* stop in stops) {
        // find the offset
-        CGFloat offset = [[[stop attributeForName:@"offset"] stringValue] floatValue];
-        if( offset > 1.f ) {
+        CGFloat offset = [stop attributeForName:@"offset"].stringValue.floatValue;
+        if (offset > 1.f) {
            offset /= 100.f;
        }
-        
+
        stopsParams[i++] = offset;
-        
+
        // find the stop opacity
        CGFloat stopOpacity = 1.f;
-        NSXMLNode * stopOpacityAttribute = [stop attributeForName:@"stop-opacity"];
-        if( stopOpacityAttribute != nil ) {
-            stopOpacity = [[stopOpacityAttribute stringValue] floatValue];
+        NSXMLNode* stopOpacityAttribute = [stop attributeForName:@"stop-opacity"];
+        if (stopOpacityAttribute != nil) {
+            stopOpacity = stopOpacityAttribute.stringValue.floatValue;
        }
-        
+
        // find the stop color
-        NSColor * stopColor = [IJSVGColor colorFromHEXString:[[stop attributeForName:@"stop-color"] stringValue]
-                                                       alpha:stopOpacity];
-        
-        // no hex, grab it from predefined
-        if( stopColor == nil )
-        {
-            stopColor = [IJSVGColor colorFromPredefinedColorName:[[stop attributeForName:@"stop-color"] stringValue]];
-            if( stopColor != nil && stopOpacity != 1.f ) {
-                stopColor = [IJSVGColor changeAlphaOnColor:stopColor
-                                                        to:stopOpacity];
-            }
+        NSString* scs = [stop attributeForName:@"stop-color"].stringValue;
+        NSColor* stopColor = [IJSVGColor colorFromString:scs];
+        if (stopColor != nil && stopOpacity != 1.f) {
+            stopColor = [IJSVGColor changeAlphaOnColor:stopColor
+                                                    to:stopOpacity];
        }
-        
-        // add it into the array
-        if( stopColor != nil ) {
-            [(NSMutableArray *)colors addObject:stopColor];
-        }
-        
-        NSXMLNode * styleAttribute = [stop attributeForName:@"style"];
-        if( styleAttribute != nil )
-        {
-            IJSVGStyle * style = [IJSVGStyle parseStyleString:[styleAttribute stringValue]];
-            NSColor * color = [IJSVGColor colorFromString:[style property:@"stop-color"]];
-            
+
+        // compute any style that there was...
+        NSXMLNode* styleAttribute = [stop attributeForName:@"style"];
+        if (styleAttribute != nil) {
+
+            IJSVGStyle* style = [IJSVGStyle parseStyleString:styleAttribute.stringValue];
+            NSColor* color = [IJSVGColor colorFromString:[style property:@"stop-color"]];
+
            // we have a color!
-            if( color != nil ) {
+            if (color != nil) {
                // is there a stop opacity?
-                NSNumber * number = nil;
-                if( (number = [style property:@"stop-opacity"] ) != nil ) {
+                NSString* numberString = nil;
+                if ((numberString = [style property:@"stop-opacity"]) != nil) {
                    color = [IJSVGColor changeAlphaOnColor:color
-                                                        to:[number floatValue]];
+                                                        to:numberString.floatValue];
                } else {
                    color = [IJSVGColor changeAlphaOnColor:color
                                                        to:stopOpacity];
                }
-                [(NSMutableArray *)colors addObject:color];
+                stopColor = color;
            }
        }
+
+        // default is black
+        if (stopColor == nil) {
+            stopColor = [IJSVGColor colorFromString:@"black"];
+            if (stopOpacity != 1.f) {
+                stopColor = [IJSVGColor changeAlphaOnColor:stopColor
+                                                        to:stopOpacity];
+            }
+        }
+
+        // add the stop color
+        [(NSMutableArray*)colors addObject:stopColor];
    }
    *someColors = colors;
    return stopsParams;
 }

+- (IJSVGColorList*)computedColorList
+{
+    IJSVGColorList* sheet = [[[IJSVGColorList alloc] init] autorelease];
+    NSInteger num = self.gradient.numberOfColorStops;
+    for (NSInteger i = 0; i < num; i++) {
+        NSColor* color;
+        [self.gradient getColor:&color
+                       location:nil
+                        atIndex:i];
+        [sheet addColor:color];
+    }
+    return sheet;
+}
+
 - (CGGradientRef)CGGradient
 {
    // store it in the cache
-    if(CGGradient != nil) {
+    if (CGGradient != nil) {
        return CGGradient;
    }
-    
+
    // actually create the gradient
    NSInteger num = self.gradient.numberOfColorStops;
-    CGFloat * locations = malloc(sizeof(CGFloat)*num);
-    CFMutableArrayRef colors = CFArrayCreateMutable(kCFAllocatorDefault, (CFIndex)num, &kCFTypeArrayCallBacks);
-    for( NSInteger i = 0; i < num; i++ ) {
-        NSColor * color;
+    CGFloat* locations = malloc(sizeof(CGFloat) * num);
+    CFMutableArrayRef colors = CFArrayCreateMutable(kCFAllocatorDefault, (CFIndex)num,
+        &kCFTypeArrayCallBacks);
+    for (NSInteger i = 0; i < num; i++) {
+        NSColor* color;
        [self.gradient getColor:&color
                       location:&locations[i]
                        atIndex:i];
+        if (_colorList != nil) {
+            color = [_colorList proposedColorForColor:color];
+        }
        CFArrayAppendValue(colors, color.CGColor);
    }
-    CGGradientRef result = CGGradientCreateWithColors(self.gradient.colorSpace.CGColorSpace, colors, locations);
+    CGGradientRef result = CGGradientCreateWithColors(self.gradient.colorSpace.CGColorSpace,
+        colors, locations);
    CFRelease(colors);
    free(locations);
    return CGGradient = result;
 }

 - (void)drawInContextRef:(CGContextRef)ctx
-                    rect:(NSRect)rect
+              objectRect:(NSRect)objectRect
+       absoluteTransform:(CGAffineTransform)absoluteTransform
+                viewPort:(CGRect)viewBox
 {
 }

+- (void)_debugStart:(CGPoint)startPoint
+                end:(CGPoint)endPoint
+            context:(CGContextRef)ctx
+{
+    CGContextSaveGState(ctx);
+    CGContextSetStrokeColorWithColor(ctx, NSColor.blackColor.CGColor);
+    CGContextSetLineWidth(ctx, 1.f);
+    CGContextMoveToPoint(ctx, startPoint.x, startPoint.y);
+    CGContextAddLineToPoint(ctx, endPoint.x, endPoint.y);
+    CGContextStrokePath(ctx);
+}
+
@end
@@ -6,15 +6,18 @@
 //  Copyright © 2016 Curtis Hard. All rights reserved.
 //

-#import <QuartzCore/QuartzCore.h>
 #import "IJSVGGradient.h"
-#import "IJSVGPath.h"
 #import "IJSVGLayer.h"
+#import "IJSVGPath.h"
+#import <QuartzCore/QuartzCore.h>

@interface IJSVGGradientLayer : IJSVGLayer {
-    
 }

-@property (nonatomic, retain) IJSVGGradient * gradient;
+@property (nonatomic, assign) CGRect viewBox;
+@property (nonatomic, retain) IJSVGGradient* gradient;
+@property (nonatomic, assign) CGAffineTransform absoluteTransform;
+@property (nonatomic, assign) CGRect objectRect;

@end
+
@@ -10,33 +10,94 @@

@implementation IJSVGGradientLayer

+@synthesize viewBox;
@synthesize gradient;
+@synthesize absoluteTransform;
+@synthesize objectRect;

 - (void)dealloc
 {
-    [gradient release], gradient = nil;
+    (void)([gradient release]), gradient = nil;
    [super dealloc];
 }

 - (id)init
 {
-    if((self = [super init]) != nil) {
+    if ((self = [super init]) != nil) {
        self.requiresBackingScaleHelp = YES;
+        self.shouldRasterize = YES;
    }
    return self;
 }

+- (void)setGradient:(IJSVGGradient*)newGradient
+{
+    if (gradient != nil) {
+        (void)([gradient release]), gradient = nil;
+    }
+    gradient = [newGradient retain];
+
+    // lets check its alpha properties on the colors
+    BOOL hasAlphaChannel = NO;
+    NSInteger stops = gradient.gradient.numberOfColorStops;
+    for (NSInteger i = 0; i < stops; i++) {
+        NSColor* color = nil;
+        [gradient.gradient getColor:&color
+                           location:NULL
+                            atIndex:i];
+        if (color.alphaComponent != 1.f) {
+            hasAlphaChannel = YES;
+            break;
+        }
+    }
+    self.opaque = hasAlphaChannel == NO;
+}
+
+- (void)setOpacity:(float)opacity
+{
+    if (opacity != 1.f) {
+        self.opaque = NO;
+    }
+    [super setOpacity:opacity];
+}
+
+- (void)setBackingScaleFactor:(CGFloat)backingScaleFactor
+{
+    switch (self.renderQuality) {
+    case IJSVGRenderQualityOptimized: {
+        backingScaleFactor = (backingScaleFactor * .35f);
+        break;
+    }
+    case IJSVGRenderQualityLow: {
+        backingScaleFactor = (backingScaleFactor * .05f);
+        break;
+    }
+    default: {
+        break;
+    }
+    }
+    [super setBackingScaleFactor:backingScaleFactor];
+}
+
 - (void)drawInContext:(CGContextRef)ctx
 {
    [super drawInContext:ctx];
- 
+
    // nothing to do :(
-    if(self.gradient == nil) {
+    if (self.gradient == nil) {
        return;
    }
-    
+
    // draw the gradient
-    [self.gradient drawInContextRef:ctx rect:self.bounds];
+    CGAffineTransform trans = CGAffineTransformMakeTranslation(-CGRectGetMinX(objectRect),
+        -CGRectGetMinY(objectRect));
+    CGAffineTransform transform = CGAffineTransformConcat(absoluteTransform, trans);
+    CGContextSaveGState(ctx);
+    [self.gradient drawInContextRef:ctx
+                         objectRect:objectRect
+                  absoluteTransform:transform
+                           viewPort:self.viewBox];
+    CGContextRestoreGState(ctx);
 }

@end
@@ -0,0 +1,13 @@
+//
+//  IJSVGGradientUnitLength.h
+//  IconJar
+//
+//  Created by Curtis Hard on 29/03/2017.
+//  Copyright © 2017 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGUnitLength.h"
+
+@interface IJSVGGradientUnitLength : IJSVGUnitLength
+
+@end
@@ -0,0 +1,21 @@
+//
+//  IJSVGGradientUnitLength.m
+//  IconJar
+//
+//  Created by Curtis Hard on 29/03/2017.
+//  Copyright © 2017 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGGradientUnitLength.h"
+
+@implementation IJSVGGradientUnitLength
+
+- (NSString*)stringValue
+{
+    if (self.type == IJSVGUnitLengthTypePercentage) {
+        return [NSString stringWithFormat:@"%g", self.value];
+    }
+    return [super stringValue];
+}
+
+@end
@@ -6,18 +6,17 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGNode.h"
 #import "IJSVGPath.h"
+#import <Foundation/Foundation.h>

@interface IJSVGGroup : IJSVGNode {
-    
-    NSMutableArray * children;
-    
+
+    NSMutableArray* children;
 }

 - (void)addChild:(id)child;
- (NSArray *)children;
+- (NSArray*)children;
 - (void)purgeChildren;

@end
@@ -12,14 +12,13 @@

 - (void)dealloc
 {
-    [children release], children = nil;
+    (void)([children release]), children = nil;
    [super dealloc];
 }

 - (id)init
 {
-    if( ( self = [super init] ) != nil )
-    {
+    if ((self = [super init]) != nil) {
        children = [[NSMutableArray alloc] init];
    }
    return self;
@@ -30,13 +29,12 @@
    children = [[NSMutableArray alloc] init];
 }

- (id)copyWithZone:(NSZone *)zone
+- (id)copyWithZone:(NSZone*)zone
 {
-    IJSVGGroup * node = [super copyWithZone:zone];
+    IJSVGGroup* node = [super copyWithZone:zone];
    [node prepareFromCopy];
-    
-    for( IJSVGNode * childNode in self.children )
-    {
+
+    for (IJSVGNode* childNode in self.children) {
        childNode = [[childNode copy] autorelease];
        childNode.parentNode = node;
        [node addChild:childNode];
@@ -51,18 +49,18 @@

 - (void)addChild:(id)child
 {
-    if( child != nil )
+    if (child != nil)
        [children addObject:child];
 }

- (NSArray *)children
+- (NSArray*)children
 {
    return children;
 }

- (NSString *)description
+- (NSString*)description
 {
-    return [NSString stringWithFormat:@"%@ - %ld",[super description],self.children.count];
+    return [NSString stringWithFormat:@"%@ - %@", [super description], self.children];
 }

@end
@@ -6,9 +6,9 @@
 //  Copyright © 2017 Curtis Hard. All rights reserved.
 //

-#import <QuartzCore/QuartzCore.h>
 #import "IJSVGLayer.h"
 #import "IJSVGShapeLayer.h"
+#import <QuartzCore/QuartzCore.h>

@interface IJSVGGroupLayer : IJSVGLayer

@@ -6,22 +6,21 @@
 //  Copyright © 2016 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGNode.h"
+#import <Foundation/Foundation.h>

@class IJSVGPath;

@interface IJSVGImage : IJSVGNode {
-    
-    NSImage * image;
+
+    NSImage* image;
    CGImageRef CGImage;
-    IJSVGPath * imagePath;
-    
+    IJSVGPath* imagePath;
 }

 - (CGImageRef)CGImage;
 - (void)drawInContextRef:(CGContextRef)context
-                    path:(IJSVGPath *)path;
- (void)loadFromBase64EncodedString:(NSString *)encodedString;
+                    path:(IJSVGPath*)path;
+- (void)loadFromBase64EncodedString:(NSString*)encodedString;

@end
@@ -14,30 +14,36 @@

 - (void)dealloc
 {
-    CGImageRelease(CGImage), CGImage = nil;
-    [imagePath release], imagePath = nil;
-    [image release], image = nil;
+    (void)(CGImageRelease(CGImage)), CGImage = nil;
+    (void)([imagePath release]), imagePath = nil;
+    (void)([image release]), image = nil;
    [super dealloc];
 }

- (void)loadFromBase64EncodedString:(NSString *)encodedString
+- (void)loadFromBase64EncodedString:(NSString*)encodedString
 {
-    NSURL * URL = [NSURL URLWithString:encodedString];
-    NSData * data = [NSData dataWithContentsOfURL:URL];
-    
-    // no data, jsut ignore...invalid probably
-    if(data == nil) {
+    if ([encodedString hasPrefix:@"data:"]) {
+        encodedString = [encodedString stringByReplacingOccurrencesOfString:@"\\s+"
+                                                                 withString:@""
+                                                                    options:NSRegularExpressionSearch
+                                                                      range:NSMakeRange(0, encodedString.length)];
+    }
+    NSURL* URL = [NSURL URLWithString:encodedString];
+    NSData* data = [NSData dataWithContentsOfURL:URL];
+
+    // no data, just ignore...invalid probably
+    if (data == nil) {
        return;
    }
-    
+
    // set the image against the container
-    NSImage * anImage = [[[NSImage alloc] initWithData:data] autorelease];
+    NSImage* anImage = [[[NSImage alloc] initWithData:data] autorelease];
    [self setImage:anImage];
 }

- (IJSVGPath *)path
+- (IJSVGPath*)path
 {
-    if(imagePath == nil) {
+    if (imagePath == nil) {
        // lazy load the path as it might not be needed
        imagePath = [[IJSVGPath alloc] init];
        [imagePath.path appendBezierPathWithRect:NSMakeRect(0.f, 0.f, self.width.value, self.height.value)];
@@ -46,23 +52,23 @@
    return imagePath;
 }

- (void)setImage:(NSImage *)anImage
+- (void)setImage:(NSImage*)anImage
 {
-    if(image != nil) {
-        [image release], image = nil;
+    if (image != nil) {
+        (void)([image release]), image = nil;
    }
    image = [anImage retain];
-    
-    if(CGImage != nil) {
+
+    if (CGImage != nil) {
        CGImageRelease(CGImage);
        CGImage = nil;
    }
-    
-    NSRect rect = NSMakeRect( 0.f, 0.f, self.width.value, self.height.value);
+
+    NSRect rect = NSMakeRect(0.f, 0.f, self.width.value, self.height.value);
    CGImage = [image CGImageForProposedRect:&rect
                                    context:nil
                                      hints:nil];
-    
+
    // be sure to retain (some reason this is required in Xcode 8 beta 5?)
    CGImageRetain(CGImage);
 }
@@ -73,29 +79,29 @@
 }

 - (void)drawInContextRef:(CGContextRef)context
-                    path:(IJSVGPath *)path
+                    path:(IJSVGPath*)path
 {
    // run the transforms
    // draw the image
-    if(self.width.value == 0.f || self.height.value == 0.f) {
+    if (self.width.value == 0.f || self.height.value == 0.f) {
        return;
    }
-    
+
    // make sure path is set
-    if(path == nil) {
+    if (path == nil) {
        path = [self path];
    }
-    
+
    CGRect rect = path.path.bounds;
-    CGRect bounds = CGRectMake( 0.f, 0.f, rect.size.width, rect.size.height);
-    
+    CGRect bounds = CGRectMake(0.f, 0.f, rect.size.width, rect.size.height);
+
    // save the state of the context
    CGContextSaveGState(context);
    {
        // flip the coordinates
-        CGContextTranslateCTM(context, rect.origin.x, (rect.origin.y)+rect.size.height);
+        CGContextTranslateCTM(context, rect.origin.x, (rect.origin.y) + rect.size.height);
        CGContextScaleCTM(context, 1.f, -1.f);
-        CGContextDrawImage( context, bounds, CGImage);
+        CGContextDrawImage(context, bounds, CGImage);
    }
    CGContextRestoreGState(context);
 }
@@ -6,14 +6,14 @@
 //  Copyright © 2017 Curtis Hard. All rights reserved.
 //

-#import <QuartzCore/QuartzCore.h>
 #import "IJSVGLayer.h"
+#import <AppKit/AppKit.h>
+#import <QuartzCore/QuartzCore.h>

@interface IJSVGImageLayer : IJSVGLayer {
-    
 }

- (id)initWithImage:(NSImage *)image;
+- (id)initWithImage:(NSImage*)image;
 - (id)initWithCGImage:(CGImageRef)imageRef;

@end
@@ -10,7 +10,7 @@

@implementation IJSVGImageLayer

- (id)initWithImage:(NSImage *)image
+- (id)initWithImage:(NSImage*)image
 {
    NSRect rect = (NSRect){
        .origin = NSZeroPoint,
@@ -24,18 +24,32 @@

 - (id)initWithCGImage:(CGImageRef)imageRef
 {
-    if((self = [super init]) != nil) {
+    if ((self = [super init]) != nil) {
        // set the contents
        self.contents = (id)imageRef;
-        
+
+        // make sure we say we need help
+        self.requiresBackingScaleHelp = YES;
+        self.shouldRasterize = YES;
+
        // set the frame, simple stuff
        self.frame = (CGRect){
            .origin = CGPointZero,
-            .size = CGSizeMake( CGImageGetWidth(imageRef),
-                                CGImageGetHeight(imageRef))
+            .size = CGSizeMake(CGImageGetWidth(imageRef),
+                CGImageGetHeight(imageRef))
        };
    }
    return self;
 }

+- (void)setNeedsDisplay
+{
+    // swap the content around on call
+    // because set needs display discards previous
+    // content - yolo!
+    id oldContent = self.contents;
+    [super setNeedsDisplay];
+    self.contents = oldContent;
+}
+
@end
@@ -0,0 +1,22 @@
+//
+//  IJSVGImageRep.h
+//  IJSVGExample
+//
+//  Created by Curtis Hard on 15/03/2019.
+//  Copyright © 2019 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVGParser.h"
+#import <Cocoa/Cocoa.h>
+
+@class IJSVG;
+
+@interface IJSVGImageRep : NSImageRep {
+
+@private
+    IJSVG* _svg;
+}
+
+@property (nonatomic, readonly) CGRect viewBox;
+
+@end
@@ -0,0 +1,104 @@
+//
+//  IJSVGImageRep.m
+//  IJSVGExample
+//
+//  Created by Curtis Hard on 15/03/2019.
+//  Copyright © 2019 Curtis Hard. All rights reserved.
+//
+
+#import "IJSVG.h"
+#import "IJSVGImageRep.h"
+
+@implementation IJSVGImageRep
+
+@synthesize viewBox = _viewBox;
+
+ (void)load
+{
+    [NSBitmapImageRep registerImageRepClass:self];
+}
+
+ (BOOL)canInitWithData:(NSData*)data
+{
+    return [IJSVGParser isDataSVG:data];
+}
+
+ (NSArray<NSString*>*)imageTypes
+{
+    return @[ (NSString*)kUTTypeScalableVectorGraphics, @"svg" ];
+}
+
+ (NSArray<NSString*>*)imageUnfilteredTypes
+{
+    return @[ (NSString*)kUTTypeScalableVectorGraphics, @"svg" ];
+}
+
+ (NSArray<NSImageRep*>*)imageRepsWithData:(NSData*)data
+{
+    IJSVGImageRep* instance = [self imageRepWithData:data];
+    if (instance == nil) {
+        return @[];
+    }
+    return @[ instance ];
+}
+
+ (instancetype)imageRepWithData:(NSData*)data
+{
+    return [[[self alloc] initWithData:data] autorelease];
+}
+
+- (void)dealloc
+{
+    (void)([_svg release]), _svg = nil;
+    [super dealloc];
+}
+
+- (instancetype)initWithData:(NSData*)data
+{
+    if ((self = [super init]) != nil) {
+        // grab the string from the data
+        // its more then likely UTF-8...
+        NSString* string = [[[NSString alloc] initWithData:data
+                                                  encoding:NSUTF8StringEncoding] autorelease];
+
+        _svg = [[IJSVG alloc] initWithSVGString:string];
+
+        // no valid SVG, just return nil;
+        if (_svg == nil) {
+            [self release];
+            return nil;
+        }
+
+        // set default properties
+        self.pixelsWide = _svg.viewBox.size.width;
+        self.pixelsHigh = _svg.viewBox.size.height;
+        self.size = _svg.viewBox.size;
+    }
+    return self;
+}
+
+- (BOOL)draw
+{
+    [_svg drawInRect:self.viewBox];
+    return YES;
+}
+
+- (BOOL)drawAtPoint:(NSPoint)point
+{
+    [_svg drawAtPoint:point
+                 size:_svg.viewBox.size];
+    return YES;
+}
+
+- (BOOL)drawInRect:(NSRect)rect
+{
+    [_svg drawInRect:rect];
+    return YES;
+}
+
+- (CGRect)viewBox
+{
+    return _svg.viewBox;
+}
+
+@end
@@ -6,62 +6,40 @@
 //  Copyright © 2017 Curtis Hard. All rights reserved.
 //

-#import <QuartzCore/QuartzCore.h>
+#import "IJSVGRendering.h"
 #import "IJSVGTransaction.h"
+#import <QuartzCore/QuartzCore.h>

@class IJSVGShapeLayer;
@class IJSVGGradientLayer;
@class IJSVGPatternLayer;
@class IJSVGStrokeLayer;
-
-#define IJSVG_LAYER_ADD_SUBVIEW_DEFAULT_IMPLEMENTATION \
- (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) { \
-        return; \
-    } \
-    backingScaleFactor = newFactor; \
-    self.contentsScale = newFactor; \
-    self.rasterizationScale = newFactor; \
-    [self setNeedsDisplay]; \
-};
-
-#define IJSVG_LAYER_DEFAULT_PROPERTIES \
-@property (nonatomic, assign) IJSVGGradientLayer * gradientFillLayer; \
-@property (nonatomic, assign) IJSVGPatternLayer * patternFillLayer; \
-@property (nonatomic, assign) IJSVGStrokeLayer * strokeLayer; \
-@property (nonatomic, assign) BOOL requiresBackingScaleHelp; \
-@property (nonatomic, assign) CGFloat backingScaleFactor;
-
-#define IJSVG_LAYER_DEFAULT_SYNTHESIZE \
-@synthesize gradientFillLayer; \
-@synthesize patternFillLayer; \
-@synthesize strokeLayer; \
-@synthesize requiresBackingScaleHelp; \
-@synthesize backingScaleFactor;
-
-#define IJSVG_LAYER_DEFAULT_DEALLOC_INSTRUCTIONS \
-IJSVGBeginTransactionLock(); \
-    [super dealloc]; \
-IJSVGEndTransactionLock();
+@class IJSVGGroupLayer;

@interface IJSVGLayer : CALayer {
-    
+
+@private
+    IJSVGLayer* _maskingLayer;
 }

-IJSVG_LAYER_DEFAULT_PROPERTIES
+@property (nonatomic, assign) IJSVGGradientLayer* gradientFillLayer;
+@property (nonatomic, assign) IJSVGPatternLayer* patternFillLayer;
+@property (nonatomic, assign) IJSVGStrokeLayer* strokeLayer;
+@property (nonatomic, assign) IJSVGGradientLayer* gradientStrokeLayer;
+@property (nonatomic, assign) IJSVGPatternLayer* patternStrokeLayer;
+@property (nonatomic, assign) BOOL requiresBackingScaleHelp;
+@property (nonatomic, assign) CGFloat backingScaleFactor;
+@property (nonatomic, assign) IJSVGRenderQuality renderQuality;
+@property (nonatomic, assign) CGBlendMode blendingMode;
+@property (nonatomic, assign) CGPoint absoluteOrigin;
+@property (nonatomic, assign) BOOL convertMasksToPaths;
+
+ (NSArray*)deepestSublayersOfLayer:(CALayer*)layer;
+ (void)recursivelyWalkLayer:(CALayer*)layer
+                   withBlock:(void (^)(CALayer* layer, BOOL isMask))block;
+
+- (void)applySublayerMaskToContext:(CGContextRef)context
+                       forSublayer:(IJSVGLayer*)sublayer
+                        withOffset:(CGPoint)offset;

@end
@@ -6,21 +6,178 @@
 //  Copyright © 2017 Curtis Hard. All rights reserved.
 //

+#import "IJSVG.h"
+#import "IJSVGGroupLayer.h"
 #import "IJSVGLayer.h"
 #import "IJSVGShapeLayer.h"

-
@implementation IJSVGLayer

-IJSVG_LAYER_DEFAULT_SYNTHESIZE
+@synthesize gradientFillLayer;
+@synthesize patternFillLayer;
+@synthesize gradientStrokeLayer;
+@synthesize patternStrokeLayer;
+@synthesize strokeLayer;
+@synthesize requiresBackingScaleHelp;
+@synthesize backingScaleFactor;
+@synthesize blendingMode;
+@synthesize convertMasksToPaths;

-#ifndef __clang_analyzer__
 - (void)dealloc
 {
-    IJSVG_LAYER_DEFAULT_DEALLOC_INSTRUCTIONS
+    (void)([_maskingLayer release]), _maskingLayer = nil;
+    [super dealloc];
 }
-#endif

-IJSVG_LAYER_ADD_SUBVIEW_DEFAULT_IMPLEMENTATION
+ (NSArray*)deepestSublayersOfLayer:(CALayer*)layer
+{
+    NSMutableArray* arr = [[[NSMutableArray alloc] init] autorelease];
+    for (CALayer* subLayer in layer.sublayers) {
+        if (subLayer.sublayers.count != 0) {
+            NSArray* moreLayers = [self deepestSublayersOfLayer:(IJSVGLayer*)subLayer];
+            [arr addObjectsFromArray:moreLayers];
+        } else {
+            [arr addObject:subLayer];
+        }
+    }
+    return arr;
+}
+
+ (void)recursivelyWalkLayer:(CALayer*)layer
+                   withBlock:(void (^)(CALayer* layer, BOOL isMask))block
+{
+    // call for layer and mask if there is one
+    block(layer, NO);
+
+    // do the mask too!
+    if (layer.mask != nil) {
+        block(layer.mask, YES);
+    }
+
+    // sublayers!!
+    for (CALayer* aLayer in layer.sublayers) {
+        [self recursivelyWalkLayer:aLayer
+                         withBlock:block];
+    }
+}
+
+- (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) {
+        return;
+    }
+    backingScaleFactor = newFactor;
+    self.contentsScale = newFactor;
+    self.rasterizationScale = newFactor;
+    [self setNeedsDisplay];
+}
+
+- (void)_customRenderInContext:(CGContextRef)ctx
+{
+    if (self.convertMasksToPaths == YES && _maskingLayer != nil) {
+        CGContextSaveGState(ctx);
+        [self applySublayerMaskToContext:ctx
+                             forSublayer:(IJSVGLayer*)self
+                              withOffset:CGPointZero];
+        [super renderInContext:ctx];
+        CGContextRestoreGState(ctx);
+        return;
+    }
+    [super renderInContext:ctx];
+}
+
+- (void)setConvertMasksToPaths:(BOOL)flag
+{
+    if (convertMasksToPaths == flag) {
+        return;
+    }
+    convertMasksToPaths = flag;
+    if (flag == YES) {
+        if (_maskingLayer != nil) {
+            (void)([_maskingLayer release]), _maskingLayer = nil;
+        }
+        _maskingLayer = [(IJSVGLayer*)self.mask retain];
+        self.mask = nil;
+    } else {
+        self.mask = _maskingLayer;
+        (void)([_maskingLayer release]), _maskingLayer = nil;
+    }
+}
+
+- (void)applySublayerMaskToContext:(CGContextRef)context
+                       forSublayer:(IJSVGLayer*)sublayer
+                        withOffset:(CGPoint)offset
+{
+    // apply any transforms needed
+    CGPoint layerOffset = offset;
+    CGAffineTransform sublayerTransform = CATransform3DGetAffineTransform(sublayer.transform);
+    CGContextConcatCTM(context, CGAffineTransformInvert(sublayerTransform));
+
+    // walk up the superlayer chain
+    CALayer* superlayer = self.superlayer;
+    if (IJSVGIsSVGLayer(superlayer) == YES) {
+        [(IJSVGLayer*)superlayer applySublayerMaskToContext:context
+                                                forSublayer:(IJSVGLayer*)self
+                                                 withOffset:layerOffset];
+    }
+
+    // grab the masking layer
+    IJSVGShapeLayer* maskingLayer = [self maskingLayer];
+
+    // if its a group we need to get the lowest level children
+    // and walk up the chain again
+    if ([maskingLayer isKindOfClass:[IJSVGGroupLayer class]]) {
+        NSArray* subs = [IJSVGLayer deepestSublayersOfLayer:maskingLayer];
+        for (IJSVGLayer* subLayer in subs) {
+            [subLayer applySublayerMaskToContext:context
+                                     forSublayer:(IJSVGLayer*)self
+                                      withOffset:layerOffset];
+        }
+    } else if ([maskingLayer isKindOfClass:[IJSVGShapeLayer class]]) {
+        // is a shape, go for it!
+        CGPathRef maskPath = maskingLayer.path;
+        CGContextTranslateCTM(context, -layerOffset.x, -layerOffset.y);
+        CGContextAddPath(context, maskPath);
+        CGContextClip(context);
+        CGContextTranslateCTM(context, layerOffset.x, layerOffset.y);
+    }
+    CGContextConcatCTM(context, sublayerTransform);
+}
+
+- (IJSVGShapeLayer*)maskingLayer
+{
+    return (IJSVGShapeLayer*)_maskingLayer ?: nil;
+}
+
+- (void)renderInContext:(CGContextRef)ctx
+{
+    if (self.blendingMode != kCGBlendModeNormal) {
+        CGContextSaveGState(ctx);
+        CGContextSetBlendMode(ctx, self.blendingMode);
+        [self _customRenderInContext:ctx];
+        CGContextRestoreGState(ctx);
+        return;
+    }
+    [self _customRenderInContext:ctx];
+}
+
+- (id<CAAction>)actionForKey:(NSString*)event
+{
+    return nil;
+}

@end
@@ -6,18 +6,18 @@
 //  Copyright © 2016 Curtis Hard. All rights reserved.
 //

-#import <QuartzCore/QuartzCore.h>
 #import "IJSVGNode.h"
+#import "IJSVGRenderingStyle.h"
+#import <QuartzCore/QuartzCore.h>

@class IJSVGLayer;

@interface IJSVGLayerTree : NSObject {
-    
 }

-@property (nonatomic, retain) NSColor * fillColor;
-@property (nonatomic, retain) NSColor * strokeColor;
+@property (nonatomic, assign) CGRect viewBox;
+@property (nonatomic, retain) IJSVGRenderingStyle* style;

- (IJSVGLayer *)layerForNode:(IJSVGNode *)node;
+- (IJSVGLayer*)layerForNode:(IJSVGNode*)node;

@end
@@ -6,14 +6,12 @@
 //  Copyright (c) 2014 Curtis Hard. All rights reserved.
 //

-#import <Foundation/Foundation.h>
 #import "IJSVGGradient.h"
+#import <Foundation/Foundation.h>

@interface IJSVGLinearGradient : IJSVGGradient

-+ (NSGradient *)parseGradient:(NSXMLElement *)element
-                     gradient:(IJSVGLinearGradient *)aGradient
-                   startPoint:(CGPoint *)startPoint
-                     endPoint:(CGPoint *)endPoint;
+ (NSGradient*)parseGradient:(NSXMLElement*)element
+                    gradient:(IJSVGLinearGradient*)aGradient;

@end
@@ -11,83 +11,74 @@

@implementation IJSVGLinearGradient

-+ (NSGradient *)parseGradient:(NSXMLElement *)element
-                     gradient:(IJSVGLinearGradient *)aGradient
-                   startPoint:(CGPoint *)startPoint
-                     endPoint:(CGPoint *)endPoint
+ (NSGradient*)parseGradient:(NSXMLElement*)element
+                    gradient:(IJSVGLinearGradient*)aGradient
 {
-    
-    CGFloat px1 = [[element attributeForName:@"x1"] stringValue].floatValue;
-    CGFloat px2 = [[element attributeForName:@"x2"] stringValue].floatValue;
-    CGFloat py1 = [[element attributeForName:@"y1"] stringValue].floatValue;
-    CGFloat py2 = [[element attributeForName:@"y2"] stringValue].floatValue;
-    
-    // work out each coord, and work out if its a % or not
-    // annoyingly we need to check them all against each other -_-
-    BOOL isPercent = NO;
-    if(px1 <= 1.f && px2 <= 1.f && py1 <= 1.f && py2 <= 1.f) {
-        isPercent = YES;
-    } else if((px1 >= 0.f && px1 <= 1.f) && (px2 >= 0.f && px2 <= 1.f) &&
-              (py1 >= 0.f && py1 <= 1.f) && (py2 >= 0.f && py2 <= 1.f)) {
-        isPercent = YES;
-    }
-    
-    // assume its a vertical / horizonal
-    if(isPercent == NO) {
-        // just ask unit for the value
-        aGradient.x1 = [IJSVGUnitLength unitWithString:[[element attributeForName:@"x1"] stringValue] ?: @"0"];
-        aGradient.x2 = [IJSVGUnitLength unitWithString:[[element attributeForName:@"x2"] stringValue] ?: @"100"];
-        aGradient.y1 = [IJSVGUnitLength unitWithString:[[element attributeForName:@"y1"] stringValue] ?: @"0"];
-        aGradient.y2 = [IJSVGUnitLength unitWithString:[[element attributeForName:@"y2"] stringValue] ?: @"0"];
-    } else {
-        // make sure its a percent!
-        aGradient.x1 = [IJSVGUnitLength unitWithPercentageString:[[element attributeForName:@"x1"] stringValue] ?: @"0"];
-        aGradient.x2 = [IJSVGUnitLength unitWithPercentageString:[[element attributeForName:@"x2"] stringValue] ?: @"100"];
-        aGradient.y1 = [IJSVGUnitLength unitWithPercentageString:[[element attributeForName:@"y1"] stringValue] ?: @"0"];
-        aGradient.y2 = [IJSVGUnitLength unitWithPercentageString:[[element attributeForName:@"y2"] stringValue] ?: @"0"];
-    }
+    // just ask unit for the value
+    NSString* x1 = ([element attributeForName:@"x1"].stringValue ?: @"0");
+    NSString* x2 = ([element attributeForName:@"x2"].stringValue ?: @"100%");
+    NSString* y1 = ([element attributeForName:@"y1"].stringValue ?: @"0");
+    NSString* y2 = ([element attributeForName:@"y2"].stringValue ?: @"0");
+    aGradient.x1 = [IJSVGGradientUnitLength unitWithString:x1 fromUnitType:aGradient.units];
+    aGradient.x2 = [IJSVGGradientUnitLength unitWithString:x2 fromUnitType:aGradient.units];
+    aGradient.y1 = [IJSVGGradientUnitLength unitWithString:y1 fromUnitType:aGradient.units];
+    aGradient.y2 = [IJSVGGradientUnitLength unitWithString:y2 fromUnitType:aGradient.units];

    // compute the color stops and colours
-    NSArray * colors = nil;
-    CGFloat * stopsParams = [[self class] computeColorStopsFromString:element
-                                                               colors:&colors];
-    
+    NSArray* colors = nil;
+    CGFloat* stopsParams = [self.class computeColorStopsFromString:element
+                                                            colors:&colors];
+
    // create the gradient with the colours
-    NSGradient * grad = [[[NSGradient alloc] initWithColors:colors
-                                               atLocations:stopsParams
-                                                colorSpace:[NSColorSpace genericRGBColorSpace]] autorelease];
-    
+    NSGradient* grad = [[NSGradient alloc] initWithColors:colors
+                                              atLocations:stopsParams
+                                               colorSpace:IJSVGColor.defaultColorSpace];
+
    free(stopsParams);
-    return grad;
+    return [grad autorelease];
 }

 - (void)drawInContextRef:(CGContextRef)ctx
-                    rect:(NSRect)rect
+              objectRect:(NSRect)objectRect
+       absoluteTransform:(CGAffineTransform)absoluteTransform
+                viewPort:(CGRect)viewBox
 {
-    // grab the start and end point
-    CGPoint aStartPoint = (CGPoint){
-        .x = [self.x1 computeValue:rect.size.width],
-        .y = [self.y1 computeValue:rect.size.height]
-    };
-    
-    CGPoint aEndPoint = (CGPoint){
-        .x = [self.x2 computeValue:rect.size.width],
-        .y = [self.y2 computeValue:rect.size.height]
-    };
-    
-    // convert the nsgradient to a CGGradient
-    CGGradientRef gRef = [self CGGradient];
-    
-    // apply transform for each point
-    for( IJSVGTransform * transform in self.transforms ) {
-        CGAffineTransform trans = transform.CGAffineTransform;
-        aStartPoint = CGPointApplyAffineTransform(aStartPoint, trans);
-        aEndPoint = CGPointApplyAffineTransform(aEndPoint, trans);
+    BOOL inUserSpace = self.units == IJSVGUnitUserSpaceOnUse;
+
+    CGPoint gradientStartPoint = CGPointZero;
+    CGPoint gradientEndPoint = CGPointZero;
+    CGAffineTransform selfTransform = IJSVGConcatTransforms(self.transforms);
+
+    CGRect boundingBox = inUserSpace ? viewBox : objectRect;
+
+    // make sure we apply the absolute position to
+    // transform us back into the correct space
+    if (inUserSpace == YES) {
+        CGContextConcatCTM(ctx, absoluteTransform);
    }
-    
+
+    CGFloat width = CGRectGetWidth(boundingBox);
+    CGFloat height = CGRectGetHeight(boundingBox);
+    gradientStartPoint = CGPointMake([self.x1 computeValue:width],
+        [self.y1 computeValue:height]);
+
+    gradientEndPoint = CGPointMake([self.x2 computeValue:width],
+        [self.y2 computeValue:height]);
+
+    // transform the context
+    CGContextConcatCTM(ctx, selfTransform);
+
    // draw the gradient
-    CGGradientDrawingOptions opt = kCGGradientDrawsBeforeStartLocation|kCGGradientDrawsAfterEndLocation;
-    CGContextDrawLinearGradient(ctx, gRef, aStartPoint, aEndPoint, opt);
+    CGGradientDrawingOptions options = kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation;
+
+    CGContextDrawLinearGradient(ctx, self.CGGradient, gradientStartPoint,
+        gradientEndPoint, options);
+
+#ifdef IJSVG_DEBUG
+    [self _debugStart:gradientStartPoint
+                  end:gradientEndPoint
+              context:ctx];
+#endif
 }

@end
--- a/Show More
+++ b/Show More