Merge branch 'master' of https://github.com/rhcad/SVGKit into rhcad-m…

…aster

Conflicts:
	Source/UIKit additions/NSCharacterSet+SVGKExtensions.m

README.mdown

@@ -2,6 +2,10 @@
 
 SVGKit is a Cocoa framework for rendering SVG files natively: it's fast and powerful.
 
+Versions:
+  - v1.0 - 2013, approximately 90% coverage of the SVG spec. Stable and quite fast - https://github.com/SVGKit/SVGKit/tree/v1.0
+  - v1.1.0 - Current branch in development; all pull-requests should be issued against this branch - https://github.com/SVGKit/SVGKit/tree/1.1.0
+
 ## Xcode Projects Included
 
 For 2013, we have a major refactor/rewrite of the core SVGKit, fixing many bugs, adding many features, and making SVGKit much closer to meeting the SVG official Specification - http://www.w3.org/TR/SVG/

Source/DOM classes/SVG-DOM/SVGElementInstanceList.m

@@ -2,6 +2,7 @@
 #import "SVGElementInstanceList_Internal.h"
 
 @implementation SVGElementInstanceList
+@synthesize internalArray;
 
 - (void)dealloc {
   self.internalArray = nil;

Source/DOM classes/SVG-DOM/SVGLength.m

@@ -18,6 +18,7 @@ @implementation SVGLength
 @synthesize value;
 @synthesize valueInSpecifiedUnits;
 @synthesize valueAsString;
+@synthesize internalCSSPrimitiveValue;
 
 - (void)dealloc {
     self.valueAsString = nil;

Source/Parsers/SVGKParseResult.m

@@ -3,7 +3,7 @@
 @implementation SVGKParseResult
 
 @synthesize libXMLFailed;
-@synthesize parsedDocument, rootOfSVGTree;
+@synthesize parsedDocument, rootOfSVGTree, namespacesEncountered;
 @synthesize warnings, errorsRecoverable, errorsFatal;
 
 #if ENABLE_PARSER_EXTENSIONS_CUSTOM_DATA

Source/Parsers/SVGKParser.m

@@ -38,6 +38,7 @@ @implementation SVGKParser
 @synthesize defaultXMLNamespaceForThisParseRun;
 
 @synthesize parserExtensions;
+@synthesize parserKnownNamespaces;
 
 static xmlSAXHandler SAXHandler;
 

Source/QuartzCore additions/SVGKLayer.m

@@ -6,6 +6,7 @@ @implementation SVGKLayer
 }
 
 @synthesize SVGImage = _SVGImage;
+@synthesize showBorder;
 
 //self.backgroundColor = [UIColor clearColor];
 

Source/SVGKImage.m

@@ -62,6 +62,7 @@ @implementation SVGKImage
 @synthesize scale = _scale;
 @synthesize source;
 @synthesize parseErrorsAndWarnings;
+@synthesize nameUsedToInstantiate = _nameUsedToInstantiate;
 
 #ifdef ENABLE_GLOBAL_IMAGE_CACHE_FOR_SVGKIMAGE_IMAGE_NAMED
 static NSMutableDictionary* globalSVGKImageCache;

Source/UIKit additions/NSCharacterSet+SVGKExtensions.m

@@ -19,7 +19,8 @@ + (NSCharacterSet *)SVGWhitespaceCharacterSet;
 	static NSCharacterSet *sWhitespaceCharacterSet = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        sWhitespaceCharacterSet = [[NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%c%c%c%c", 0x20, 0x9, 0xD, 0xA]] retain];
+		sWhitespaceCharacterSet = [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%c%c%c%c", 0x20, 0x9, 0xD, 0xA]];
+		[sWhitespaceCharacterSet retain]; // required, this is a non-ARC project.
     });
 
     return sWhitespaceCharacterSet;

Source/UIKit additions/SVGKFastImageView.m

@@ -13,6 +13,7 @@ @implementation SVGKFastImageView
 
 @synthesize image = _image;
 @synthesize tileRatio = _tileRatio;
+@synthesize disableAutoRedrawAtHighestResolution = _disableAutoRedrawAtHighestResolution;
 
 #if TEMPORARY_WARNING_FOR_APPLES_BROKEN_RENDERINCONTEXT_METHOD
 +(BOOL) svgImageHasNoGradients:(SVGKImage*) image

Source/UIKit additions/SVGKLayeredImageView.m

@@ -9,6 +9,7 @@ @interface SVGKLayeredImageView()
 @end
 
 @implementation SVGKLayeredImageView
+@synthesize internalBorderLayer = _internalBorderLayer;
 
 /** uses the custom SVGKLayer instead of a default CALayer */
 +(Class)layerClass

XCodeProjectData/Demo-iOS/AppDelegate.m

@@ -13,6 +13,9 @@
 #import "DetailViewController.h"
 
 @implementation AppDelegate
+@synthesize window = _window;
+@synthesize navigationController = _navigationController;
+@synthesize splitViewController = _splitViewController;
 
 - (void)dealloc
 {
@@ -50,7 +53,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 	    self.splitViewController = [[[UISplitViewController alloc] init] autorelease];
 	    self.splitViewController.delegate = detailViewController;
-	    self.splitViewController.viewControllers = @[masterNavigationController, detailNavigationController];
+	    self.splitViewController.viewControllers = [NSArray arrayWithObjects:masterNavigationController, detailNavigationController, nil];
 
 		self.window.rootViewController = self.splitViewController;
 	}

XCodeProjectData/Demo-iOS/DetailViewController.m

@@ -28,6 +28,11 @@ @implementation DetailViewController
 
 @synthesize toolbar, popoverController, contentView, detailItem;
 @synthesize viewActivityIndicator;
+@synthesize name = _name;
+@synthesize exportText = _exportText;
+@synthesize layerExporter = _layerExporter;
+@synthesize tapGestureRecognizer = _tapGestureRecognizer;
+@synthesize exportLog = _exportLog;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {

XCodeProjectData/Demo-iOS/MasterViewController.m

@@ -17,6 +17,7 @@ @implementation MasterViewController
 
 @synthesize sampleNames = _sampleNames;
 @synthesize detailViewController = _detailViewController;
+@synthesize nameOfBrokenSVGToLoad = _nameOfBrokenSVGToLoad;
 
 - (id)init
 {