Merge branch 'release-1.6.16'

Quanhua-Guan · Jul 4, 2015 · 5ed2b4b · 5ed2b4b
2 parents 7e53685 + 3f60e50
commit 5ed2b4b
Show file tree

Hide file tree

Showing 23 changed files with 150 additions and 55 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,13 @@
 ---
 language: objective-c
 
-before_install: 
- - brew update
- - brew upgrade xctool
-
 install: 
  - sudo easy_install cpp-coveralls
 
 script:
- - xctool -project DTCoreText.xcodeproj -scheme DemoApp build test -sdk iphonesimulator -arch i386 ONLY_ACTIVE_ARCH=NO
- - xctool -project DTCoreText.xcodeproj -scheme "Mac Framework" test -arch x86_64 ONLY_ACTIVE_ARCH=NO
+ - 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 test
  - appledoc -o /tmp .
 
 after_success:

diff --git a/Core/Source/DTAnchorHTMLElement.m b/Core/Source/DTAnchorHTMLElement.m
@@ -6,8 +6,8 @@
 //  Copyright (c) 2013 Drobnik.com. All rights reserved.
 //
 
-#import "DTAnchorHTMLElement.h"
 #import "DTCompatibility.h"
+#import "DTAnchorHTMLElement.h"
 #import "DTColorFunctions.h"
 
 @implementation DTAnchorHTMLElement

diff --git a/Core/Source/DTCompatibility.h b/Core/Source/DTCompatibility.h
@@ -10,12 +10,10 @@
 
 #if TARGET_OS_IPHONE
 
-#import <UIKit/UIKit.h>
-
 	// Compatibility Aliases
-	@compatibility_alias DTColor	UIColor;
-	@compatibility_alias DTImage	UIImage;
-	@compatibility_alias DTFont		UIFont;
+	#define DTColor UIColor
+	#define DTImage UIImage
+	#define DTFont UIFont
 
 	// Edge Insets
 	#define DTEdgeInsets UIEdgeInsets
@@ -86,9 +84,9 @@
 #if !TARGET_OS_IPHONE
 
 	// Compatibility Aliases
-	@compatibility_alias DTColor	NSColor;
-	@compatibility_alias DTImage	NSImage;
-	@compatibility_alias DTFont		NSFont;
+	#define DTColor NSColor
+	#define DTImage NSImage
+	#define DTFont NSFont
 
 	// Edge Insets
 	#define DTEdgeInsets NSEdgeInsets

diff --git a/Core/Source/DTCoreTextFontDescriptor.m b/Core/Source/DTCoreTextFontDescriptor.m
@@ -6,9 +6,9 @@
 //  Copyright 2011 Drobnik.com. All rights reserved.
 //
 
+#import "DTCompatibility.h"
 #import "DTCoreTextFontDescriptor.h"
 #import "DTCoreTextFontCollection.h"
-#import "DTCompatibility.h"
 #import "DTCoreTextConstants.h"
 
 static NSCache *_fontCache = nil;

diff --git a/Core/Source/DTHTMLElement.h b/Core/Source/DTHTMLElement.h
@@ -11,10 +11,10 @@
 @class DTTextAttachment;
 @class DTCSSListStyle;
 
+#import "DTCompatibility.h"
 #import "DTCoreTextConstants.h"
 #import "DTHTMLParserNode.h"
 #import "DTTextAttachment.h"
-#import "DTCompatibility.h"
 
 @class DTBreakHTMLElement;
 

diff --git a/Core/Source/DTTextAttachment.m b/Core/Source/DTTextAttachment.m
@@ -185,7 +185,7 @@ + (void)registerClass:(Class)class forTagName:(NSString *)tagName
 
 	if (previousClass)
 	{
-		DTLogWarning(@"Replacing previously registered class '%@' for tag name '%@' with '%@'", NSStringFromClass(previousClass), tagName, NSStringFromClass(class));
+		DTLogDebug(@"Replacing previously registered class '%@' for tag name '%@' with '%@'", NSStringFromClass(previousClass), tagName, NSStringFromClass(class));
 	}
 
 	[_classForTagNameLookup setObject:class forKey:tagName];

diff --git a/Core/Source/DTTextHTMLElement.m b/Core/Source/DTTextHTMLElement.m
@@ -11,7 +11,7 @@
 #import "DTCoreTextFontDescriptor.h"
 #import "NSAttributedString+SmallCaps.h"
 
-#if DTCORETEXT_SUPPORT_NS_ATTRIBUTES && TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
 #import "UIFont+DTCoreText.h"
 #endif
 

diff --git a/Core/Source/NSAttributedString+DTCoreText.m b/Core/Source/NSAttributedString+DTCoreText.m
@@ -19,7 +19,7 @@
 #import "NSDictionary+DTCoreText.h"
 #import "NSAttributedStringRunDelegates.h"
 
-#if DTCORETEXT_SUPPORT_NS_ATTRIBUTES && __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_5_1
+#if TARGET_OS_IPHONE
 #import "UIFont+DTCoreText.h"
 #endif
 

diff --git a/Core/Source/NSCoder+DTCompatibility.h b/Core/Source/NSCoder+DTCompatibility.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Drobnik.com. All rights reserved.
 //
 
-#import "DTCompatibility.h"
+#import <DTCoreText/DTCoreText.h>
 
 @interface NSCoder (DTCompatibility)
 

diff --git a/Core/Source/NSMutableAttributedString+HTML.m b/Core/Source/NSMutableAttributedString+HTML.m
@@ -6,9 +6,17 @@
 //  Copyright 2011 Drobnik.com. All rights reserved.
 //
 
+#import "DTCompatibility.h"
+
 #import "NSMutableAttributedString+HTML.h"
 #import "DTCoreTextFontDescriptor.h"
 #import "DTCoreTextParagraphStyle.h"
+#import "NSDictionary+DTCoreText.h"
+
+#if TARGET_OS_IPHONE
+#import "UIFont+DTCoreText.h"
+#endif
+
 
 @implementation NSMutableAttributedString (HTML)
 
@@ -135,6 +143,7 @@ - (void)appendEndOfParagraph
 		{
 			[appendAttributes setObject:paragraphStyle forKey:NSParagraphStyleAttributeName];
 		}
+
 	}
 	else
 #endif

diff --git a/Core/Source/UIFont+DTCoreText.h b/Core/Source/UIFont+DTCoreText.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2012 Drobnik.com. All rights reserved.
 //
 
+#import <CoreText/CoreText.h>
+
 /**
  Methods to translate from `CTFont` to `UIFont`
  */

diff --git a/DTCoreText.xcodeproj/project.pbxproj b/DTCoreText.xcodeproj/project.pbxproj
@@ -353,7 +353,6 @@
 		A7949AA314CC5BDF00A8CCDE /* DTHTMLAttributedStringBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A7949A4614CAF58C00A8CCDE /* DTHTMLAttributedStringBuilder.m */; };
 		A7985E0D178ECD86005D40B2 /* DTHTMLWriterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A7985E0B178ECD86005D40B2 /* DTHTMLWriterTest.m */; };
 		A7985E1B178ECDE4005D40B2 /* NSAttributedString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C93B14863E8700E1AFD9 /* NSAttributedString+HTML.m */; };
-		A79BA6381B46A1FB0086C2F6 /* DTCoreText.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79BA6201B46A1FB0086C2F6 /* DTCoreText.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A79BA65B1B46A2290086C2F6 /* DTCoreText.h in Headers */ = {isa = PBXBuildFile; fileRef = A70B4C9E1486558200873A4A /* DTCoreText.h */; };
 		A79BA65C1B46A2300086C2F6 /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A672B91532F2D100920A18 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A79BA65D1B46A2300086C2F6 /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A672B91532F2D100920A18 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1061,20 +1060,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		A79BA6591B46A1FB0086C2F6 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				A79BA6381B46A1FB0086C2F6 /* DTCoreText.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		1D6058910D05DD3D006BFB54 /* RTDemoApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RTDemoApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2323,7 +2308,6 @@
 				1D60588D0D05DD3D006BFB54 /* Resources */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
-				A79BA6591B46A1FB0086C2F6 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

diff --git a/...areddata/xcschemes/Mac Framework.xcscheme → ...ddata/xcschemes/DTCoreText (Mac).xcscheme b/...areddata/xcschemes/Mac Framework.xcscheme → ...ddata/xcschemes/DTCoreText (Mac).xcscheme
@@ -26,7 +26,7 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Coverage">
+      buildConfiguration = "Debug">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,6 +39,15 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2262DC51638331500BFDAD7"
+            BuildableName = "DTCoreText.framework"
+            BlueprintName = "DTCoreText (Mac)"
+            ReferencedContainer = "container:DTCoreText.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -67,6 +76,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2262DC51638331500BFDAD7"
+            BuildableName = "DTCoreText.framework"
+            BlueprintName = "DTCoreText (Mac)"
+            ReferencedContainer = "container:DTCoreText.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/DTCoreText (iOS).xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/DTCoreText (iOS).xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0640"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A79BA61F1B46A1FB0086C2F6"
+               BuildableName = "DTCoreText.framework"
+               BlueprintName = "DTCoreText (iOS)"
+               ReferencedContainer = "container:DTCoreText.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A788CA671486456100E1AFD9"
+               BuildableName = "UnitTest.xctest"
+               BlueprintName = "UnitTest"
+               ReferencedContainer = "container:DTCoreText.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A79BA61F1B46A1FB0086C2F6"
+            BuildableName = "DTCoreText.framework"
+            BlueprintName = "DTCoreText (iOS)"
+            ReferencedContainer = "container:DTCoreText.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A79BA61F1B46A1FB0086C2F6"
+            BuildableName = "DTCoreText.framework"
+            BlueprintName = "DTCoreText (iOS)"
+            ReferencedContainer = "container:DTCoreText.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A79BA61F1B46A1FB0086C2F6"
+            BuildableName = "DTCoreText.framework"
+            BlueprintName = "DTCoreText (iOS)"
+            ReferencedContainer = "container:DTCoreText.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme
@@ -57,16 +57,6 @@
                </Test>
             </SkippedTests>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A79BA6291B46A1FB0086C2F6"
-               BuildableName = "DTCoreTextTests.xctest"
-               BlueprintName = "DTCoreTextTests"
-               ReferencedContainer = "container:DTCoreText.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

diff --git a/Externals/DTFoundation b/Externals/DTFoundation
diff --git a/Test/MacUnitTest-Prefix.pch b/Test/MacUnitTest-Prefix.pch
@@ -7,7 +7,6 @@
 	#import <Foundation/Foundation.h>
 	#import <AppKit/AppKit.h>
 	#import <XCTest/XCTest.h>
-	#import "DTCoreText.h"
 #endif
 
 #define CGSizeValue sizeValue

diff --git a/Test/Source/DTCoreTextFontDescriptorTest.m b/Test/Source/DTCoreTextFontDescriptorTest.m
@@ -6,8 +6,8 @@
 //  Copyright (c) 2013 Drobnik.com. All rights reserved.
 //
 
+#import <DTCoreText/DTCoreText.h>
 #import "DTCoreTextTestCase.h"
-#import "DTCoreTextFontDescriptor.h"
 
 @interface DTCoreTextFontDescriptorTest : DTCoreTextTestCase
 {

diff --git a/Test/Source/DTCoreTextParagraphStyleTest.m b/Test/Source/DTCoreTextParagraphStyleTest.m
@@ -6,10 +6,10 @@
 //  Copyright (c) 2013 Drobnik.com. All rights reserved.
 //
 
+#import "DTCompatibility.h"
 #import "DTCoreTextParagraphStyleTest.h"
 #import "DTCoreTextParagraphStyle.h"
 
-#import "DTCompatibility.h"
 
 @interface DTCoreTextParagraphStyle ()
 

diff --git a/Test/Source/DTHTMLElementTest.m b/Test/Source/DTHTMLElementTest.m
@@ -7,6 +7,7 @@
 //
 
 #import "DTHTMLElementTest.h"
+#import <DTCoreText/DTCoreText.h>
 
 @implementation DTHTMLElementTest
 

diff --git a/Test/Source/MacUnitTest.m b/Test/Source/MacUnitTest.m
@@ -9,6 +9,7 @@
 #import "MacUnitTest.h"
 #import "DTHTMLAttributedStringBuilder.h"
 #import "NSObject+DTRuntime.h"
+#import "NSString+HTML.h"
 
 #define TESTCASE_FILE_EXTENSION @"html"
 //#define ONLY_TEST_CURRENT 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     //  Copyright (c) 2012 Drobnik.com. All rights reserved.
     //
+    #import <CoreText/CoreText.h>
     /**
      Methods to translate from `CTFont` to `UIFont`
      */
@@ Expand Down @@
+2 −5		.travis.yml
+24 −16		DTFoundation.xcodeproj/project.pbxproj
+96 −0		DTFoundation.xcodeproj/xcshareddata/xcschemes/DTFoundation (OSX).xcscheme
+96 −0		DTFoundation.xcodeproj/xcshareddata/xcschemes/DTFoundation (iOS).xcscheme