Merge branch 'release-1.5.2'

Author: odrobnik

Core/Source/DTAttributedLabel.m

@@ -18,22 +18,33 @@ + (Class)layerClass
 	return [CALayer class];
 }
 
+- (void) setupAttributedLabel
+{
+	// we want to relayout the text if height or width change
+	self.relayoutMask = DTAttributedTextContentViewRelayoutOnHeightChanged | DTAttributedTextContentViewRelayoutOnWidthChanged;
+	
+	self.layoutFrameHeightIsConstrainedByBounds = YES; // height is not flexible
+	self.shouldAddFirstLineLeading = NO;
+}
+
 - (id)initWithFrame:(CGRect)frame
 {
 	self = [super initWithFrame:frame];
 
 	if (self)
 	{
-		// we want to relayout the text if height or width change
-		self.relayoutMask = DTAttributedTextContentViewRelayoutOnHeightChanged | DTAttributedTextContentViewRelayoutOnWidthChanged;
-		
-		self.layoutFrameHeightIsConstrainedByBounds = YES; // height is not flexible
-		self.shouldAddFirstLineLeading = NO;
+		[self setupAttributedLabel];
 	}
 
 	return self;
 }
 
+- (void) awakeFromNib
+{
+	[super awakeFromNib];
+	[self setupAttributedLabel];
+}
+
 #pragma mark - Sizing
 
 - (CGSize)intrinsicContentSize
@@ -44,7 +55,9 @@ - (CGSize)intrinsicContentSize
 	}
 
 	//  we have a layout frame and from this we get the needed size
-	return [_layoutFrame intrinsicContentFrame].size;
+	CGSize intrisicContentSize = [_layoutFrame intrinsicContentFrame].size;
+	return CGSizeMake(intrisicContentSize.width + _edgeInsets.left + _edgeInsets.right,
+					  intrisicContentSize.height + _edgeInsets.top + _edgeInsets.bottom);
 }
 
 #pragma mark - Properties 

Core/Source/DTCoreTextConstants.h

@@ -49,7 +49,6 @@ extern NSString * const DTDefaultLineHeightMultiplier;
 extern NSString * const DTDefaultLineHeightMultiplier;
 extern NSString * const DTDefaultFirstLineHeadIndent;
 extern NSString * const DTDefaultHeadIndent;
-extern NSString * const DTDefaultListIndent;
 extern NSString * const DTDefaultStyleSheet;
 extern NSString * const DTUseiOS6Attributes;
 extern NSString * const DTWillFlushBlockCallBack;

Core/Source/DTCoreTextConstants.m

@@ -22,7 +22,6 @@
 NSString * const DTDefaultLineHeightMultiplier = @"DTDefaultLineHeightMultiplier";
 NSString * const DTDefaultFirstLineHeadIndent = @"DTDefaultFirstLineHeadIndent";
 NSString * const DTDefaultHeadIndent = @"DTDefaultHeadIndent";
-NSString * const DTDefaultListIndent = @"DTDefaultListIndent";
 NSString * const DTDefaultStyleSheet = @"DTDefaultStyleSheet";
 NSString * const DTUseiOS6Attributes = @"DTUseiOS6Attributes";
 NSString * const DTWillFlushBlockCallBack = @"DTWillFlushBlockCallBack";

Core/Source/DTCoreTextFontDescriptor.m

@@ -220,6 +220,8 @@ - (id)initWithCTFontDescriptor:(CTFontDescriptorRef)ctFontDescriptor
 
 - (id)initWithCTFont:(CTFontRef)ctFont
 {
+   NSParameterAssert(ctFont);
+	
 	self = [super init];
 	if (self)
 	{

Core/Source/DTCoreTextGlyphRun.m

@@ -158,8 +158,10 @@ - (void)drawDecorationInContext:(CGContextRef)context
 
 		if (backgroundColor)
 		{
+			CGRect backgroundColorRect = CGRectIntegral(CGRectMake(runStrokeBounds.origin.x, lineFrame.origin.y, runStrokeBounds.size.width, lineFrame.size.height));
+			
 			CGContextSetFillColorWithColor(context, backgroundColor.CGColor);
-			CGContextFillRect(context, runStrokeBounds);
+			CGContextFillRect(context, backgroundColorRect);
 		}
 
 		if (drawStrikeOut || drawUnderline)

Core/Source/DTCoreTextLayoutFrame.m

@@ -540,17 +540,8 @@ - (void)_buildLinesWithTypesetter
 		fittingLength += lineRange.length;
 
 		lineRange.location += lineRange.length;
-		
-		// if there is a custom line height we need to adjust the ascender too
-		if (usesForcedLineHeight)
-		{
-			// causes the line frame to encompass also the extra space
-			newLine.ascent = lineHeight;
-		}
-		
 		previousLine = newLine;
-	//previousLineMetrics = currentLineMetrics;
-	} 
+	}
 	while (lineRange.location < maxIndex && !truncateLine);
 
 	_lines = typesetLines;
@@ -756,6 +747,9 @@ - (CGRect)_frameForTextBlock:(DTTextBlock *)textBlock atIndex:(NSUInteger)locati
 {
 	NSRange blockRange = [_attributedStringFragment rangeOfTextBlock:textBlock atIndex:location];
 
+	// need to reduce to actually visible string range in layout frame
+	blockRange = NSIntersectionRange(blockRange, self.visibleStringRange);
+	
 	DTCoreTextLayoutLine *firstBlockLine = [self lineContainingIndex:blockRange.location];
 	DTCoreTextLayoutLine *lastBlockLine = [self lineContainingIndex:NSMaxRange(blockRange)-1];
 
@@ -770,6 +764,13 @@ - (CGRect)_frameForTextBlock:(DTTextBlock *)textBlock atIndex:(NSUInteger)locati
 	{
 		DTCoreTextLayoutLine *oneLine = [self lineContainingIndex:index];
 
+		// avoid potential endless loop and log warning because this should never happen
+		if (!oneLine)
+		{
+			NSLog(@"No line found containing index %ld of block range %@. This should never happen, please report that to [email protected]", (unsigned long)index, NSStringFromRange(blockRange));
+			break;
+		}
+		
 		if (maxWidth<oneLine.frame.size.width)
 		{
 			maxWidth = oneLine.frame.size.width;

Core/Source/DTCoreTextParagraphStyle.h

@@ -196,12 +196,6 @@ The distance in points from the margin of a text container to the end of lines.
 @property (nonatomic, copy) NSArray *textLists;
 
 
-/**
- The amount by which each list level is indented from the previous. NOTE: about to be replaced by textLists property.
- */
-@property (nonatomic, assign) CGFloat listIndent;
-
-
 /**-------------------------------------------------------------------------------------
  @name Setting Text Blocks
  ---------------------------------------------------------------------------------------

Core/Source/DTCoreTextParagraphStyle.m

@@ -25,7 +25,6 @@
 	CGFloat paragraphSpacing;
 	CGFloat headIndent;
 	CGFloat tailIndent;
-	CGFloat listIndent;
 	CGFloat lineHeightMultiple;
 	CGFloat minimumLineHeight;
 	CGFloat maximumLineHeight;
@@ -42,7 +41,6 @@ @implementation DTCoreTextParagraphStyle
 	CGFloat _paragraphSpacing;
 	CGFloat _headIndent;
 	CGFloat _tailIndent;
-	CGFloat _listIndent;
 	CGFloat _lineHeightMultiple;
 	CGFloat _minimumLineHeight;
 	CGFloat _maximumLineHeight;
@@ -132,7 +130,6 @@ - (id)init
 		_minimumLineHeight = 0.0;
 		_maximumLineHeight = 0.0;
 		_paragraphSpacing = 0.0;
-		_listIndent = 0;
 	}
 
 	return self;
@@ -227,7 +224,7 @@ - (id)initWithCTParagraphStyle:(CTParagraphStyleRef)ctParagraphStyle
 	allvalues_t *allvalues = &allvalues_stack; // pointer so that we can use the arrow operator
 #endif
 
-	*allvalues = (allvalues_t){0,0,0,0,0,0,0,0,0,0,0,0,0};
+	*allvalues = (allvalues_t){0,0,0,0,0,0,0,0,0,0,0,0};
 
 	// pack all values in the struct
 	allvalues->firstLineHeadIndent = _firstLineHeadIndent;
@@ -236,7 +233,6 @@ - (id)initWithCTParagraphStyle:(CTParagraphStyleRef)ctParagraphStyle
 	allvalues->paragraphSpacing = _paragraphSpacing;
 	allvalues->headIndent = _headIndent;
 	allvalues->tailIndent = _tailIndent;
-	allvalues->listIndent = _listIndent;
 	allvalues->lineHeightMultiple = _lineHeightMultiple;
 	allvalues->minimumLineHeight = _minimumLineHeight;
 	allvalues->maximumLineHeight = _maximumLineHeight;
@@ -324,8 +320,6 @@ - (NSParagraphStyle *)NSParagraphStyle
 	[mps setHeadIndent:_headIndent];
 	[mps setTailIndent:_tailIndent];
 
-	// _listIndent not supported
-	
 	[mps setMinimumLineHeight:_minimumLineHeight];
 	[mps setMaximumLineHeight:_maximumLineHeight];
 
@@ -501,7 +495,6 @@ - (id)copyWithZone:(NSZone *)zone
 	newObject.minimumLineHeight = self.minimumLineHeight;
 	newObject.maximumLineHeight = self.maximumLineHeight;
 	newObject.headIndent = self.headIndent;
-	newObject.listIndent = self.listIndent;
 	newObject.alignment = self.alignment;
 	newObject.baseWritingDirection = self.baseWritingDirection;
 	newObject.tabStops = self.tabStops; // copy
@@ -635,7 +628,6 @@ - (void)setBaseWritingDirection:(CTWritingDirection)baseWritingDirection
 @synthesize maximumLineHeight = _maximumLineHeight;
 @synthesize headIndent = _headIndent;
 @synthesize tailIndent = _tailIndent;
-@synthesize listIndent = _listIndent;
 @synthesize alignment = _alignment;
 @synthesize textLists = _textLists;
 @synthesize textBlocks = _textBlocks;

Core/Source/DTHTMLAttributedStringBuilder.m

@@ -63,6 +63,7 @@ @implementation DTHTMLAttributedStringBuilder
 	DTHTMLElement *_rootNode;
 	DTHTMLElement *_bodyElement;
 	DTHTMLElement *_currentTag;
+	BOOL _ignoreParseEvents; // ignores events from parser after first HTML tag was finished
 }
 
 - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttributes:(NSDictionary **)docAttributes
@@ -75,7 +76,7 @@ - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttrib
 
 		// documentAttributes ignored for now
 
-		//GCD setup
+		// GCD setup
 		_stringAssemblyQueue = dispatch_queue_create("DTHTMLAttributedStringBuilder", 0);
 		_stringAssemblyGroup = dispatch_group_create();
 		_dataParsingQueue = dispatch_queue_create("DTHTMLAttributedStringBuilderParser", 0);
@@ -273,12 +274,6 @@ - (BOOL)_buildString
 		_defaultParagraphStyle.headIndent = [defaultHeadIndent integerValue];
 	}
 
-	NSNumber *defaultListIndent = [_options objectForKey:DTDefaultListIndent];
-	if (defaultListIndent)
-	{
-		_defaultParagraphStyle.listIndent = [defaultListIndent integerValue];
-	}
-	
 	_defaultTag = [[DTHTMLElement alloc] init];
 	_defaultTag.fontDescriptor = _defaultFontDescriptor;
 	_defaultTag.paragraphStyle = _defaultParagraphStyle;
@@ -402,30 +397,28 @@ - (void)_registerTagStartHandlers
 	[_tagStartHandlers setObject:[aBlock copy] forKey:@"a"];
 
 
-	void (^liBlock)(void) = ^
-	{
-		_currentTag.paragraphStyle.paragraphSpacing = 0;
-		
-		DTCSSListStyle *listStyle = [_currentTag.paragraphStyle.textLists lastObject];
-		
-		if (listStyle.type != DTCSSListStyleTypeNone)
-		{
-			// first tab is to right-align bullet, numbering against
-			CGFloat tabOffset = _currentTag.paragraphStyle.headIndent - 5.0f*_textScale;
-			[_currentTag.paragraphStyle addTabStopAtPosition:tabOffset alignment:kCTRightTextAlignment];
-		}
-		
-		// second tab is for the beginning of first line after bullet
-		[_currentTag.paragraphStyle addTabStopAtPosition:_currentTag.paragraphStyle.headIndent alignment:	kCTLeftTextAlignment];
-	};
-	
-	[_tagStartHandlers setObject:[liBlock copy] forKey:@"li"];
+//	void (^liBlock)(void) = ^
+//	{
+//		DTCSSListStyle *listStyle = [_currentTag.paragraphStyle.textLists lastObject];
+//		
+//		if (listStyle.type != DTCSSListStyleTypeNone)
+//		{
+//			// first tab is to right-align bullet, numbering against
+//			CGFloat tabOffset = _currentTag.paragraphStyle.headIndent - 5.0f*_textScale;
+//			[_currentTag.paragraphStyle addTabStopAtPosition:tabOffset alignment:kCTRightTextAlignment];
+//		}
+//		
+//		// second tab is for the beginning of first line after bullet
+//		[_currentTag.paragraphStyle addTabStopAtPosition:_currentTag.paragraphStyle.headIndent alignment:	kCTLeftTextAlignment];
+//	};
+//	
+//	[_tagStartHandlers setObject:[liBlock copy] forKey:@"li"];
 
 
 	void (^listBlock)(void) = ^
 	{
 		_currentTag.paragraphStyle.firstLineHeadIndent = _currentTag.paragraphStyle.headIndent;
-		_currentTag.paragraphStyle.headIndent += _currentTag.paragraphStyle.listIndent;
+//		_currentTag.paragraphStyle.headIndent += _currentTag.paragraphStyle.listIndent;
 
 		// create the appropriate list style from CSS
 		DTCSSListStyle *newListStyle = [_currentTag listStyle];
@@ -646,9 +639,15 @@ - (void)_registerTagEndHandlers
 
 - (void)parser:(DTHTMLParser *)parser didStartElement:(NSString *)elementName attributes:(NSDictionary *)attributeDict
 {
+	
 	dispatch_group_async(_treeBuildingGroup, _treeBuildingQueue, ^{
-		DTHTMLElement *newNode = [DTHTMLElement elementWithName:elementName attributes:attributeDict options:_options];
 
+		if (_ignoreParseEvents)
+		{
+			return;
+		}
+
+		DTHTMLElement *newNode = [DTHTMLElement elementWithName:elementName attributes:attributeDict options:_options];
 		DTHTMLElement *previousLastChild = nil;
 
 		if (_currentTag)
@@ -670,6 +669,8 @@ - (void)parser:(DTHTMLParser *)parser didStartElement:(NSString *)elementName at
 		}
 		else
 		{
+			NSAssert(!_rootNode, @"Something went wrong, second root node found in document and not ignored.");
+			
 			// might be first node ever
 			if (!_rootNode)
 			{
@@ -716,7 +717,14 @@ - (void)parser:(DTHTMLParser *)parser didStartElement:(NSString *)elementName at
 
 - (void)parser:(DTHTMLParser *)parser didEndElement:(NSString *)elementName
 {
+
 	dispatch_group_async(_treeBuildingGroup, _treeBuildingQueue, ^{
+		
+		if (_ignoreParseEvents)
+		{
+			return;
+		}
+		
 		// output the element if it is direct descendant of body tag, or close of body in case there are direct text nodes
 
 		// find block to execute for this tag if any
@@ -783,6 +791,12 @@ - (void)parser:(DTHTMLParser *)parser didEndElement:(NSString *)elementName
 			// missing end of element, attempt to recover
 			_currentTag = [_currentTag parentElement];
 		}
+		
+		// closing the root node, ignore everything afterwards
+		if (_currentTag == _rootNode)
+		{
+			_ignoreParseEvents = YES;
+		}
 
 		// go back up a level
 		_currentTag = [_currentTag parentElement];
@@ -795,6 +809,11 @@ - (void)parser:(DTHTMLParser *)parser foundCharacters:(NSString *)string
 	dispatch_group_async(_treeBuildingGroup, _treeBuildingQueue, ^{
 		NSAssert(_currentTag, @"Cannot add text node without a current node");
 
+		if (_ignoreParseEvents)
+		{
+			return;
+		}
+		
 		if ([string isIgnorableWhitespace])
 		{
 			// ignore whitespace as first element of block element
@@ -853,6 +872,12 @@ - (void)parser:(DTHTMLParser *)parser foundCharacters:(NSString *)string
 - (void)parser:(DTHTMLParser *)parser foundCDATA:(NSData *)CDATABlock
 {
 	dispatch_group_async(_treeBuildingGroup, _treeBuildingQueue, ^{
+		
+		if (_ignoreParseEvents)
+		{
+			return;
+		}
+		
 		NSAssert(_currentTag, @"Cannot add text node without a current node");
 
 		NSString *styleBlock = [[NSString alloc] initWithData:CDATABlock encoding:NSUTF8StringEncoding];
@@ -866,9 +891,10 @@ - (void)parser:(DTHTMLParser *)parser foundCDATA:(NSData *)CDATABlock
 
 - (void)parserDidEndDocument:(DTHTMLParser *)parser
 {
+
 	dispatch_group_async(_treeBuildingGroup, _treeBuildingQueue, ^{
 		NSAssert(!_currentTag, @"Something went wrong, at end of document there is still an open node");
-		
+
 		dispatch_group_async(_stringAssemblyGroup, _stringAssemblyQueue, ^{
 			// trim off white space at end
 			while ([[_tmpString string] hasSuffixCharacterFromSet:[NSCharacterSet whitespaceCharacterSet]])

Core/Source/DTHTMLElement.h

@@ -23,8 +23,6 @@
  */
 @interface DTHTMLElement : DTHTMLParserNode
 {
-	DTHTMLElement *_parent;
-	
 	DTCoreTextFontDescriptor *_fontDescriptor;
 	DTCoreTextParagraphStyle *_paragraphStyle;
 	DTTextAttachment *_textAttachment;
@@ -74,6 +72,9 @@
 	// margins/padding
 	DTEdgeInsets _margins;
 	DTEdgeInsets _padding;
+	
+	// indent of lists
+	CGFloat _listIndent;
 }
 
 /**