Merge branch 'release-1.6.26'

.travis.yml

@@ -1,17 +1,7 @@
 language: objective-c
-osx_image: xcode7
-
-before_install:
-  - curl -sL https://gist.github.com/henrikhodne/7ac6d02ff9a24a94720c/raw/install_appledoc.sh | sh
-
-install: 
- - sudo easy_install cpp-coveralls
+osx_image: xcode12
 
 script:
- - xctool -project DTCoreText.xcodeproj -scheme DemoApp build -sdk iphonesimulator -arch i386 ONLY_ACTIVE_ARCH=NO
- - xctool -project DTCoreText.xcodeproj -scheme "DTCoreText (iOS)" test -sdk iphonesimulator
- - xctool -project DTCoreText.xcodeproj -scheme "DTCoreText (Mac)" build
- - appledoc -o /tmp .
-
-after_success:
-  - ./coveralls.rb --extension m --exclude-folder Demo --exclude-folder Test --exclude-folder Externals
+ - xcodebuild -project DTCoreText.xcodeproj -scheme DemoApp build -sdk iphonesimulator -arch i386 ONLY_ACTIVE_ARCH=NO | xcpretty -s
+ - xcodebuild -project DTCoreText.xcodeproj -scheme "DTCoreText (iOS)" build test -sdk iphonesimulator | xcpretty -s
+ - xcodebuild -project DTCoreText.xcodeproj -scheme "DTCoreText (Mac)" build | xcpretty -s

Core/Source/DTAccessibilityElement.m

@@ -10,10 +10,12 @@
 
 #if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
+#import <DTFoundation/DTWeakSupport.h>
+
 static const CGPoint DTAccessibilityElementNullActivationPoint = {CGFLOAT_MAX, CGFLOAT_MAX};
 
 @interface DTAccessibilityElement()
-@property (nonatomic, unsafe_unretained) UIView *parentView;
+@property (nonatomic, DT_WEAK_PROPERTY) UIView *parentView;
 @end
 
 @implementation DTAccessibilityElement

Core/Source/DTAccessibilityViewProxy.h

@@ -12,6 +12,7 @@
 #if TARGET_OS_IPHONE && !TARGET_OS_WATCH
 
 #import "DTTextAttachment.h"
+#import <DTFoundation/DTWeakSupport.h>
 
 @protocol DTAccessibilityViewProxyDelegate;
 
@@ -23,7 +24,7 @@
 /**
  The delegate for the proxy
  */
-@property (nonatomic, unsafe_unretained, readonly) id<DTAccessibilityViewProxyDelegate> delegate;
+@property (nonatomic, DT_WEAK_PROPERTY, readonly) id<DTAccessibilityViewProxyDelegate> delegate;
 
 /**
  The text attachment represented by the proxy

Core/Source/DTAttributedTextView.m

@@ -57,12 +57,12 @@ - (void)dealloc
 
 - (void)layoutSubviews
 {
-	(void)[self attributedTextContentView];
+	[super layoutSubviews];
+
+	self.attributedTextContentView.edgeInsets = self.contentInset;
 
 	// layout custom subviews for visible area
 	[_attributedTextContentView layoutSubviewsInRect:self.bounds];
-
-  [super layoutSubviews];
 }
 
 - (void)awakeFromNib
@@ -71,6 +71,11 @@ - (void)awakeFromNib
 	[self _setup];
 }
 
+- (void)safeAreaInsetsDidChange
+{
+	[super safeAreaInsetsDidChange];
+}
+
 // default
 - (void)_setup
 {
@@ -287,14 +292,14 @@ - (void)setBackgroundColor:(DTColor *)newColor
 
 - (void)setContentInset:(UIEdgeInsets)contentInset
 {
-	if (!UIEdgeInsetsEqualToEdgeInsets(self.contentInset, contentInset))
+	[super setContentInset:contentInset];
+
+	// height does not matter, that will be determined anyhow
+	CGRect contentFrame = CGRectMake(0, 0, self.frame.size.width - self.contentInset.left - self.contentInset.right, _attributedTextContentView.frame.size.height);
+
+	if (CGRectEqualToRect(contentFrame, self.attributedTextContentView.frame))
 	{
-		[super setContentInset:contentInset];
-
-		// height does not matter, that will be determined anyhow
-		CGRect contentFrame = CGRectMake(0, 0, self.frame.size.width - self.contentInset.left - self.contentInset.right, _attributedTextContentView.frame.size.height);
-
-		_attributedTextContentView.frame = contentFrame;
+		self.attributedTextContentView.frame = contentFrame;
 	}
 }
 

Core/Source/DTCoreTextFontDescriptor.m

@@ -655,8 +655,39 @@ - (CTFontRef)_findOrMakeMatchingFont
 			CFRelease(searchingFontDescriptor);
 			searchingFontDescriptor = CTFontDescriptorCreateWithAttributes((__bridge CFDictionaryRef)mutableAttributes);
 
-			// do the relaxed search
-			matchingFontDescriptor = CTFontDescriptorCreateMatchingFontDescriptor(searchingFontDescriptor, NULL);
+            if (matchingFontDescriptors)
+            {
+                CFRelease(matchingFontDescriptors);
+            }
+
+            matchingFontDescriptors = CTFontDescriptorCreateMatchingFontDescriptors(searchingFontDescriptor, NULL);
+            if (matchingFontDescriptors) {
+                CFIndex count = CFArrayGetCount(matchingFontDescriptors);
+                if (count == 1) {
+                    matchingFontDescriptor = CTFontDescriptorCreateMatchingFontDescriptor(searchingFontDescriptor, (__bridge CFSetRef)mandatoryAttributes);
+                } else {
+                    CFIndex i = 0;
+                    for (i=0; i<count; i++) {
+                        CTFontDescriptorRef currentFontDescriptor = CFArrayGetValueAtIndex(matchingFontDescriptors, i);
+                        CFDictionaryRef traits = CTFontDescriptorCopyAttribute(currentFontDescriptor, kCTFontTraitsAttribute);
+                        NSDictionary *traitsDictionary = CFBridgingRelease(traits);
+
+                        BOOL hasSlantValue = [traitsDictionary[@"NSCTFontSlantTrait"] boolValue];
+                        BOOL hasBoldValue = [traitsDictionary[@"NSCTFontWeightTrait"] boolValue];
+
+                        BOOL hasMatchingBoldTrait = hasBoldValue == self.boldTrait;
+                        BOOL hasMatchingItalicTrait = hasSlantValue == self.italicTrait;
+
+                        if (hasMatchingBoldTrait && hasMatchingItalicTrait) {
+                            matchingFontDescriptor = currentFontDescriptor;
+                            CFRetain(matchingFontDescriptor);
+
+                            // take first one that fits
+                            break;
+                        }
+                    }
+                }
+            }
 		}
 	}
 

Core/Source/DTCoreTextGlyphRun.m

@@ -14,7 +14,7 @@
 #import "DTCoreTextParagraphStyle.h"
 #import "DTCoreTextFunctions.h"
 #import "NSDictionary+DTCoreText.h"
-#import "DTWeakSupport.h"
+#import <DTFoundation/DTWeakSupport.h>
 
 #import <DTFoundation/DTLog.h>
 

Core/Source/DTCoreTextParagraphStyle.m

@@ -9,7 +9,7 @@
 #import "DTCoreTextParagraphStyle.h"
 #import "DTTextBlock.h"
 #import "DTCSSListStyle.h"
-#import "DTWeakSupport.h"
+#import <DTFoundation/DTWeakSupport.h>
 #import "DTCoreTextFunctions.h"
 
 @implementation DTCoreTextParagraphStyle

Core/Source/DTHTMLElement.m

@@ -760,15 +760,15 @@ - (void)applyStyleDictionary:(NSDictionary *)styles
 	{
 		if ([directionStr isEqualToString:@"rtl"])
 		{
-			_paragraphStyle.baseWritingDirection = NSWritingDirectionRightToLeft;
+			_paragraphStyle.baseWritingDirection = kCTWritingDirectionRightToLeft;
 		}
 		else if ([directionStr isEqualToString:@"ltr"])
 		{
-			_paragraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+			_paragraphStyle.baseWritingDirection =  kCTWritingDirectionLeftToRight;
 		}
 		else if ([directionStr isEqualToString:@"auto"])
 		{
-			_paragraphStyle.baseWritingDirection = NSWritingDirectionNatural; // that's also default
+			_paragraphStyle.baseWritingDirection = kCTWritingDirectionNatural; // that's also default
 		}
 		else
 		{

Core/Source/DTHTMLParserNode.m

@@ -8,7 +8,7 @@
 
 #import "DTHTMLParserNode.h"
 #import "DTHTMLParserTextNode.h"
-#import "DTWeakSupport.h"
+#import <DTFoundation/DTWeakSupport.h>
 
 @implementation DTHTMLParserNode
 {

Core/Source/DTWeakSupport.h

@@ -30,4 +30,4 @@
 	#define DT_WEAK_VARIABLE
 	#define DT_WEAK_PROPERTY assign
 
-#endif
+#endif

DTCoreText.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTCoreText'
-  spec.version      = '1.6.25'
+  spec.version      = '1.6.26'
   spec.platforms    = {:ios => '4.3', :tvos => '9.0' }
   spec.license      = 'BSD'
   spec.source       = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => spec.version.to_s }