Merge branch 'release-1.5.1'

odrobnik · odrobnik · commit 5295943640aa · 2013-05-08T18:10:31.000+02:00
diff --git a/Core/Source/DTAttributedTextContentView.m b/Core/Source/DTAttributedTextContentView.m
@@ -448,6 +448,12 @@ - (void)drawRect:(CGRect)rect
 
 - (void)relayoutText
 {
+	if (![NSThread isMainThread])
+	{
+		[self performSelectorOnMainThread:@selector(relayoutText) withObject:nil waitUntilDone:YES];
+		return;
+	}
+	
     // Make sure we actually have a superview and a previous layout before attempting to relayout the text.
     if (_layoutFrame && self.superview)
 	{
diff --git a/Core/Source/DTAttributedTextView.m b/Core/Source/DTAttributedTextView.m
@@ -125,6 +125,12 @@ - (void)scrollRangeToVisible:(NSRange)range animated:(BOOL)animated
 
 - (void)relayoutText
 {
+	if (![NSThread isMainThread])
+	{
+		[self performSelectorOnMainThread:@selector(relayoutText) withObject:nil waitUntilDone:YES];
+		return;
+	}
+	
 	// need to reset the layouter because otherwise we get the old framesetter or cached layout frames
 	_attributedTextContentView.layouter=nil;
 	
diff --git a/Core/Source/DTCSSStylesheet.m b/Core/Source/DTCSSStylesheet.m
@@ -160,7 +160,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles
 	{
 		NSString *fontStyle = @"normal";
 		NSArray *validFontStyles = [NSArray arrayWithObjects:@"italic", @"oblique", nil];
-		BOOL fontStyleSet = NO;
 
 		NSString *fontVariant = @"normal";
 		NSArray *validFontVariants = [NSArray arrayWithObjects:@"small-caps", nil];
@@ -177,7 +176,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles
 		NSArray *suffixesToIgnore = [NSArray arrayWithObjects:@"caption", @"icon", @"menu", @"message-box", @"small-caption", @"status-bar", @"inherit", nil];
 		
 		NSString *lineHeight = @"normal";
-		BOOL lineHeightSet = NO;
 		
 		NSMutableString *fontFamily = [NSMutableString string];
 		
@@ -204,7 +202,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles
 				fontSizeSet = YES;
 				
 				lineHeight = [oneComponent substringFromIndex:slashIndex+1];
-				lineHeightSet = YES;
 				
 				continue;
 			}
@@ -240,7 +237,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles
 				if (!fontWeightSet && [validFontStyles containsObject:oneComponent])
 				{
 					fontStyle = oneComponent;
-					fontStyleSet = YES;
 				}
 				else if (!fontVariantSet && [validFontVariants containsObject:oneComponent])
 				{
diff --git a/Core/Source/DTHTMLElement.m b/Core/Source/DTHTMLElement.m
@@ -406,19 +406,8 @@ - (NSAttributedString *)attributedString
 			{
 				if (![[tmpString string] hasSuffix:@"\n"])
 				{
-					if ([tmpString length])
-					{
-						// extend same paragraph and font style
-						[tmpString appendString:@"\n"];
-					}
-					else
-					{
-						// tmpString has no attributes to extend, so we make a new string with attributes
-						
-						// need all attributes to e.g. extend list to include this character
-						NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:@"\n" attributes:[self attributesDictionary]];
-						[tmpString appendAttributedString:attributedString];
-					}
+					NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:@"\n" attributes:[self attributesDictionary]];
+					[tmpString appendAttributedString:attributedString];
 				}
 			}
 		}
diff --git a/Core/Source/DTLazyImageView.m b/Core/Source/DTLazyImageView.m
@@ -211,8 +211,15 @@ - (void)completeDownloadWithData:(NSData *)data
 	
 	if (_url)
 	{
-		// cache image
-		[_imageCache setObject:image forKey:_url];
+		if (image)
+		{
+			// cache image
+			[_imageCache setObject:image forKey:_url];
+		}
+		else
+		{
+			NSLog(@"Warning, %@ did not get an image for %@", NSStringFromClass([self class]), [_url absoluteString]);
+		}
 	}
 	
 }
diff --git a/Core/Source/NSDictionary+DTCoreText.h b/Core/Source/NSDictionary+DTCoreText.h
@@ -14,7 +14,7 @@
 /**
  Convenience methods for editors dealing with Core Text attribute dictionaries.
  */
-@interface NSDictionary (DTRichText)
+@interface NSDictionary (DTCoreText)
 
 /**
  @name Getting State information
@@ -50,6 +50,12 @@
  */
 - (BOOL)hasAttachment;
 
+/**
+ The header level of the receiver
+ @returns The header level (1-6) or 0 if no header level is set
+ */
+- (NSUInteger)headerLevel;
+
 /**
  @name Getting Style Information
  */
diff --git a/Core/Source/NSDictionary+DTCoreText.m b/Core/Source/NSDictionary+DTCoreText.m
@@ -15,7 +15,7 @@
 #import "DTCoreTextFunctions.h"
 #import "DTCoreTextParagraphStyle.h"
 
-@implementation NSDictionary (DTRichText)
+@implementation NSDictionary (DTCoreText)
 
 - (BOOL)isBold
 {
@@ -87,6 +87,13 @@ - (BOOL)isStrikethrough
 	return NO;
 }
 
+- (NSUInteger)headerLevel
+{
+	NSNumber *headerLevelNum = [self objectForKey:DTHeaderLevelAttribute];
+	
+	return [headerLevelNum integerValue];
+}
+
 - (BOOL)hasAttachment
 {
 	return [self objectForKey:NSAttachmentAttributeName]!=nil;
diff --git a/Core/Test/Source/DTHTMLAttributedStringBuilderTest.m b/Core/Test/Source/DTHTMLAttributedStringBuilderTest.m
@@ -240,6 +240,15 @@ - (void)testFontSizeInterpretation
 		__block CGFloat paragraphFontSize = 0; // initialized from first font in paragraph
 		
 		[output enumerateAttribute:(id)kCTFontAttributeName inRange:paragraphRange options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
+			
+			NSString *subString = [[output string] substringWithRange:range];
+			
+			// the NL are exempt from the test
+			if ([subString isEqualToString:@"\n"])
+			{
+				return;
+			}
+			
 			DTCoreTextFontDescriptor *fontDescriptor = [DTCoreTextFontDescriptor fontDescriptorForCTFont:(__bridge CTFontRef)(value)];
 			
 			if (paragraphFontSize==0)
@@ -300,7 +309,7 @@ - (void)testOrderedListStartingNumber
 // testing if Helvetica font family returns the correct font
 - (void)testHelveticaVariants
 {
-	NSAttributedString *attributedString = [self _attributedStringFromHTMLString:@"<p style=\"font-family:Helvetica\">Regular</p><p style=\"font-family:Helvetica\"><b>Bold</b></p><p style=\"font-family:Helvetica\"><i>Italic</i></p><p style=\"font-family:Helvetica\"><b><i>Bold+Italic</i></b></p>"];
+	NSAttributedString *attributedString = [self _attributedStringFromHTMLString:@"<p style=\"font-family:Helvetica\">Regular</p><p style=\"font-family:Helvetica;font-weight:bold;\">Bold</p><p style=\"font-family:Helvetica;font-style:italic;}\">Italic</p><p style=\"font-family:Helvetica;font-style:italic;font-weight:bold;}\">Bold+Italic</p>"];
 	
 	NSString *string = [attributedString string];
 	NSRange entireStringRange = NSMakeRange(0, [string length]);
@@ -363,6 +372,23 @@ - (void)testHeaderLevelTransfer
 	STAssertEquals(level, (NSInteger)3, @"Level should be 3");
 }
 
+// Issue 437, strikethrough bleeding into NL
+- (void)testBleedingOutAttributes
+{
+	NSAttributedString *attributedString = [self _attributedStringFromHTMLString:@"<p><del>abc<br/></del></p>"];
+	
+	STAssertTrue([attributedString length] == 5, @"Attributed String should be 5 characters long");
+	
+	NSRange effectiveRange;
+	NSNumber *strikethroughStyle = [attributedString attribute:DTStrikeOutAttribute atIndex:0 effectiveRange:&effectiveRange];
+	
+	STAssertNotNil(strikethroughStyle, @"There should be a strikethrough style");
+	
+	NSRange expectedRange = NSMakeRange(0, 4);
+	
+	STAssertEquals(effectiveRange, expectedRange, @"Strikethrough style should only contain abc, not the NL");
+}
+
 #pragma mark - Nested Lists
 
 - (void)testNestedListWithStyleNone
diff --git a/DTCoreText.podspec b/DTCoreText.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTCoreText'
-  spec.version      = '1.5.0'
+  spec.version      = '1.5.1'
   spec.platform     = :ios, '4.3'
   spec.license      = 'BSD'
   spec.source       = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => spec.version.to_s }
diff --git a/Demo/Resources/CurrentTest.html b/Demo/Resources/CurrentTest.html
@@ -1,26 +1,9 @@
-<head>
-	<style type="text/css">
-		hr {
-			padding: 30px;
-			color: red;
-			-webkit-margin-before: 0.0px;
-			-webkit-margin-after: 0.5em;
-			-webkit-margin-start: auto;
-			-webkit-margin-end: auto;
-		}
-		</style>
-</head>
-<body>
-	
-	<object class="Bla" style="width:150px; height:150px" src="Oliver.jpg" />
-		
-		<object class="Bla" width=200 height=200 src="Oliver.jpg" />
-
- <object height="38" width="32" />
-
-
- 
-				
-				<object style="height:38px;width:32px" />
-	
-</body>
+<!DOCTYPE html>
+<html lang='en'>
+	<head>
+		<style> p{ line-height : 1.5em; } </style>
+	</head>
+	<body>
+		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor     incididunt ut labore et dolore magna aliqua. <img src='Oliver.jpg' alt='image' /> Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+	</body>
+</html>
diff --git a/Demo/Source/CoreTextDemoAppDelegate.m b/Demo/Source/CoreTextDemoAppDelegate.m
@@ -10,15 +10,20 @@
 #import "DemoSnippetsViewController.h"
 
 #import "DTCoreText.h"
+#import "UIView+DTDebug.h"
 
 @implementation CoreTextDemoAppDelegate
 
 @synthesize window = _window;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 
 {
+	// register a custom class for a tag
 	[DTTextAttachment registerClass:[DTObjectTextAttachment class] forTagName:@"oliver"];
 	
+	// for debugging, we make sure that UIView methods are only called on main thread
+	[UIView toggleViewMainThreadChecking];
+	
 	// Create window
 	_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 	
diff --git a/Demo/Source/DemoTextViewController.m b/Demo/Source/DemoTextViewController.m
@@ -145,10 +145,18 @@ - (NSAttributedString *)_attributedStringForSnippetUsingiOS6Attributes:(BOOL)use
 	
 	// example for setting a willFlushCallback, that gets called before elements are written to the generated attributed string
 	void (^callBackBlock)(DTHTMLElement *element) = ^(DTHTMLElement *element) {
-		// if an element is larger than twice the font size put it in it's own block
-		if (element.displayStyle == DTHTMLElementDisplayStyleInline && element.textAttachment.displaySize.height > 2.0 * element.fontDescriptor.pointSize)
+		
+		// the block is being called for an entire paragraph, so we check the individual elements
+		
+		for (DTHTMLElement *oneChildElement in element.childNodes)
 		{
-			element.displayStyle = DTHTMLElementDisplayStyleBlock;
+			// if an element is larger than twice the font size put it in it's own block
+			if (oneChildElement.displayStyle == DTHTMLElementDisplayStyleInline && oneChildElement.textAttachment.displaySize.height > 2.0 * oneChildElement.fontDescriptor.pointSize)
+			{
+				oneChildElement.displayStyle = DTHTMLElementDisplayStyleBlock;
+				oneChildElement.paragraphStyle.minimumLineHeight = element.textAttachment.displaySize.height;
+				oneChildElement.paragraphStyle.maximumLineHeight = element.textAttachment.displaySize.height;
+			}
 		}
 	};
 	

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,12 @@ - (void)drawRect:(CGRect)rect`
`448`	`448`
`449`	`449`	`- (void)relayoutText`
`450`	`450`	`{`
	`451`	`+ if (![NSThread isMainThread])`
	`452`	`+ {`
	`453`	`+ [self performSelectorOnMainThread:@selector(relayoutText) withObject:nil waitUntilDone:YES];`
	`454`	`+ return;`
	`455`	`+ }`
	`456`	`+`
`451`	`457`	`// Make sure we actually have a superview and a previous layout before attempting to relayout the text.`
`452`	`458`	`if (_layoutFrame && self.superview)`
`453`	`459`	`{`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles`
`160`	`160`	`{`
`161`	`161`	`NSString *fontStyle = @"normal";`
`162`	`162`	`NSArray *validFontStyles = [NSArray arrayWithObjects:@"italic", @"oblique", nil];`
`163`		`- BOOL fontStyleSet = NO;`
`164`	`163`
`165`	`164`	`NSString *fontVariant = @"normal";`
`166`	`165`	`NSArray *validFontVariants = [NSArray arrayWithObjects:@"small-caps", nil];`
`@@ -177,7 +176,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles`
`177`	`176`	`NSArray *suffixesToIgnore = [NSArray arrayWithObjects:@"caption", @"icon", @"menu", @"message-box", @"small-caption", @"status-bar", @"inherit", nil];`
`178`	`177`
`179`	`178`	`NSString *lineHeight = @"normal";`
`180`		`- BOOL lineHeightSet = NO;`
`181`	`179`
`182`	`180`	`NSMutableString *fontFamily = [NSMutableString string];`
`183`	`181`
`@@ -204,7 +202,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles`
`204`	`202`	`fontSizeSet = YES;`
`205`	`203`
`206`	`204`	`lineHeight = [oneComponent substringFromIndex:slashIndex+1];`
`207`		`- lineHeightSet = YES;`
`208`	`205`
`209`	`206`	`continue;`
`210`	`207`	`}`
`@@ -240,7 +237,6 @@ - (void)_uncompressShorthands:(NSMutableDictionary *)styles`
`240`	`237`	`if (!fontWeightSet && [validFontStyles containsObject:oneComponent])`
`241`	`238`	`{`
`242`	`239`	`fontStyle = oneComponent;`
`243`		`- fontStyleSet = YES;`
`244`	`240`	`}`
`245`	`241`	`else if (!fontVariantSet && [validFontVariants containsObject:oneComponent])`
`246`	`242`	`{`
Original file line number	Diff line number	Diff line change
`@@ -406,19 +406,8 @@ - (NSAttributedString *)attributedString`
`406`	`406`	`{`
`407`	`407`	`if (![[tmpString string] hasSuffix:@"\n"])`
`408`	`408`	`{`
`409`		`- if ([tmpString length])`
`410`		`- {`
`411`		`- // extend same paragraph and font style`
`412`		`- [tmpString appendString:@"\n"];`
`413`		`- }`
`414`		`- else`
`415`		`- {`
`416`		`- // tmpString has no attributes to extend, so we make a new string with attributes`
`417`		`-`
`418`		`- // need all attributes to e.g. extend list to include this character`
`419`		`- NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:@"\n" attributes:[self attributesDictionary]];`
`420`		`- [tmpString appendAttributedString:attributedString];`
`421`		`- }`
	`409`	`+ NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:@"\n" attributes:[self attributesDictionary]];`
	`410`	`+ [tmpString appendAttributedString:attributedString];`
`422`	`411`	`}`
`423`	`412`	`}`
`424`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,15 @@ - (void)completeDownloadWithData:(NSData *)data`
`211`	`211`
`212`	`212`	`if (_url)`
`213`	`213`	`{`
`214`		`- // cache image`
`215`		`- [_imageCache setObject:image forKey:_url];`
	`214`	`+ if (image)`
	`215`	`+ {`
	`216`	`+ // cache image`
	`217`	`+ [_imageCache setObject:image forKey:_url];`
	`218`	`+ }`
	`219`	`+ else`
	`220`	`+ {`
	`221`	`+ NSLog(@"Warning, %@ did not get an image for %@", NSStringFromClass([self class]), [_url absoluteString]);`
	`222`	`+ }`
`216`	`223`	`}`
`217`	`224`
`218`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#import "DTCoreTextFunctions.h"`
`16`	`16`	`#import "DTCoreTextParagraphStyle.h"`
`17`	`17`
`18`		`-@implementation NSDictionary (DTRichText)`
	`18`	`+@implementation NSDictionary (DTCoreText)`
`19`	`19`
`20`	`20`	`- (BOOL)isBold`
`21`	`21`	`{`
`@@ -87,6 +87,13 @@ - (BOOL)isStrikethrough`
`87`	`87`	`return NO;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+- (NSUInteger)headerLevel`
	`91`	`+{`
	`92`	`+ NSNumber *headerLevelNum = [self objectForKey:DTHeaderLevelAttribute];`
	`93`	`+`
	`94`	`+ return [headerLevelNum integerValue];`
	`95`	`+}`
	`96`	`+`
`90`	`97`	`- (BOOL)hasAttachment`
`91`	`98`	`{`
`92`	`99`	`return [self objectForKey:NSAttachmentAttributeName]!=nil;`