Merge branch 'release-1.6.1'

AppledocSettings.plist

@@ -7,7 +7,7 @@
 	<key>--project-company</key>
 	<string>Cocoanetics</string>
 	<key>--project-version</key>
-	<string>1.5</string>
+	<string>1.6</string>
 	<key>--company-id</key>
 	<string>com.cocoanetics</string>
 	<key>--docset-atom-filename</key>

Core/Source/DTAttributedTextContentView.h

@@ -339,3 +339,26 @@ typedef NSUInteger DTAttributedTextContentViewRelayoutMask;
 
 @end
 
+
+/**
+ Methods for getting cursor position and frame. Those are convenience methods that call through to the layoutFrame property which has the same coordinate system as the receiver.
+ */
+@interface DTAttributedTextContentView (Cursor)
+
+/**
+ Determines the closest string index to a point in the receiver's frame.
+ 
+ This can be used to find the cursor position to position an input caret at.
+ @param point The point
+ @returns The resulting string index
+ */
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point;
+
+/**
+ The rectangle to draw a caret for a given index
+ @param index The string index for which to determine a cursor frame
+ @returns The cursor rectangle
+ */
+- (CGRect)cursorRectAtIndex:(NSInteger)index;
+
+@end

Core/Source/DTAttributedTextContentView.m

@@ -87,6 +87,21 @@ + (Class)layerClass
 @end
 
 
+@implementation DTAttributedTextContentView (Cursor)
+
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point
+{
+	return [self.layoutFrame closestCursorIndexToPoint:point];
+}
+
+- (CGRect)cursorRectAtIndex:(NSInteger)index
+{
+	return [self.layoutFrame cursorRectAtIndex:index];
+}
+
+@end
+
+
 @implementation DTAttributedTextContentView
 
 - (void)setup

Core/Source/DTAttributedTextView.h

@@ -105,4 +105,24 @@
  */
 - (void)scrollRangeToVisible:(NSRange)range animated:(BOOL)animated;
 
+/**
+ @name Working with a Cursor
+ */
+
+/**
+ Determines the closest string index to a point in the receiver's frame.
+ 
+ This can be used to find the cursor position to position an input caret at.
+ @param point The point
+ @returns The resulting string index
+ */
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point;
+
+/**
+ The rectangle to draw a caret for a given index
+ @param index The string index for which to determine a cursor frame
+ @returns The cursor rectangle
+ */
+- (CGRect)cursorRectAtIndex:(NSInteger)index;
+
 @end

Core/Source/DTAttributedTextView.m

@@ -141,6 +141,26 @@ - (void)relayoutText
 	[self setNeedsLayout];
 }
 
+#pragma mark - Working with a Cursor
+
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point
+{
+	// the point is in the coordinate system of the receiver, need to convert into those of the content view first
+	CGPoint pointInContentView = [self.attributedTextContentView convertPoint:point fromView:self];
+
+	return [self.attributedTextContentView closestCursorIndexToPoint:pointInContentView];
+}
+
+- (CGRect)cursorRectAtIndex:(NSInteger)index
+{
+	CGRect rectInContentView = [self.attributedTextContentView cursorRectAtIndex:index];
+
+	// the point is in the coordinate system of the content view, need to convert into those of the receiver first
+	CGRect rect = [self.attributedTextContentView convertRect:rectInContentView toView:self];
+
+	return rect;
+}
+
 #pragma mark Notifications
 - (void)contentViewDidLayout:(NSNotification *)notification
 {

Core/Source/DTCoreText.h

@@ -25,6 +25,7 @@
 #import "DTCoreTextParagraphStyle.h"
 #import "DTHTMLAttributedStringBuilder.h"
 #import "DTHTMLElement.h"
+#import "DTHTMLWriter.h"
 #import "NSCharacterSet+HTML.h"
 #import "NSDictionary+DTCoreText.h"
 #import "NSAttributedString+HTML.h"
@@ -64,6 +65,7 @@
 #import "DTCoreTextFontCollection.h"
 #import "DTCoreTextGlyphRun.h"
 #import "DTCoreTextLayoutFrame.h"
+#import "DTCoreTextLayoutFrame+Cursor.h"
 #import "DTCoreTextLayoutLine.h"
 #import "DTCoreTextLayouter.h"
 

Core/Source/DTCoreTextConstants.h

@@ -52,6 +52,7 @@ extern NSString * const DTDefaultHeadIndent;
 extern NSString * const DTDefaultStyleSheet;
 extern NSString * const DTUseiOS6Attributes;
 extern NSString * const DTWillFlushBlockCallBack;
+extern NSString * const DTProcessCustomHTMLAttributes;
 
 // attributed string attribute constants
 

Core/Source/DTCoreTextConstants.m

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

Core/Source/DTCoreTextLayoutFrame+Cursor.h

@@ -0,0 +1,33 @@
+//
+//  DTCoreTextLayoutFrame+Cursor.h
+//  DTCoreText
+//
+//  Created by Oliver Drobnik on 10.07.13.
+//  Copyright (c) 2013 Drobnik.com. All rights reserved.
+//
+
+#import "DTCoreTextLayoutFrame.h"
+
+/**
+ The **Cursor** category extends DTCoreTextLayoutFrame for working with a caret and determine the string index of touch coordinates.
+ */
+
+@interface DTCoreTextLayoutFrame (Cursor)
+
+/**
+ Determines the closest string index to a point in the receiver's frame.
+ 
+ This can be used to find the cursor position to position an input caret at.
+ @param point The point
+ @returns The resulting string index
+ */
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point;
+
+/**
+ The rectangle to draw a caret for a given index
+ @param index The string index for which to determine a cursor frame
+ @returns The cursor rectangle
+ */
+- (CGRect)cursorRectAtIndex:(NSInteger)index;
+
+@end

Core/Source/DTCoreTextLayoutFrame+Cursor.m

@@ -0,0 +1,114 @@
+//
+//  DTCoreTextLayoutFrame+Cursor.m
+//  DTCoreText
+//
+//  Created by Oliver Drobnik on 10.07.13.
+//  Copyright (c) 2013 Drobnik.com. All rights reserved.
+//
+
+#import "DTCoreTextLayoutFrame+Cursor.h"
+#import "DTCoreTextLayoutLine.h"
+
+@implementation DTCoreTextLayoutFrame (Cursor)
+
+- (NSInteger)closestCursorIndexToPoint:(CGPoint)point
+{
+	NSArray *lines = self.lines;
+
+	if (![lines count])
+	{
+		return NSNotFound;
+	}
+
+	DTCoreTextLayoutLine *firstLine = [lines objectAtIndex:0];
+	if (point.y < CGRectGetMinY(firstLine.frame))
+	{
+		return 0;
+	}
+
+	DTCoreTextLayoutLine *lastLine = [lines lastObject];
+	if (point.y > CGRectGetMaxY(lastLine.frame))
+	{
+        NSRange stringRange = [self visibleStringRange];
+
+        if (stringRange.length)
+        {
+            return NSMaxRange([self visibleStringRange])-1;
+        }
+	}
+
+	// find closest line
+	DTCoreTextLayoutLine *closestLine = nil;
+	CGFloat closestDistance = CGFLOAT_MAX;
+
+	for (DTCoreTextLayoutLine *oneLine in lines)
+	{
+		// line contains point
+		if (CGRectGetMinY(oneLine.frame) <= point.y && CGRectGetMaxY(oneLine.frame) >= point.y)
+		{
+			closestLine = oneLine;
+			break;
+		}
+
+		CGFloat top = CGRectGetMinY(oneLine.frame);
+		CGFloat bottom = CGRectGetMaxY(oneLine.frame);
+
+		CGFloat distance = CGFLOAT_MAX;
+
+		if (top > point.y)
+		{
+			distance = top - point.y;
+		}
+		else if (bottom < point.y)
+		{
+			distance = point.y - bottom;
+		}
+
+		if (distance < closestDistance)
+		{
+			closestLine = oneLine;
+			closestDistance = distance;
+		}
+	}
+
+	if (!closestLine)
+	{
+		return NSNotFound;
+	}
+
+	NSInteger closestIndex = [closestLine stringIndexForPosition:point];
+
+	NSInteger maxIndex = NSMaxRange([closestLine stringRange])-1;
+
+	if (closestIndex > maxIndex)
+	{
+		closestIndex = maxIndex;
+	}
+
+	if (closestIndex>=0)
+	{
+		return closestIndex;
+	}
+
+	return NSNotFound;
+}
+
+- (CGRect)cursorRectAtIndex:(NSInteger)index
+{
+	DTCoreTextLayoutLine *line = [self lineContainingIndex:index];
+
+	if (!line)
+	{
+		return CGRectZero;
+	}
+
+	CGFloat offset = [line offsetForStringIndex:index];
+
+	CGRect rect = line.frame;
+	rect.size.width = 3.0;
+	rect.origin.x += offset;
+
+	return rect;
+}
+
+@end

Core/Source/DTCoreTextLayoutFrame.m

@@ -1144,13 +1144,26 @@ - (void)drawInContext:(CGContextRef)context options:(DTCoreTextLayoutFrameDrawin
 				runIndex ++;
 			}
 
+			DTTextAttachment *attachment = oneRun.attachment;
+
+			if (drawImages && [attachment conformsToProtocol:@protocol(DTTextAttachmentDrawing)])
+			{
+				id<DTTextAttachmentDrawing> drawableAttachment = (id<DTTextAttachmentDrawing>)attachment;
+
+				// frame might be different due to image vertical alignment
+				CGFloat ascender = [attachment ascentForLayout];
+				CGRect rect = CGRectMake(oneRun.frame.origin.x, oneLine.baselineOrigin.y - ascender, attachment.displaySize.width, attachment.displaySize.height);
+
+				[drawableAttachment drawInRect:rect context:context];
+			}
+
 			if (!drawLinks && oneRun.isHyperlink)
 			{
 				continue;
 			}
 
 			// don't draw decorations on images
-			if (oneRun.attachment)
+			if (attachment)
 			{
 				continue;
 			}
@@ -1210,26 +1223,7 @@ - (void)drawInContext:(CGContextRef)context options:(DTCoreTextLayoutFrameDrawin
 
 			CGContextSetTextPosition(context, textPosition.x, textPosition.y);
 
-			DTTextAttachment *attachment = oneRun.attachment;
-
-			if (attachment)
-			{
-				if (drawImages && [attachment conformsToProtocol:@protocol(DTTextAttachmentDrawing)])
-				{
-					id<DTTextAttachmentDrawing> drawableAttachment = (id<DTTextAttachmentDrawing>)attachment;
-
-					// frame might be different due to image vertical alignment
-					CGFloat ascender = [attachment ascentForLayout];
-					CGFloat descender = [attachment descentForLayout];
-
-					CGPoint origin = oneRun.frame.origin;
-					origin.y = self.frame.size.height - origin.y - ascender - descender;
-					CGRect flippedRect = CGRectMake(roundf(origin.x), roundf(origin.y), attachment.displaySize.width, attachment.displaySize.height);
-
-					[drawableAttachment drawInRect:flippedRect context:context];
-				}
-			}
-			else
+			if (!oneRun.attachment)
 			{
 				NSArray *shadows = [oneRun.attributes objectForKey:DTShadowsAttribute];