Implemented option to ignore inline styles closes #649

Core/Source/DTCSSStylesheet.h

@@ -70,8 +70,7 @@
  @param matchedSelectors The CSS selectors that caused a match
  @returns The merged style dictionary containing only styles which selector matches the element
  */
-- (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element matchedSelectors:(NSSet **)matchedSelectors;
-
+- (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element matchedSelectors:(NSSet **)matchedSelectors ignoreInlineStyle:(BOOL)ignoreInlineStyle;
 
 /**
  Returns a dictionary of the styles of the receiver

Core/Source/DTCSSStylesheet.m

@@ -660,7 +660,7 @@ - (void)_addStyles:(NSDictionary *)styles withSelector:(NSString *)selector {
 
 #pragma mark Accessing Style Information
 
-- (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element matchedSelectors:(NSSet **)matchedSelectors
+- (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element matchedSelectors:(NSSet **)matchedSelectors ignoreInlineStyle:(BOOL)ignoreInlineStyle
 {
 	// We are going to combine all the relevant styles for this tag.
 	// (Note that when styles are applied, the later styles take precedence,
@@ -753,17 +753,20 @@ - (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element match
 		[tmpMatchedSelectors addObject:idRule];
 	}
 
-	// Get tag's local style attribute
-	NSString *styleString = [element.attributes objectForKey:@"style"];
-
-	if ([styleString length])
+	if (!ignoreInlineStyle)
 	{
-		NSMutableDictionary *localStyles = [[styleString dictionaryOfCSSStyles] mutableCopy];
-
-		// need to uncompress because otherwise we might get shorthands and non-shorthands together
-		[self _uncompressShorthands:localStyles];
+		// Get tag's local style attribute
+		NSString *styleString = [element.attributes objectForKey:@"style"];
 
-		[tmpDict addEntriesFromDictionary:localStyles];
+		if ([styleString length])
+		{
+			NSMutableDictionary *localStyles = [[styleString dictionaryOfCSSStyles] mutableCopy];
+
+			// need to uncompress because otherwise we might get shorthands and non-shorthands together
+			[self _uncompressShorthands:localStyles];
+
+			[tmpDict addEntriesFromDictionary:localStyles];
+		}
 	}
 
 	if ([tmpDict count])

Core/Source/DTCoreTextConstants.h

@@ -53,6 +53,8 @@ extern NSString * const DTDefaultStyleSheet;
 extern NSString * const DTUseiOS6Attributes;
 extern NSString * const DTWillFlushBlockCallBack;
 extern NSString * const DTProcessCustomHTMLAttributes;
+extern NSString * const DTIgnoreInlineStylesOption;
+
 
 // attributed string attribute constants
 

Core/Source/DTCoreTextConstants.m

@@ -26,6 +26,7 @@
 NSString * const DTUseiOS6Attributes = @"DTUseiOS6Attributes";
 NSString * const DTWillFlushBlockCallBack = @"DTWillFlushBlockCallBack";
 NSString * const DTProcessCustomHTMLAttributes = @"DTProcessCustomHTMLAttributes";
+NSString * const DTIgnoreInlineStylesOption = @"DTIgnoreInlineStyles";
 
 // attributed string attribute constants
 

Core/Source/DTHTMLAttributedStringBuilder.h

@@ -42,6 +42,7 @@ typedef void(^DTHTMLAttributedStringBuilderWillFlushCallback)(DTHTMLElement *);
  - DTDefaultStyleSheet: The default style sheet to use
  - DTUseiOS6Attributes: use iOS 6 attributes for building (UITextView compatible)
  - DTWillFlushBlockCallBack: a block to be executed whenever content is flushed to the output string
+ - DTIgnoreInlineStylesOption: All inline style information is being ignored and only style blocks used
  
  @param data The data in HTML format from which to create the attributed string.
  @param options Specifies how the document should be loaded. Contains values described in NSAttributedString(HTML).

Core/Source/DTHTMLAttributedStringBuilder.m

@@ -67,6 +67,7 @@ @implementation DTHTMLAttributedStringBuilder
 	DTHTMLElement *_bodyElement;
 	DTHTMLElement *_currentTag;
 	BOOL _ignoreParseEvents; // ignores events from parser after first HTML tag was finished
+	BOOL _ignoreInlineStyles; // ignores style blocks attached on elements
 }
 
 - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)docAttributes
@@ -311,6 +312,9 @@ - (BOOL)_buildString
 
 	_shouldProcessCustomHTMLAttributes = [[_options objectForKey:DTProcessCustomHTMLAttributes] boolValue];
 
+	// ignore inline styles if option is passed
+	_ignoreInlineStyles = [[_options objectForKey:DTIgnoreInlineStylesOption] boolValue];
+
 	// create a parser
 	DTHTMLParser *parser = [[DTHTMLParser alloc] initWithData:_data encoding:encoding];
 	parser.delegate = (id)self;
@@ -712,7 +716,7 @@ - (void)parser:(DTHTMLParser *)parser didStartElement:(NSString *)elementName at
 
 		// apply style from merged style sheet
 		NSSet *matchedSelectors;
-		NSDictionary *mergedStyles = [_globalStyleSheet mergedStyleDictionaryForElement:newNode matchedSelectors:&matchedSelectors];
+		NSDictionary *mergedStyles = [_globalStyleSheet mergedStyleDictionaryForElement:newNode matchedSelectors:&matchedSelectors ignoreInlineStyle:_ignoreInlineStyles];
 
 		if (mergedStyles)
 		{

Test/Source/DTCSSStylesheetTest.m

@@ -77,7 +77,7 @@ - (void)testMerging
 	element.fontDescriptor = [[DTCoreTextFontDescriptor alloc] init]; // need to have just any font descriptor
 	element.textScale = 1.0;
 
-	NSDictionary *styles = [stylesheet mergedStyleDictionaryForElement:element matchedSelectors:NULL];
+	NSDictionary *styles = [stylesheet mergedStyleDictionaryForElement:element matchedSelectors:NULL ignoreInlineStyle:NO];
 	[element applyStyleDictionary:styles];
 
 	STAssertEquals(element.displayStyle, DTHTMLElementDisplayStyleBlock, @"Style merging lost block display style");
@@ -125,7 +125,7 @@ - (void)testMergeByID
 	DTHTMLElement *element = [[DTHTMLElement alloc] initWithName:@"dummy" attributes:attributes];
 
 	NSSet *matchedSelectors;
-	NSDictionary *styles = [stylesheet mergedStyleDictionaryForElement:element matchedSelectors:&matchedSelectors];
+	NSDictionary *styles = [stylesheet mergedStyleDictionaryForElement:element matchedSelectors:&matchedSelectors ignoreInlineStyle:NO];
 
 	STAssertTrue([styles count]==1, @"There should be exactly one style");
 	STAssertTrue([matchedSelectors count]==1, @"There should be exactly one matched selector");