Merge branch 'release-1.6.10'

Cocoanetics · Jul 7, 2015 · 8ea347a · 8ea347a
2 parents 3015e13 + 4c29f1a
commit 8ea347a
Show file tree

Hide file tree

Showing 51 changed files with 638 additions and 473 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "Core/Externals/DTLoupe"]
 	path = Core/Externals/DTLoupe
-	url = [email protected].com:parts/dtloupe.git
+	url = https://github.com/Cocoanetics/DTLoupe.git
 [submodule "Core/Externals/DTCoreText"]
 	path = Core/Externals/DTCoreText
 	url = https://github.com/Cocoanetics/DTCoreText.git

diff --git a/Core/DTRichTextEditor-Prefix.pch b/Core/DTRichTextEditor-Prefix.pch
@@ -5,5 +5,4 @@
 #ifdef __OBJC__
 	#import <Foundation/Foundation.h>
 	#import <UIKit/UIKit.h>
-	#import "DTCoreText.h"
 #endif
diff --git a/Core/DTRichTextEditor.h b/Core/DTRichTextEditor.h
@@ -1,13 +1,10 @@
 // everything is based on this
-#import "DTCoreText.h"
-
 #import "DTRichTextEditorConstants.h"
 
 // utility categories
 #import "NSAttributedString+DTRichText.h"
 #import "NSMutableAttributedString+DTRichText.h"
 #import "NSMutableDictionary+DTRichText.h"
-#import "UIPasteboard+DTWebArchive.h"
 
 // specialized RTE subclasses
 #import "DTTextRange.h"
@@ -27,7 +24,6 @@
 #import "DTRichTextEditorView+Styles.h"
 
 #import "DTTextSelectionView.h"
-#import "DTDictationPlaceholderView.h"
 
 #import "DTUndoManager.h"
 

diff --git a/Core/Externals/DTCoreText b/Core/Externals/DTCoreText
diff --git a/Core/Externals/DTLoupe b/Core/Externals/DTLoupe
diff --git a/Core/Externals/DTWebArchive b/Core/Externals/DTWebArchive
diff --git a/Core/Source/DTCoreTextLayoutFrame+DTRichText.h b/Core/Source/DTCoreTextLayoutFrame+DTRichText.h
@@ -6,7 +6,7 @@
 //  Copyright 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTCoreTextLayoutFrame.h"
+#import <DTCoreText/DTCoreTextLayoutFrame.h>
 
 @class DTTextPosition, DTTextRange;
 

diff --git a/Core/Source/DTCoreTextLayoutFrame+DTRichText.m b/Core/Source/DTCoreTextLayoutFrame+DTRichText.m
@@ -6,12 +6,10 @@
 //  Copyright 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTCoreTextLayoutFrame+DTRichText.h"
-#import "DTCoreTextLayoutFrame+Cursor.h"
+#import <DTCoreText/DTCoreText.h>
 
 #import "DTTextPosition.h"
 #import "DTTextRange.h"
-#import "DTCoreTextLayoutLine.h"
 #import "DTTextSelectionRect.h"
 
 @implementation DTCoreTextLayoutFrame (DTRichText)
@@ -35,8 +33,8 @@ - (NSArray *)selectionRectsForRange:(NSRange)range
     NSInteger fromIndex = range.location;
     NSInteger toIndex = range.location + range.length;
 
-    CGFloat fromCaretOffset;
-    CGFloat toCaretOffset;
+    CGFloat fromCaretOffset = 0.0;
+    CGFloat toCaretOffset = 0.0;
 
     BOOL haveStart = NO;
     BOOL haveEnd = NO;

diff --git a/Core/Source/DTHTMLWriter+DTWebArchive.h b/Core/Source/DTHTMLWriter+DTWebArchive.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Cocoanetics. All rights reserved.
 //
 
-#import "DTHTMLWriter.h"
+#import <DTCoreText/DTHTMLWriter.h>
 
 @class DTWebArchive;
 

diff --git a/Core/Source/DTHTMLWriter+DTWebArchive.m b/Core/Source/DTHTMLWriter+DTWebArchive.m
@@ -8,10 +8,10 @@
 
 #import "DTHTMLWriter+DTWebArchive.h"
 
-#import "DTWebArchive.h"
-#import "DTWebResource.h"
+#import <DTWebArchive/DTWebArchive.h>
+#import <DTWebArchive/DTWebResource.h>
 
-#import "DTCoreText.h"
+#import <DTCoreText/DTCoreText.h>
 
 @class DTWebArchive;
 

diff --git a/Core/Source/DTMutableCoreTextLayoutFrame.h b/Core/Source/DTMutableCoreTextLayoutFrame.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTCoreTextLayoutFrame.h"
+#import <DTCoreText/DTCoreTextLayoutFrame.h>
 
 /**
  Mutable subclass of <DTCoreTextLayoutFrame> to allow editing

diff --git a/Core/Source/DTMutableCoreTextLayoutFrame.m b/Core/Source/DTMutableCoreTextLayoutFrame.m
@@ -6,9 +6,10 @@
 //  Copyright (c) 2011 Cocoanetics. All rights reserved.
 //
 
+#import <DTCoreText/DTCoreText.h>
+
 #import "DTMutableCoreTextLayoutFrame.h"
 #import "DTRichTextCategories.h"
-#import "DTCoreText.h"
 #import "DTCoreTextLayoutFrame+DTRichText.h"
 
 @implementation DTMutableCoreTextLayoutFrame

diff --git a/Core/Source/DTRichTextCategories.h b/Core/Source/DTRichTextCategories.h
@@ -6,8 +6,8 @@
 //  Copyright (c) 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTCoreTextGlyphRun.h"
-#import "DTCoreTextLayoutLine.h"
+#import <DTCoreText/DTCoreTextGlyphRun.h>
+#import <DTCoreText/DTCoreTextLayoutLine.h>
 
 /**
  Editor-related extensions to <DTCoreTextGlyphRun>

diff --git a/Core/Source/DTRichTextEditorConstants.h b/Core/Source/DTRichTextEditorConstants.h
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 Cocoanetics. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 
 // for savekeeping paragraph spacing while this paragraph is in a list so that it can be restored if the paragraph is taken out of the list
 extern NSString * const DTParagraphSpacingOverriddenByListAttribute;

diff --git a/Core/Source/DTRichTextEditorContentView.h b/Core/Source/DTRichTextEditorContentView.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTAttributedTextContentView.h"
+#import <DTCoreText/DTAttributedTextContentView.h>
 
 /**
  This class represents the content view of a DTRichTextEditorView which itself is a UIScrollView subclass.

diff --git a/Core/Source/DTRichTextEditorContentView.m b/Core/Source/DTRichTextEditorContentView.m
@@ -8,8 +8,9 @@
 
 #import "DTRichTextEditorContentView.h"
 #import "DTMutableCoreTextLayoutFrame.h"
-#import "DTCoreTextLayoutFrame.h"
-#import "DTTiledLayerWithoutFade.h"
+
+#import <DTCoreText/DTCoreTextLayoutFrame.h>
+#import <DTFoundation/DTTiledLayerWithoutFade.h>
 
 
 @implementation DTRichTextEditorContentView

diff --git a/Core/Source/DTRichTextEditorView+Attributes.m b/Core/Source/DTRichTextEditorView+Attributes.m
@@ -7,8 +7,8 @@
 //
 
 #import "DTRichTextEditorView+Attributes.h"
-#import "NSAttributedString+HTML.h"
-#import "NSMutableAttributedString+HTML.h"
+#import <DTCoreText/NSAttributedString+HTML.h>
+#import <DTCoreText/NSMutableAttributedString+HTML.h>
 
 #import "DTTextPosition.h"
 #import "DTTextRange.h"

diff --git a/Core/Source/DTRichTextEditorView+DTCoreText.m b/Core/Source/DTRichTextEditorView+DTCoreText.m
@@ -7,6 +7,7 @@
 //
 
 #import "DTRichTextEditorView+DTCoreText.h"
+#import <DTCoreText/DTCoreText.h>
 
 @implementation DTRichTextEditorView (DTCoreText)
 

diff --git a/Core/Source/DTRichTextEditorView+Dictation.h b/Core/Source/DTRichTextEditorView+Dictation.h
@@ -6,6 +6,10 @@
 //  Copyright (c) 2013 Cocoanetics. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
+
+@class DTDictationPlaceholderTextAttachment;
+
 #import "DTRichTextEditorView.h"
 
 /**

diff --git a/Core/Source/DTRichTextEditorView+Dictation.m b/Core/Source/DTRichTextEditorView+Dictation.m
@@ -7,7 +7,7 @@
 //
 
 #import "DTRichTextEditor.h"
-#import "DTDictationPlaceholderView.h"
+#import <DTCoreText/DTCoreText.h>
 
 @interface DTRichTextEditorView (private)
 

diff --git a/Core/Source/DTRichTextEditorView+Lists.m b/Core/Source/DTRichTextEditorView+Lists.m
@@ -8,7 +8,8 @@
 
 #import "DTRichTextEditor.h"
 #import "NSAttributedString+DTRichText.h"
-#import "NSAttributedString+DTDebug.h"
+
+#import <DTCoreText/DTCoreText.h>
 
 @interface DTRichTextEditorView (private)
 

diff --git a/Core/Source/DTRichTextEditorView+Manipulation.h b/Core/Source/DTRichTextEditorView+Manipulation.h
@@ -6,6 +6,9 @@
 //  Copyright (c) 2012 Cocoanetics. All rights reserved.
 //
 
+#import <UIKit/UIKit.h>
+#import <DTCoreText/DTCoreTextGlyphRun.h>
+
 #import "DTRichTextEditorView.h"
 
 /**

diff --git a/Core/Source/DTRichTextEditorView+Manipulation.m b/Core/Source/DTRichTextEditorView+Manipulation.m
@@ -7,9 +7,11 @@
 //
 
 #import "DTRichTextEditor.h"
-#import "DTHTMLWriter.h"
 #import "DTUndoManager.h"
 
+#import <DTCoreText/DTCoreText.h>
+#import <DTWebArchive/UIPasteboard+DTWebArchive.h>
+
 @interface DTRichTextEditorView (private)
 
 - (void)updateCursorAnimated:(BOOL)animated;

diff --git a/Core/Source/DTRichTextEditorView+Ranges.m b/Core/Source/DTRichTextEditorView+Ranges.m
@@ -8,6 +8,9 @@
 
 #import "DTRichTextEditorView+Ranges.h"
 
+#import <DTCoreText/DTAttributedTextContentView.h>
+#import <DTCoreText/NSString+Paragraphs.h>
+
 @implementation DTRichTextEditorView (Ranges)
 
 #pragma mark - Working with Ranges

diff --git a/Core/Source/DTRichTextEditorView+Styles.h b/Core/Source/DTRichTextEditorView+Styles.h
@@ -6,7 +6,10 @@
 //  Copyright (c) 2013 Cocoanetics. All rights reserved.
 //
 
-#import "DTRichTextEditor.h"
+#import "DTRichTextEditorView.h"
+#import <DTCoreText/DTCoreTextFontDescriptor.h>
+#import <DTCoreText/DTCoreTextParagraphStyle.h>
+#import <DTCoreText/DTCSSListStyle.h>
 
 /**
  The **Ranges** category enhances DTRichTextEditorView with methods for retrieving CSS-like style information.

diff --git a/Core/Source/DTRichTextEditorView+Styles.m b/Core/Source/DTRichTextEditorView+Styles.m
@@ -8,6 +8,8 @@
 
 #import "DTRichTextEditorView+Styles.h"
 
+#import <DTCoreText/NSAttributedString+HTML.h>
+#import <DTCoreText/NSDictionary+DTCoreText.h>
 
 @implementation DTRichTextEditorView (Styles)
 

diff --git a/Core/Source/DTRichTextEditorView.h b/Core/Source/DTRichTextEditorView.h
@@ -6,7 +6,7 @@
 //  Copyright 2011 Cocoanetics. All rights reserved.
 //
 
-#import "DTAttributedTextView.h"
+#import <DTCoreText/DTAttributedTextView.h>
 
 /**
  Notifies observers that an editing session began in an editor view. The affected view is stored in the object parameter of the notification. The userInfo dictionary is not used.

diff --git a/Core/Source/DTRichTextEditorView.m b/Core/Source/DTRichTextEditorView.m
@@ -8,40 +8,49 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#import "DTLoupeView.h"
+#import <DTLoupe/DTLoupeView.h>
+#import <DTCoreText/DTCoreText.h>
+#import <DTFoundation/DTCoreGraphicsUtils.h>
+#import <DTFoundation/DTTiledLayerWithoutFade.h>
+#import <DTFoundation/DTWeakSupport.h>
 
 #import "DTRichTextEditor.h"
 
 #import "DTCoreTextLayoutFrame+DTRichText.h"
 #import "DTMutableCoreTextLayoutFrame.h"
-#import "NSMutableAttributedString+HTML.h"
 #import "NSMutableAttributedString+DTRichText.h"
 #import "DTMutableCoreTextLayoutFrame.h"
 #import "NSMutableDictionary+DTRichText.h"
 #import "DTRichTextEditorView.h"
 #import "DTRichTextEditorView+Manipulation.h"
-#import "DTDictationPlaceholderView.h"
 
 #import "DTCursorView.h"
-#import "DTLoupeView.h"
-#import "DTCoreTextLayouter.h"
-
-#import "DTCoreGraphicsUtils.h"
-#import "DTCoreTextFontDescriptor.h"
-#import "DTTiledLayerWithoutFade.h"
 
 #import "DTWebArchive.h"
 #import "NSAttributedString+DTWebArchive.h"
 #import "NSAttributedString+DTRichText.h"
-#import "NSAttributedStringRunDelegates.h"
 #import "UIPasteboard+DTWebArchive.h"
 #import "DTRichTextEditorContentView.h"
 #import "DTRichTextEditorView+Manipulation.h"
 #import "DTUndoManager.h"
-#import "DTHTMLWriter.h"
 #import "DTHTMLWriter+DTWebArchive.h"
 
 
+// defines for renamed attribute names, deprecated in iOS SDK 8
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
+	#define DTTextInputTextColorKey NSForegroundColorAttributeName
+	#define DTTextInputTextFontKey NSFontAttributeName
+	#define DTTextInputTextBackgroundColorKey NSBackgroundColorAttributeName
+#else
+	#define DTTextInputTextColorKey UITextInputTextColorKey
+	#define DTTextInputTextFontKey UITextInputTextFontKey
+	#define DTTextInputTextBackgroundColorKey UITextInputTextBackgroundColorKey
+#endif
+
+
+// string constants
+
 NSString * const DTRichTextEditorTextDidBeginEditingNotification = @"DTRichTextEditorTextDidBeginEditingNotification";
 NSString * const DTRichTextEditorTextDidChangeNotification = @"DTRichTextEditorTextDidChangeNotification";
 NSString * const DTRichTextEditorTextDidEndEditingNotification = @"DTRichTextEditorTextDidEndEditingNotification";
@@ -103,7 +112,6 @@ @implementation DTRichTextEditorView
 
 	// private stuff
 	id<UITextInputTokenizer> tokenizer;
-	__unsafe_unretained id<UITextInputDelegate> inputDelegate;
 	DTTextRange *_selectedTextRange;
 	DTTextRange *_markedTextRange;
 	NSDictionary *_markedTextStyle;
@@ -304,7 +312,7 @@ - (void)setDefaults
 	[center addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
 
 	// style for displaying marked text
-	self.markedTextStyle = [NSDictionary dictionaryWithObjectsAndKeys:[UIColor greenColor], UITextInputTextColorKey, nil];
+	self.markedTextStyle = [NSDictionary dictionaryWithObjectsAndKeys:[UIColor greenColor], DTTextInputTextColorKey, nil];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -2320,7 +2328,7 @@ - (void)replaceRange:(DTTextRange *)range withText:(id)text
 			if ([text isEqualToString:@"\n"])
 			{
 				// remove underline decoration from newline
-				[attributes removeObjectForKey:NSUnderlineStyleAttributeName];
+				[attributes removeUnderlineStyle];
 
 				// remove strike-through decoration from newline
 				[attributes removeObjectForKey:DTStrikeOutAttribute];
@@ -2921,18 +2929,18 @@ - (NSDictionary *)textStylingAtPosition:(DTTextPosition *)position inDirection:(
 		CFStringRef fontName = CTFontCopyPostScriptName(ctFont);
 		UIFont *uif = [UIFont fontWithName:(__bridge id)fontName size:CTFontGetSize(ctFont)];
 		CFRelease(fontName);
-		[uiStyles setObject:uif forKey:UITextInputTextFontKey];
+		[uiStyles setObject:uif forKey:DTTextInputTextFontKey];
 	}
 
 	CGColorRef cgColor = (__bridge CGColorRef)[ctStyles objectForKey:(id)kCTForegroundColorAttributeName];
 	if (cgColor)
 	{
-		[uiStyles setObject:[UIColor colorWithCGColor:cgColor] forKey:UITextInputTextColorKey];
+		[uiStyles setObject:[UIColor colorWithCGColor:cgColor] forKey:DTTextInputTextColorKey];
 	}
 
 	if (self.backgroundColor)
 	{
-		[uiStyles setObject:self.backgroundColor forKey:UITextInputTextBackgroundColorKey];
+		[uiStyles setObject:self.backgroundColor forKey:DTTextInputTextBackgroundColorKey];
 	}
 
 	return uiStyles;

diff --git a/Core/Source/DTTextPosition.h b/Core/Source/DTTextPosition.h
@@ -6,6 +6,8 @@
 //  Copyright 2011 Cocoanetics. All rights reserved.
 //
 
+#import <UIKit/UIKIt.h>
+
 /**
  Class to represent a text position in DTRichTextEditorView
  */