Merge branch 'release/1.1.0'

Commit:
50568b5664d6b034b752310603b2b664d045ad0f

This commit references a PR adding <plaintext> tests

.gitignore

@@ -40,5 +40,7 @@ Pods/
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 Carthage/Checkouts
+Carthage/Build
 
-Carthage/Build
+# Jazzy
+docs/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "HTMLKitTests/html5lib-tests"]
+[submodule "html5lib-tests"]
 	path = Tests/html5lib-tests
 	url = https://github.com/html5lib/html5lib-tests.git

.jazzy.yaml

@@ -0,0 +1,123 @@
+module: HTMLKit
+module_version: 1.1.0
+author: Iskandar Abudiab 
+author_url: https://twitter.com/iabudiab
+github_url: https://github.com/iabudiab/HTMLKit
+github_file_prefix: https://github.com/iabudiab/HTMLKit/tree/master
+output: docs
+umbrella_header: Sources/include/HTMLKit.h
+clean: true
+objc: true
+skip_undocumented: true
+
+custom_categories:
+  - name: Parsing
+    children:
+    - HTMLParser
+
+  - name: DOM
+    children:
+    - HTMLNamespace
+    - HTMLNode
+    - HTMLNodeType
+    - HTMLElement
+    - HTMLDocument
+    - HTMLDocumentReadyState
+    - HTMLQuirksMode
+    - HTMLDocumentType
+    - HTMLDocumentFragment
+    - HTMLDocumentPosition
+    - HTMLCharacterData
+    - HTMLText
+    - HTMLComment
+    - HTMLTemplate
+    - HTMLDOMTokenList
+    - HTMLRange
+
+  - name: Iteration & Filtering
+    children:
+    - HTMLNodeIterator
+    - HTMLNodeFilter
+    - HTMLNodeFilterShowOptions
+    - HTMLNodeFilterValue
+    - HTMLNodeFilterBlock
+    - HTMLSelectorNodeFilter
+    - HTMLTreeWalker
+
+  - name: Structures
+    children:
+    - HTMLOrderedDictionary
+    - CSSNthExpression
+
+  - name: CSS Selectors Implementation
+    children:
+    - CSSSelector
+    - CSSSelectorParser
+    - CSSTypeSelector
+    - CSSAttributeSelector
+    - CSSNthExpressionParser
+    - CSSNthExpressionSelector
+    - CSSPseudoClassSelector
+    - CSSPseudoFunctionSelector
+    - CSSSelectorBlock
+    - CSSCombinatorSelector
+    - CSSCompoundSelector
+
+  - name: Typed Selectors and Extensions
+    children:
+    - adjacentSiblingSelector
+    - allOf
+    - anyOf
+    - attributeSelector
+    - buttonSelector
+    - checkboxSelector
+    - checkedSelector
+    - childOfElementSelector
+    - classSelector
+    - descendantOfElementSelector
+    - disabledSelector
+    - emptySelector
+    - enabledSelector
+    - eqSelector
+    - evenSlector
+    - fileSelector
+    - firstChildSelector
+    - firstOfTypeSelector
+    - generalSiblingSelector
+    - gtSelector
+    - has
+    - hasAttributeSelector
+    - headerSelector
+    - idSelector
+    - imageSelector
+    - inputSelector
+    - lastChildSelector
+    - lastOfTypeSelector
+    - linkSelector
+    - ltSelector
+    - namedBlockSelector
+    - namedPseudoSelector
+    - not
+    - nthChildSelector
+    - nthLastChildSelector
+    - nthLastOfTypeSelector
+    - nthOfTypeSelector
+    - oddSelector
+    - onlyChildSelector
+    - onlyOfTypeSelector
+    - optionalSelector
+    - parentSelector
+    - passwordSelector
+    - radioSelector
+    - requiredSelector
+    - resetSelector
+    - rootSelector
+    - submitSelector
+    - textSelector
+    - typeSelector
+    - universalSelector
+
+    - name: Categories
+      children:
+      - NSCharacterSet(HTMLKit)
+      - NSString(HTMLKit)

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.2
 
 branches:
   except:
@@ -14,21 +14,24 @@ env:
     - LANG=en_US.UTF-8
     - WORKSPACE=HTMLKit.xcworkspace
     - IOS_FRAMEWORK_SCHEME=HTMLKit-iOS
-    - OSX_FRAMEWORK_SCHEME=HTMLKit-OSX
+    - MACOS_FRAMEWORK_SCHEME=HTMLKit-macOS
     - WATCHOS_FRAMEWORK_SCHEME="HTMLKit-watchOS"
     - TVOS_FRAMEWORK_SCHEME="HTMLKit-tvOS"
-    - IOS_SDK=iphonesimulator9.3
-    - OSX_SDK=macosx10.11
-    - WATCHOS_SDK=watchsimulator2.2
-    - TVOS_SDK=appletvsimulator9.2
+    - IOS_SDK=iphonesimulator10.2
+    - MACOS_SDK=macosx10.12
+    - WATCHOS_SDK=watchsimulator3.1
+    - TVOS_SDK=appletvsimulator10.1
   matrix:
-    - DESTINATION="OS=9.0,name=iPhone 6"            SIMULATOR="iPhone 6 (9.0)"            SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.1,name=iPhone 6 Plus"       SIMULATOR="iPhone 6 Plus (9.1)"       SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.2,name=iPhone 6S"           SIMULATOR="iPhone 6S (9.2)"           SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.3,name=iPhone 6S Plus"      SIMULATOR="iPhone 6S Plus (9.3)"      SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="arch=x86_64"                     SIMULATOR=""                          SCHEME="$OSX_FRAMEWORK_SCHEME"      SDK="$OSX_SDK"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"  SIMULATOR="Apple Watch - 42mm (2.2)"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"      SIMULATOR="Apple TV 1080p (9.2)"      SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
+    - DESTINATION="arch=x86_64"                              SIMULATOR=""                                   SCHEME="$MACOS_FRAMEWORK_SCHEME"    SDK="$MACOS_SDK"
+    - DESTINATION="OS=9.0,name=iPhone 6"                     SIMULATOR="iPhone 6 (9.0)"                     SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.1,name=iPhone 6 Plus"                SIMULATOR="iPhone 6 Plus (9.1)"                SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.2,name=iPhone 6S"                    SIMULATOR="iPhone 6S (9.2)"                    SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.3,name=iPhone 6S Plus"               SIMULATOR="iPhone 6S Plus (9.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=10.1,name=iPhone 7 Plus"               SIMULATOR="iPhone 7 Plus (10.1)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"           SIMULATOR="Apple Watch - 42mm (2.2)"           SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
+    - DESTINATION="OS=3.1,name=Apple Watch Series 2 - 42mm"  SIMULATOR="Apple Watch Series 2 - 42mm (3.1)"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
+    - DESTINATION="OS=9.0,name=Apple TV 1080p"               SIMULATOR="Apple TV 1080p (9.2)"               SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
+    - DESTINATION="OS=10.0,name=Apple TV 1080p"              SIMULATOR="Apple TV 1080p (10.0)"              SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
 
 script:
   - set -o pipefail
@@ -36,7 +39,7 @@ script:
   - xcodebuild -showsdks
   - SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
   - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
-  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
+  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
   - if [ "$SDK" != "$WATCHOS_SDK" ]; then
-      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
     fi

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## [1.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/1.1.0) 
+
+Released on 2017.01.14
+
+### Added
+
+- `DOM Ranges` implementation ([spec](https://dom.spec.whatwg.org/#ranges))
+- `HTMLChatacterData` as base class for `HTMLText` & `HTMLComment`
+	- `HTMLText` and `HTMLComment` no longer extend `HTMLNode` directly
+- `splitText` implementation for `HTMLText` nodes
+- `index` property for `HTMLNode`
+- `cloneNodeDeep` method for `HTMLNode`
+
+### Deprecated
+
+- `appendString` method in `HTMLText` in favor of `appendData` from the supperclass `HTMLCharacterData`
+
+
+## [1.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/1.0.0) 
+
+Released on 2016.09.28
+
+### Added
+
+- Jazzy configuration file
+- Example HTMLKit project
+
+### Updated
+
+- Project for Xcode 8
+- Playground syntax for Swift 3
+- Travis config for iOS 10.0, macOS 10.12, tvOS 10.0 and watchOS 3.0
+- Deployment targets to macOS 10.9, iOS 9.0, tvOS 9.0 and watchOS 2.0
+
+### Fixed
+
+- Nullability annotation in `CSSSelectorParser` class
+- Missing lightweight generics in `HTMLParser`, `HTMLNode` & `HTMLElement`
+
 ## [0.9.4](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.4) 
 
 Released on 2016.09.03
@@ -40,7 +79,6 @@ This release passes all tokenizer and tree construction html5lib-tests as of 201
 - `<isindex>` is completely removed from the spec now, therefore it is dropped from the implementation
 - `Tokenizer` and `Tree-Construction` tests are now generated dynamically
 - Test failures are collected by a `XCTestObservation` for better reporting
-	
 - `<isindex>` is completely removed from the spec now, therefore it is dropped from the implementation
 - `Tokenizer` and `Tree-Construction` tests are now generated dynamically
 - Test failures are collected by a `XCTestObservation` for better reporting
@@ -49,7 +87,6 @@ This release passes all tokenizer and tree construction html5lib-tests as of 201
 
 - Parser now checks the qualified name instead of the local name when handling elements in the `MathML` and `SVG` namespaces
 
-
 ## [0.9.1](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.1)
 
 Released on 2016.01.29
@@ -59,7 +96,6 @@ Released on 2016.01.29
 - Travis-CI integration.
 - CocoaPods spec.
 
-
 ### Changed
 
 - Warnings are treated as errors.
@@ -91,7 +127,6 @@ This is the first public release of `HTMLKit`.
 - Unused namespaces.
 - Historical node types.
 
-
 ### Fixed
 
 - `lt`, `gt` & `eq` CSS Selectors method declarations.

Example/HTMLKitExample/HTMLKitExample.xcodeproj/project.pbxproj

@@ -0,0 +1,257 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		629A63CD1D9AFE0E0089679F /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 629A63CC1D9AFE0E0089679F /* main.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		629A63C71D9AFE0E0089679F /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		629A63C91D9AFE0E0089679F /* HTMLKitExample */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HTMLKitExample; sourceTree = BUILT_PRODUCTS_DIR; };
+		629A63CC1D9AFE0E0089679F /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		629A63C61D9AFE0E0089679F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		629A63C01D9AFE0E0089679F = {
+			isa = PBXGroup;
+			children = (
+				629A63CB1D9AFE0E0089679F /* HTMLKitExample */,
+				629A63CA1D9AFE0E0089679F /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		629A63CA1D9AFE0E0089679F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				629A63C91D9AFE0E0089679F /* HTMLKitExample */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		629A63CB1D9AFE0E0089679F /* HTMLKitExample */ = {
+			isa = PBXGroup;
+			children = (
+				629A63CC1D9AFE0E0089679F /* main.swift */,
+			);
+			path = HTMLKitExample;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		629A63C81D9AFE0E0089679F /* HTMLKitExample */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 629A63D01D9AFE0E0089679F /* Build configuration list for PBXNativeTarget "HTMLKitExample" */;
+			buildPhases = (
+				629A63C51D9AFE0E0089679F /* Sources */,
+				629A63C61D9AFE0E0089679F /* Frameworks */,
+				629A63C71D9AFE0E0089679F /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = HTMLKitExample;
+			productName = HTMLKitExample;
+			productReference = 629A63C91D9AFE0E0089679F /* HTMLKitExample */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		629A63C11D9AFE0E0089679F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0800;
+				LastUpgradeCheck = 0800;
+				ORGANIZATIONNAME = iabudiab;
+				TargetAttributes = {
+					629A63C81D9AFE0E0089679F = {
+						CreatedOnToolsVersion = 8.0;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 629A63C41D9AFE0E0089679F /* Build configuration list for PBXProject "HTMLKitExample" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 629A63C01D9AFE0E0089679F;
+			productRefGroup = 629A63CA1D9AFE0E0089679F /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				629A63C81D9AFE0E0089679F /* HTMLKitExample */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		629A63C51D9AFE0E0089679F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				629A63CD1D9AFE0E0089679F /* main.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		629A63CE1D9AFE0E0089679F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		629A63CF1D9AFE0E0089679F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		629A63D11D9AFE0E0089679F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+			};
+			name = Debug;
+		};
+		629A63D21D9AFE0E0089679F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		629A63C41D9AFE0E0089679F /* Build configuration list for PBXProject "HTMLKitExample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				629A63CE1D9AFE0E0089679F /* Debug */,
+				629A63CF1D9AFE0E0089679F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		629A63D01D9AFE0E0089679F /* Build configuration list for PBXNativeTarget "HTMLKitExample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				629A63D11D9AFE0E0089679F /* Debug */,
+				629A63D21D9AFE0E0089679F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 629A63C11D9AFE0E0089679F /* Project object */;
+}

Example/HTMLKitExample/HTMLKitExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:HTMLKitExample.xcodeproj">
+   </FileRef>
+</Workspace>

Example/HTMLKitExample/HTMLKitExample.xcodeproj/xcshareddata/xcschemes/HTMLKitExample.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "629A63C81D9AFE0E0089679F"
+               BuildableName = "HTMLKitExample"
+               BlueprintName = "HTMLKitExample"
+               ReferencedContainer = "container:HTMLKitExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "629A63C81D9AFE0E0089679F"
+            BuildableName = "HTMLKitExample"
+            BlueprintName = "HTMLKitExample"
+            ReferencedContainer = "container:HTMLKitExample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "629A63C81D9AFE0E0089679F"
+            BuildableName = "HTMLKitExample"
+            BlueprintName = "HTMLKitExample"
+            ReferencedContainer = "container:HTMLKitExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "629A63C81D9AFE0E0089679F"
+            BuildableName = "HTMLKitExample"
+            BlueprintName = "HTMLKitExample"
+            ReferencedContainer = "container:HTMLKitExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/HTMLKitExample/HTMLKitExample/main.swift

@@ -0,0 +1,167 @@
+//
+//  main.swift
+//  HTMLKitExample
+//
+//  Created by Iska on 27/09/16.
+//  Copyright © 2016 iabudiab. All rights reserved.
+//
+
+import HTMLKit
+
+// Simple scraper that is able to load a page, query via CSS Selectors, and following links
+class Scraper {
+
+	enum ScrapingError: Error {
+		case DocumentNotLoaded
+		case ElementNotFound(String)
+		case InvalidAnchorUrl(String)
+		case CouldNotLoadPage(URL)
+	}
+
+	private var url: URL
+	private(set) var document: HTMLDocument?
+
+	init(url: URL) {
+		self.url = url
+		self.document = nil
+	}
+
+	func load() throws {
+		try loadDocument(at: url)
+	}
+
+	func listElements(matching selector: CSSSelector) throws -> [HTMLElement] {
+		guard let document = document else {
+			throw ScrapingError.DocumentNotLoaded
+		}
+
+		return document.elements(matching: selector)
+	}
+
+	func followLink(matchingSelector selector: CSSSelector) throws {
+		guard let document = document else {
+			throw ScrapingError.DocumentNotLoaded
+		}
+
+		guard let link = document.firstElement(matching: selector) else {
+			throw ScrapingError.ElementNotFound(selector.debugDescription)
+		}
+
+		guard let targetUrl = URL(string: link["href"], relativeTo: url) else {
+			throw ScrapingError.InvalidAnchorUrl(link["href"])
+		}
+
+		try loadDocument(at: targetUrl)
+	}
+
+	private func loadDocument(at url: URL) throws {
+		guard let content = try? String(contentsOf: url) else {
+			throw ScrapingError.CouldNotLoadPage(url)
+		}
+		document = HTMLDocument(string: content)
+	}
+}
+
+// A custom block-based selector, that matches only elements having the given text content:
+// i.e. textContentSelector("Hello") will match <p>Hello</p> and <a href='example.com'>Hello</a>
+// but wont match <div>World</div> or <p>Hello there</p>
+func textContentSelector(text: String) -> CSSSelector {
+	return namedBlockSelector("[@textContent='\(text)']") { (element) -> Bool in
+		return element.textContent == text
+	}
+}
+
+// Helper function to create a typed-selector matching an anchor element that has the given
+// text content.
+func anchorElement(havingContent: String) -> CSSSelector {
+	return allOf(
+		[
+			typeSelector("a"),
+			textContentSelector(text: havingContent)
+		]
+	)
+}
+
+// Helper function to print the content of a github repository file content
+func printRepositoryFile(element: HTMLElement) {
+
+	// A node iterator filter that iterates only <td> elements of class "content" i.e. <td class='content'>
+	let contentIterator = element.nodeIterator(showOptions: .element) { (node) -> HTMLNodeFilterValue in
+		guard let element = node as? HTMLElement else { return .reject }
+
+		if element.tagName == "td" && element["class"] == "content" {
+			return .accept
+		}
+
+		return .reject
+	}
+
+	for td in contentIterator {
+		// The cast is necessary because Swift3 wont import the generics info of the NSEnumerator class
+		// i.e. the nextObject() function alwasy has the following signature 'func nextObject() -> Any?'
+		let title = (td as AnyObject).textContent.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+		print("- \(title)")
+	}
+}
+
+let htmlKitUrl = URL(string: "https://github.com/iabudiab/HTMLKit")!
+let scraper = Scraper(url: htmlKitUrl)
+
+do {
+	// Load the page
+	try scraper.load()
+
+	// Parse the selector
+	let repositoryContent = try CSSSelectorParser.parseSelector("[role='main'] .repository-content > .file-wrap > .files tr.js-navigation-item")
+
+	// Query matching elements
+	let files =  try scraper.listElements(matching: repositoryContent)
+
+	print("HTMLKit repositroy root:")
+	files.forEach(printRepositoryFile)
+} catch let error {
+	print(error)
+}
+
+do {
+	// Follow some links
+	try scraper.followLink(matchingSelector: anchorElement(havingContent: "Sources"))
+	try scraper.followLink(matchingSelector: anchorElement(havingContent: "HTMLEOFToken.m"))
+
+	// The following selector: "[role='main'] div.file table.js-file-line-container td:nth-child(2)"
+	// can be defined in type-safe manner:
+	let selector = allOf([
+		descendantOfElementSelector(
+			attributeSelector(.exactMatch, "role", "main")
+		),
+		descendantOfElementSelector(
+			allOf([
+				typeSelector("div"),
+				classSelector("file")
+			])
+		),
+		descendantOfElementSelector(
+			allOf([
+				typeSelector("table"),
+				classSelector("js-file-line-container")
+			])
+		),
+		typeSelector("td"),
+		nthChildSelector(
+			CSSNthExpressionMake(0, 2)
+		)
+	])
+
+	// Query matching elements
+	let elements = try scraper.listElements(matching: selector)
+
+	// This will print the source code for the "HTMLEOFToken.m" file under this url:
+	// https://github.com/iabudiab/HTMLKit/blob/master/Sources/HTMLEOFToken.m
+
+	print("\nHTMLEOFToken:")
+	elements.forEach {
+		print($0.textContent)
+	}
+} catch let error {
+	print(error)
+}

HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/Contents.swift

@@ -28,22 +28,22 @@ var nonParagraphChildOfDiv = document.querySelectorAll("div :not(p)")
 /*:
 HTMLKit also provides API to create selector instances in a type-safe manner without the need to parse them first. The previous examples would like this:
 */
-paragraphs = document.elementsMatchingSelector(typeSelector("p"))
-paragraphsOrHeaders = document.elementsMatchingSelector(
+paragraphs = document.elements(matching: typeSelector("p"))
+paragraphsOrHeaders = document.elements(matching: 
 	anyOf([
 		typeSelector("p"), typeSelector("h1")
 	])
 )
 
-hasClassAttribute = document.elementsMatchingSelector(hasAttributeSelector("class"))
-greetings = document.elementsMatchingSelector(classSelector("greeting"))
-classNameStartsWith_de = document.elementsMatchingSelector(attributeSelector(.Begins, "class", "de"))
+hasClassAttribute = document.elements(matching: hasAttributeSelector("class"))
+greetings = document.elements(matching: classSelector("greeting"))
+classNameStartsWith_de = document.elements(matching: attributeSelector(.begins, "class", "de"))
 
-hasAdjacentHeader = document.elementsMatchingSelector(adjacentSiblingSelector(typeSelector("h1")))
-hasAdjacentHeader = document.elementsMatchingSelector(generalSiblingSelector(typeSelector("h1")))
-hasAdjacentHeader = document.elementsMatchingSelector(generalSiblingSelector(typeSelector("p")))
+hasAdjacentHeader = document.elements(matching: adjacentSiblingSelector(typeSelector("h1")))
+hasAdjacentHeader = document.elements(matching: generalSiblingSelector(typeSelector("h1")))
+hasAdjacentHeader = document.elements(matching: generalSiblingSelector(typeSelector("p")))
 
-nonParagraphChildOfDiv = document.elementsMatchingSelector(
+nonParagraphChildOfDiv = document.elements(matching: 
 	allOf([
 		childOfElementSelector(typeSelector("div")),
 		not(typeSelector("p"))
@@ -54,17 +54,17 @@ nonParagraphChildOfDiv = document.elementsMatchingSelector(
 Here are more examples
 */
 
-let firstDivElement = document.firstElementMatchingSelector(typeSelector("div"))!
+let firstDivElement = document.firstElement(matching: typeSelector("div"))!
 
 var secondChildOfDiv = firstDivElement.querySelectorAll(":nth-child(2)")
 var secondOfType = firstDivElement.querySelectorAll(":nth-of-type(2n)")
 
-secondChildOfDiv = firstDivElement.elementsMatchingSelector(nthChildSelector(CSSNthExpression(an: 0, b: 2)))
-secondOfType = firstDivElement.elementsMatchingSelector(nthOfTypeSelector(CSSNthExpression(an: 2, b: 0)))
+secondChildOfDiv = firstDivElement.elements(matching: nthChildSelector(CSSNthExpression(an: 0, b: 2)))
+secondOfType = firstDivElement.elements(matching: nthOfTypeSelector(CSSNthExpression(an: 2, b: 0)))
 
 
 var notParagraphAndNotDiv = firstDivElement.querySelectorAll(":not(p):not(div)")
-notParagraphAndNotDiv = firstDivElement.elementsMatchingSelector(
+notParagraphAndNotDiv = firstDivElement.elements(matching: 
 	allOf([
 		not(typeSelector("p")),
 		not(typeSelector("div"))
@@ -77,4 +77,4 @@ One more thing! You can also create your own selectors. You either subclass the
 let myAwesomeSelector = namedBlockSelector("myAwesomeSelector", { (element) -> Bool in
 	return element.tagName != "p" && element.tagName != "div"
 })
-firstDivElement.elementsMatchingSelector(myAwesomeSelector)
+firstDivElement.elements(matching: myAwesomeSelector)

HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/timeline.xctimeline

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Timeline
-   version = "3.0">
-   <TimelineItems>
-   </TimelineItems>
-</Timeline>

HTMLKit.playground/Pages/Parsing Documents.xcplaygroundpage/Contents.swift

@@ -9,7 +9,8 @@ import HTMLKit
 Given some HTML content
 */
 
-let htmlString = try! String(contentsOfURL: [#FileReference(fileReferenceLiteral: "HTMLKit.html")#])
+let htmlString = "<div><h1>HTMLKit</h1><p class='greeting'>Hello there!</p><p class='description'>This is a demo of HTMLKit</p></div>"
+htmlString
 
 /*:
 You can parse it using the HTMLParser:

HTMLKit.playground/Pages/Parsing Documents.xcplaygroundpage/timeline.xctimeline

@@ -3,10 +3,20 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=318&amp;EndingColumnNumber=26&amp;EndingLineNumber=13&amp;StartingColumnNumber=1&amp;StartingLineNumber=13&amp;Timestamp=472578634.909266"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=581&amp;EndingColumnNumber=26&amp;EndingLineNumber=11&amp;StartingColumnNumber=1&amp;StartingLineNumber=11&amp;Timestamp=496084829.845787"
          lockedSize = "{800, 186}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
+      <LoggerValueHistoryTimelineItem
+         documentLocation = "#CharacterRangeLen=27&amp;CharacterRangeLoc=393&amp;EndingColumnNumber=28&amp;EndingLineNumber=20&amp;StartingColumnNumber=1&amp;StartingLineNumber=20&amp;Timestamp=496084834.772773"
+         selectedRepresentationIndex = "0"
+         shouldTrackSuperviewWidth = "NO">
+      </LoggerValueHistoryTimelineItem>
+      <LoggerValueHistoryTimelineItem
+         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=544&amp;EndingColumnNumber=19&amp;EndingLineNumber=27&amp;StartingColumnNumber=1&amp;StartingLineNumber=27&amp;Timestamp=496084834.772773"
+         selectedRepresentationIndex = "0"
+         shouldTrackSuperviewWidth = "NO">
+      </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

HTMLKit.playground/Pages/Parsing Fragments.xcplaygroundpage/Contents.swift

@@ -18,7 +18,7 @@ You can prase it as a document fragment in a specified context element:
 let parser = HTMLParser(string: htmlString)
 
 let tableContext = HTMLElement(tagName: "table")
-var elements = parser.parseFragmentWithContextElement(tableContext)
+var elements = parser.parseFragment(withContextElement: tableContext)
 
 for element in elements {
 	print(element.outerHTML)
@@ -29,7 +29,7 @@ The same parser instance can be reusued:
 */
 
 let bodyContext = HTMLElement(tagName: "body")
-elements = parser.parseFragmentWithContextElement(bodyContext)
+elements = parser.parseFragment(withContextElement: bodyContext)
 
 for element in elements {
 	print(element.outerHTML)

HTMLKit.playground/Pages/Parsing Fragments.xcplaygroundpage/timeline.xctimeline

@@ -21,13 +21,13 @@
          shouldTrackSuperviewWidth = "YES">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=453&amp;EndingColumnNumber=26&amp;EndingLineNumber=23&amp;StartingColumnNumber=2&amp;StartingLineNumber=23&amp;Timestamp=472578641.006933"
+         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=455&amp;EndingColumnNumber=26&amp;EndingLineNumber=23&amp;StartingColumnNumber=2&amp;StartingLineNumber=23&amp;Timestamp=495492881.371878"
          lockedSize = "{775, 83}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=668&amp;EndingColumnNumber=26&amp;EndingLineNumber=34&amp;StartingColumnNumber=2&amp;StartingLineNumber=34&amp;Timestamp=472578641.007156"
+         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=672&amp;EndingColumnNumber=26&amp;EndingLineNumber=34&amp;StartingColumnNumber=2&amp;StartingLineNumber=34&amp;Timestamp=495493308.359844"
          lockedSize = "{775, 76}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "YES">
@@ -39,7 +39,7 @@
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=448&amp;EndingColumnNumber=26&amp;EndingLineNumber=21&amp;StartingColumnNumber=2&amp;StartingLineNumber=21&amp;Timestamp=472579861.71569"
+         documentLocation = "#CharacterRangeLen=24&amp;CharacterRangeLoc=450&amp;EndingColumnNumber=26&amp;EndingLineNumber=21&amp;StartingColumnNumber=2&amp;StartingLineNumber=21&amp;Timestamp=495492881.372527"
          lockedSize = "{775, 68}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "YES">

HTMLKit.playground/Pages/The DOM.xcplaygroundpage/Contents.swift

@@ -21,7 +21,7 @@ description["content"] = "HTMLKit for iOS & OSX"
 Append nodes to the document
 */
 let head = document.head!
-head.appendNode(description)
+head.append(description)
 document.innerHTML
 
 let body = document.body!
@@ -30,17 +30,17 @@ let nodes = [
 	HTMLElement(tagName: "div", attributes: ["class": "green"]),
 	HTMLElement(tagName: "div", attributes: ["class": "blue"])
 ]
-body.appendNodes(nodes)
+body.append(nodes)
 body.innerHTML
 
 /*:
 Enumerate child elements and perform DOM manipulation
 */
-body.enumerateChildElementsUsingBlock { (element, index, stop) -> Void in
+body.enumerateChildElements { (element, index, stop) -> Void in
 	if element.tagName == "div" {
 		let lorem = HTMLElement(tagName: "p")
 		lorem.textContent = "Lorem ipsum: \(index)"
-		element.appendNode(lorem)
+		element.append(lorem)
 	}
 }
 body.innerHTML
@@ -48,7 +48,7 @@ body.innerHTML
 /*:
 Remove nodes from the document
 */
-body.removeChildNodeAtIndex(1)
+body.removeChildNode(at: 1)
 body.innerHTML
 
 /*:
@@ -56,24 +56,26 @@ Navigate to child and sibling nodes
 */
 body.lastChild!.removeFromParentNode()
 let greenDiv = body.firstChild!.nextSibling!
+greenDiv.outerHTML
 
 /*:
 Manipulate the HTML directly
 */
 greenDiv.innerHTML = "<ul><li>item 1<li>item 2"
+greenDiv.outerHTML
 
 /*:
 Iterate the DOM tree with custom filters
 */
-let filter = HTMLNodeFilterBlock.filterWithBlock { (node) -> HTMLNodeFilterValue in
+let filter = HTMLNodeFilterBlock.filter { (node) -> HTMLNodeFilterValue in
 	if node.childNodesCount() != 1 {
-		return .Reject
+		return .reject
 	}
-	return .Accept
+	return .accept
 }
 
-for element in body.nodeIteratorWithShowOptions(.Element, filter: filter) {
-	element.outerHTML
+for element in body.nodeIterator(showOptions: .element, filter: filter) {
+	(element as! AnyObject).outerHTML
 }
 
 //: [Next](@next)

HTMLKit.playground/Pages/The DOM.xcplaygroundpage/timeline.xctimeline

@@ -3,71 +3,65 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=19&amp;CharacterRangeLoc=575&amp;EndingColumnNumber=26&amp;EndingLineNumber=24&amp;StartingColumnNumber=1&amp;StartingLineNumber=24&amp;Timestamp=472578662.196737"
+         documentLocation = "#CharacterRangeLen=19&amp;CharacterRangeLoc=571&amp;EndingColumnNumber=26&amp;EndingLineNumber=24&amp;StartingColumnNumber=1&amp;StartingLineNumber=24&amp;Timestamp=495493395.434491"
          lockedSize = "{763, 104}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "YES">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=15&amp;CharacterRangeLoc=843&amp;EndingColumnNumber=22&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=472578662.197012"
+         documentLocation = "#CharacterRangeLen=15&amp;CharacterRangeLoc=834&amp;EndingColumnNumber=22&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=495493408.111041"
          lockedSize = "{763, 75}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1757&amp;EndingColumnNumber=44&amp;EndingLineNumber=75&amp;StartingColumnNumber=2&amp;StartingLineNumber=75&amp;Timestamp=472578674.159974"
+         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1774&amp;EndingColumnNumber=44&amp;EndingLineNumber=77&amp;StartingColumnNumber=2&amp;StartingLineNumber=77&amp;Timestamp=496085091.150842"
          lockedSize = "{763, 176}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=844&amp;EndingColumnNumber=15&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=472578662.197451"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=835&amp;EndingColumnNumber=15&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=495493408.111552"
          lockedSize = "{762, 70}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=576&amp;EndingColumnNumber=19&amp;EndingLineNumber=24&amp;StartingColumnNumber=1&amp;StartingLineNumber=24&amp;Timestamp=472578662.197662"
+         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=572&amp;EndingColumnNumber=19&amp;EndingLineNumber=24&amp;StartingColumnNumber=1&amp;StartingLineNumber=24&amp;Timestamp=495493395.435449"
          lockedSize = "{752, 99}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1757&amp;EndingColumnNumber=16&amp;EndingLineNumber=75&amp;StartingColumnNumber=2&amp;StartingLineNumber=75&amp;Timestamp=472578674.160606"
+         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1774&amp;EndingColumnNumber=16&amp;EndingLineNumber=77&amp;StartingColumnNumber=2&amp;StartingLineNumber=77&amp;Timestamp=496085091.151491"
          lockedSize = "{763, 102}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=1740&amp;EndingColumnNumber=39&amp;EndingLineNumber=75&amp;StartingColumnNumber=2&amp;StartingLineNumber=75&amp;Timestamp=472578674.160818"
+         documentLocation = "#CharacterRangeLen=33&amp;CharacterRangeLoc=1742&amp;EndingColumnNumber=39&amp;EndingLineNumber=77&amp;StartingColumnNumber=2&amp;StartingLineNumber=77&amp;Timestamp=496085091.151711"
          lockedSize = "{759, 149}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=1741&amp;EndingColumnNumber=19&amp;EndingLineNumber=75&amp;StartingColumnNumber=2&amp;StartingLineNumber=75&amp;Timestamp=472578674.161034"
+         documentLocation = "#CharacterRangeLen=32&amp;CharacterRangeLoc=1743&amp;EndingColumnNumber=19&amp;EndingLineNumber=77&amp;StartingColumnNumber=2&amp;StartingLineNumber=77&amp;Timestamp=496085091.151931"
          lockedSize = "{763, 120}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1230&amp;EndingColumnNumber=15&amp;EndingLineNumber=51&amp;StartingColumnNumber=1&amp;StartingLineNumber=51&amp;Timestamp=472578674.161242"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1204&amp;EndingColumnNumber=15&amp;EndingLineNumber=51&amp;StartingColumnNumber=1&amp;StartingLineNumber=51&amp;Timestamp=495493441.437517"
          lockedSize = "{763, 94}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1145&amp;EndingColumnNumber=15&amp;EndingLineNumber=45&amp;StartingColumnNumber=1&amp;StartingLineNumber=45&amp;Timestamp=472578674.161449"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1122&amp;EndingColumnNumber=15&amp;EndingLineNumber=45&amp;StartingColumnNumber=1&amp;StartingLineNumber=45&amp;Timestamp=495493427.982381"
          lockedSize = "{760, 97}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
-      <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=1332&amp;EndingColumnNumber=13&amp;EndingLineNumber=57&amp;StartingColumnNumber=5&amp;StartingLineNumber=57&amp;Timestamp=472578674.161666"
-         lockedSize = "{763, 74}"
-         selectedRepresentationIndex = "0"
-         shouldTrackSuperviewWidth = "NO">
-      </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
          documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=397&amp;EndingColumnNumber=19&amp;EndingLineNumber=14&amp;StartingColumnNumber=1&amp;StartingLineNumber=14&amp;Timestamp=472578662.199111"
          lockedSize = "{762, 90}"
@@ -75,76 +69,82 @@
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=701&amp;EndingColumnNumber=15&amp;EndingLineNumber=26&amp;StartingColumnNumber=1&amp;StartingLineNumber=26&amp;Timestamp=472578662.199312"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=697&amp;EndingColumnNumber=15&amp;EndingLineNumber=26&amp;StartingColumnNumber=1&amp;StartingLineNumber=26&amp;Timestamp=495493395.437213"
          lockedSize = "{763, 76}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1002&amp;EndingColumnNumber=15&amp;EndingLineNumber=38&amp;StartingColumnNumber=1&amp;StartingLineNumber=38&amp;Timestamp=472578674.162269"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=983&amp;EndingColumnNumber=15&amp;EndingLineNumber=38&amp;StartingColumnNumber=1&amp;StartingLineNumber=38&amp;Timestamp=495493427.983236"
          lockedSize = "{763, 92}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1049&amp;EndingColumnNumber=15&amp;EndingLineNumber=41&amp;StartingColumnNumber=1&amp;StartingLineNumber=41&amp;Timestamp=472578674.162475"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=1030&amp;EndingColumnNumber=15&amp;EndingLineNumber=41&amp;StartingColumnNumber=1&amp;StartingLineNumber=41&amp;Timestamp=495493427.983458"
          lockedSize = "{763, 83}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=1108&amp;EndingColumnNumber=13&amp;EndingLineNumber=44&amp;StartingColumnNumber=5&amp;StartingLineNumber=44&amp;Timestamp=472578674.162693"
+         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=1089&amp;EndingColumnNumber=13&amp;EndingLineNumber=44&amp;StartingColumnNumber=5&amp;StartingLineNumber=44&amp;Timestamp=495493427.983688"
          lockedSize = "{763, 73}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=1598&amp;EndingColumnNumber=19&amp;EndingLineNumber=68&amp;StartingColumnNumber=2&amp;StartingLineNumber=68&amp;Timestamp=472578674.162898"
+         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=1601&amp;EndingColumnNumber=19&amp;EndingLineNumber=70&amp;StartingColumnNumber=2&amp;StartingLineNumber=70&amp;Timestamp=496085091.153628"
          lockedSize = "{763, 92}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=1410&amp;EndingColumnNumber=9&amp;EndingLineNumber=61&amp;StartingColumnNumber=1&amp;StartingLineNumber=59&amp;Timestamp=472578674.163102"
-         lockedSize = "{763, 60}"
-         selectedRepresentationIndex = "0"
-         shouldTrackSuperviewWidth = "NO">
-      </LoggerValueHistoryTimelineItem>
-      <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=590&amp;EndingColumnNumber=15&amp;EndingLineNumber=21&amp;StartingColumnNumber=1&amp;StartingLineNumber=21&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=586&amp;EndingColumnNumber=15&amp;EndingLineNumber=21&amp;StartingColumnNumber=1&amp;StartingLineNumber=21&amp;Timestamp=495493395.438545"
          lockedSize = "{763, 50}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=830&amp;EndingColumnNumber=15&amp;EndingLineNumber=30&amp;StartingColumnNumber=1&amp;StartingLineNumber=30&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=9&amp;CharacterRangeLoc=826&amp;EndingColumnNumber=15&amp;EndingLineNumber=30&amp;StartingColumnNumber=1&amp;StartingLineNumber=30&amp;Timestamp=495493408.115325"
          lockedSize = "{763, 50}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "YES">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=877&amp;EndingColumnNumber=15&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=14&amp;CharacterRangeLoc=868&amp;EndingColumnNumber=15&amp;EndingLineNumber=33&amp;StartingColumnNumber=1&amp;StartingLineNumber=33&amp;Timestamp=495493408.115547"
          lockedSize = "{763, 50}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "YES">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=936&amp;EndingColumnNumber=13&amp;EndingLineNumber=36&amp;StartingColumnNumber=5&amp;StartingLineNumber=36&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=927&amp;EndingColumnNumber=13&amp;EndingLineNumber=36&amp;StartingColumnNumber=5&amp;StartingLineNumber=36&amp;Timestamp=495493408.115762"
          lockedSize = "{763, 50}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=978&amp;EndingColumnNumber=9&amp;EndingLineNumber=38&amp;StartingColumnNumber=1&amp;StartingLineNumber=38&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=8&amp;CharacterRangeLoc=959&amp;EndingColumnNumber=9&amp;EndingLineNumber=38&amp;StartingColumnNumber=1&amp;StartingLineNumber=38&amp;Timestamp=495493427.985192"
          lockedSize = "{763, 50}"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "YES">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=1261&amp;EndingColumnNumber=19&amp;EndingLineNumber=48&amp;StartingColumnNumber=2&amp;StartingLineNumber=48&amp;Timestamp=472579886.937978"
+         documentLocation = "#CharacterRangeLen=17&amp;CharacterRangeLoc=1235&amp;EndingColumnNumber=19&amp;EndingLineNumber=48&amp;StartingColumnNumber=2&amp;StartingLineNumber=48&amp;Timestamp=495493441.440785"
          lockedSize = "{763, 92}"
          selectedRepresentationIndex = "1"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
+      <LoggerValueHistoryTimelineItem
+         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=1451&amp;EndingColumnNumber=19&amp;EndingLineNumber=64&amp;StartingColumnNumber=1&amp;StartingLineNumber=64&amp;Timestamp=496085091.155099"
+         lockedSize = "{740, 65}"
+         selectedRepresentationIndex = "0"
+         shouldTrackSuperviewWidth = "YES">
+      </LoggerValueHistoryTimelineItem>
+      <LoggerValueHistoryTimelineItem
+         documentLocation = "#CharacterRangeLen=18&amp;CharacterRangeLoc=1347&amp;EndingColumnNumber=19&amp;EndingLineNumber=58&amp;StartingColumnNumber=1&amp;StartingLineNumber=58&amp;Timestamp=496085092.425909"
+         lockedSize = "{740, 69}"
+         selectedRepresentationIndex = "0"
+         shouldTrackSuperviewWidth = "NO">
+      </LoggerValueHistoryTimelineItem>
    </TimelineItems>
 </Timeline>

HTMLKit.playground/Resources/HTMLKit.html

@@ -1,11 +0,0 @@
-<html>
-	<head>
-		<title>HTMLKit</title>
-	</head>
-	<body>
-		<h1>HTMLKit</h1>
-		<p>HTMLKit is a <a href="https://html.spec.whatwg.org/multipage">WHATWG specification-compliant</a> Objective-C framework for parsing and serializing HTML documents and document fragments for iOS and OSX.</p>
-		<p>HTMLKit parses real-world HTML the same way modern web browsers would.</p>
-		<p>HTMLKit comes armed with a <a href="http://www.w3.org/TR/css3-selectors">CSS3 Selectors</a> engine for querying the DOM.</p>
-	</body>
-</html>

HTMLKit.playground/contents.xcplayground

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='6.0' target-platform='ios' display-mode='rendered'>
+<playground version='6.0' target-platform='macos' display-mode='rendered' last-migration='0800'>
     <pages>
         <page name='Intro'/>
         <page name='Parsing Documents'/>

HTMLKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "0.9.4"
+  s.version            = "1.1.0"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files         = "Sources", "Sources/**/*.{h,m}"
   s.private_header_files = [
-    'Sources/**/*{HTMLToken,HTMLTokens,HTMLTagToken,HTMLCharacterToken,HTMLCommentToken,HTMLDOCTYPEToken,HTMLEOFToken,HTMLTokenizer,HTMLTokenizerCharacters,HTMLTokenizerEntities,HTMLTokenizerStates,HTMLElementAdjustment,HTMLElementTypes,HTMLInputStreamReader,HTMLListOfActiveFormattingElements,HTMLNodeTraversal,HTMLParseErrorToken,HTMLParserInsertionModes,HTMLStackOfOpenElements,HTMLNode+Private,HTMLMarker,CSSCodePoints,CSSInputStream}.h'
+    'Sources/**/*{HTMLToken,HTMLTokens,HTMLTagToken,HTMLCharacterToken,HTMLCommentToken,HTMLDOCTYPEToken,HTMLEOFToken,HTMLTokenizer,HTMLTokenizerCharacters,HTMLTokenizerEntities,HTMLTokenizerStates,HTMLElementAdjustment,HTMLElementTypes,HTMLInputStreamReader,HTMLListOfActiveFormattingElements,HTMLParseErrorToken,HTMLParserInsertionModes,HTMLStackOfOpenElements,HTMLMarker,HTMLNode+Private,HTMLDocument+Private,HTMLCharacterData+Private,HTMLRange+Private,HTMLParser+Private,HTMLNodeIterator+Private,HTMLNodeTraversal,HTMLDOMUtils,CSSCodePoints,CSSInputStream}.h'
   ]
 
   s.requires_arc = true

HTMLKit.xcodeproj/project.pbxproj

@@ -7,14 +7,26 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		62056C4F1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62056C501E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62056C511E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62056C521E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		62132E5A1C01F83200084175 /* CSSSelectorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62132E581C01F83200084175 /* CSSSelectorTest.m */; };
 		62132E5D1C021FF200084175 /* css-tests in Resources */ = {isa = PBXBuildFile; fileRef = 62132E5B1C021FF200084175 /* css-tests */; };
 		6216ACFD1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */; };
 		6216ACFE1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */; };
+		621CC4911DEA704000D1992A /* HTMLDocument+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4921DEA704000D1992A /* HTMLDocument+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4931DEA704000D1992A /* HTMLDocument+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4941DEA704000D1992A /* HTMLDocument+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4A51DEA721A00D1992A /* HTMLParser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4A61DEA721A00D1992A /* HTMLParser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4A71DEA721A00D1992A /* HTMLParser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		621CC4A81DEA721A00D1992A /* HTMLParser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		621FBE5B1BDAD68700BC9555 /* CSSSelectorParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */; };
 		621FBE5E1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */; };
 		6236738F1AC0CE2500FF89B3 /* HTMLKitTokenizerPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = 6236738D1AC0CE2500FF89B3 /* HTMLKitTokenizerPerformance.m */; };
-		623916C81AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m */; };
+		623916C81AC7209E0066B4FE /* HTMLNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */; };
 		6239755B1AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */; };
 		6239755F1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */; };
 		623CAF9E1AD88BEA00E34C32 /* HTMLKitParserPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = 623CAF9C1AD88BEA00E34C32 /* HTMLKitParserPerformance.m */; };
@@ -24,15 +36,23 @@
 		624AC90219FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624AC90019FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m */; };
 		624AC90519FBFE9A00BD3C4A /* html5lib-tests in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90419FBFE8A00BD3C4A /* html5lib-tests */; };
 		624AC90F19FC702E00BD3C4A /* HTML Standard.html in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90D19FC702E00BD3C4A /* HTML Standard.html */; };
-		624B9FB31AE0313300646C4C /* HTMLKitStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLKitStringCategoryTests.m */; };
-		624B9FB61AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m */; };
-		624FC37B1AE591D80015DDF9 /* HTMLKitNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLKitNodesTests.m */; };
+		624B9FB31AE0313300646C4C /* HTMLStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */; };
+		624B9FB61AE0391400646C4C /* HTMLOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */; };
+		624C777A1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		624C777B1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		624C777C1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		624C777D1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		624C777E1DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */ = {isa = PBXBuildFile; fileRef = 624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */; };
+		624C777F1DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */ = {isa = PBXBuildFile; fileRef = 624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */; };
+		624C77801DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */ = {isa = PBXBuildFile; fileRef = 624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */; };
+		624C77811DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */ = {isa = PBXBuildFile; fileRef = 624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */; };
+		624FC37B1AE591D80015DDF9 /* HTMLNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */; };
 		62567F501C0CB5750025D458 /* HTMLDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 62567F4E1C0CB5750025D458 /* HTMLDOMTokenList.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62567F511C0CB5750025D458 /* HTMLDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 62567F4E1C0CB5750025D458 /* HTMLDOMTokenList.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62567F521C0CB5750025D458 /* HTMLDOMTokenList.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F4F1C0CB5750025D458 /* HTMLDOMTokenList.m */; };
 		62567F531C0CB5750025D458 /* HTMLDOMTokenList.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F4F1C0CB5750025D458 /* HTMLDOMTokenList.m */; };
-		62567F561C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m */; };
-		62567F571C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m */; };
+		62567F561C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */; };
+		62567F571C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */; };
 		625A14B019C7829400AD0C32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 625A14AF19C7829400AD0C32 /* Cocoa.framework */; };
 		625A14C519C7829400AD0C32 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 625A14C419C7829400AD0C32 /* XCTest.framework */; };
 		625A14C919C7829400AD0C32 /* HTMLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 625A14AC19C7829400AD0C32 /* HTMLKit.framework */; };
@@ -42,6 +62,18 @@
 		625EE4581CBAA41D00F2CC8E /* HTMLKitTestObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */; };
 		625EE45B1CBB171300F2CC8E /* HTMLKitTestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */; };
 		625EE45C1CBB171300F2CC8E /* HTMLKitTestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */; };
+		626679CF1DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626679D01DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626679D11DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626679D21DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626BE1E21DF3819500C49514 /* HTMLDOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626BE1E31DF3819500C49514 /* HTMLDOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626BE1E41DF3819500C49514 /* HTMLDOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626BE1E51DF3819500C49514 /* HTMLDOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		626BE1E61DF3819600C49514 /* HTMLDOMUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */; };
+		626BE1E71DF3819600C49514 /* HTMLDOMUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */; };
+		626BE1E81DF3819600C49514 /* HTMLDOMUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */; };
+		626BE1E91DF3819600C49514 /* HTMLDOMUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */; };
 		62857C6B1D3988EE008DC254 /* HTMLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A14BC19C7829400AD0C32 /* HTMLKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62857C6C1D3988EE008DC254 /* HTMLKitErrorDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 626652F81C03D30F00C3F121 /* HTMLKitErrorDomain.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62857C6D1D398907008DC254 /* HTMLInputStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A150619C78ABA00AD0C32 /* HTMLInputStreamReader.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -197,13 +229,13 @@
 		62857D311D39A33C008DC254 /* HTML5LibTreeConstructionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */; };
 		62857D321D39A33C008DC254 /* HTMLKitTreeConstructionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */; };
 		62857D331D39A33C008DC254 /* HTMLKitParserPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = 623CAF9C1AD88BEA00E34C32 /* HTMLKitParserPerformance.m */; };
-		62857D341D39A33F008DC254 /* HTMLKitNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m */; };
+		62857D341D39A33F008DC254 /* HTMLNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */; };
 		62857D351D39A33F008DC254 /* HTMLTreeWalkerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */; };
-		62857D361D39A33F008DC254 /* HTMLKitNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLKitNodesTests.m */; };
-		62857D371D39A33F008DC254 /* HTMLKitMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m */; };
-		62857D381D39A342008DC254 /* HTMLKitStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLKitStringCategoryTests.m */; };
-		62857D391D39A342008DC254 /* HTMLKitOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m */; };
-		62857D3A1D39A342008DC254 /* HTMLKitDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m */; };
+		62857D361D39A33F008DC254 /* HTMLNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */; };
+		62857D371D39A33F008DC254 /* HTMLMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */; };
+		62857D381D39A342008DC254 /* HTMLStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */; };
+		62857D391D39A342008DC254 /* HTMLOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */; };
+		62857D3A1D39A342008DC254 /* HTMLDOMTokenListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */; };
 		62857D3B1D39A345008DC254 /* CSSSelectorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62132E581C01F83200084175 /* CSSSelectorTest.m */; };
 		62857D3C1D39A345008DC254 /* CSSSelectorParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */; };
 		62857D3D1D39A345008DC254 /* CSSExtensionSelectorsParsingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */; };
@@ -277,7 +309,21 @@
 		62857D901D39A47F008DC254 /* CSSCompoundSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 620C87791BD44CBE00FB3EEE /* CSSCompoundSelector.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		628AF6301BC99A6C00496128 /* CSSNthExpressionsParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 628AF62E1BC99A6C00496128 /* CSSNthExpressionsParserTests.m */; };
 		62D8345A19FB1AC4009205A9 /* HTML5LibTokenizerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.m */; };
-		62EC7AE71AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m */; };
+		62D91C231DE218A500BEFADE /* HTMLRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D91C211DE218A500BEFADE /* HTMLRange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62D91C241DE218A500BEFADE /* HTMLRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D91C211DE218A500BEFADE /* HTMLRange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62D91C251DE218A500BEFADE /* HTMLRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D91C211DE218A500BEFADE /* HTMLRange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62D91C261DE218A500BEFADE /* HTMLRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D91C211DE218A500BEFADE /* HTMLRange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62D91C271DE218A500BEFADE /* HTMLRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D91C221DE218A500BEFADE /* HTMLRange.m */; };
+		62D91C281DE218A500BEFADE /* HTMLRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D91C221DE218A500BEFADE /* HTMLRange.m */; };
+		62D91C291DE218A500BEFADE /* HTMLRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D91C221DE218A500BEFADE /* HTMLRange.m */; };
+		62D91C2A1DE218A500BEFADE /* HTMLRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D91C221DE218A500BEFADE /* HTMLRange.m */; };
+		62E0BA971E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
+		62E0BA981E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
+		62E0BA991E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */; };
+		62EC0A851E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
+		62EC0A861E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
+		62EC0A871E158BD80007786B /* HTMLRangeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC0A841E158BD80007786B /* HTMLRangeTests.m */; };
+		62EC7AE71AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */; };
 		62ECBEE11C0B69FD00AF847B /* HTMLKitErrorDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 626652F81C03D30F00C3F121 /* HTMLKitErrorDomain.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62ECBEE21C0B69FD00AF847B /* HTMLInputStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A150619C78ABA00AD0C32 /* HTMLInputStreamReader.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		62ECBEE31C0B69FD00AF847B /* HTMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 624493A419CCC54100BCDDF4 /* HTMLTokenizer.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -485,12 +531,12 @@
 		62ECBFCD1C0B6E2E00AF847B /* HTML5LibTreeConstructionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */; };
 		62ECBFCE1C0B6E2E00AF847B /* HTMLKitTreeConstructionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */; };
 		62ECBFCF1C0B6E2E00AF847B /* HTMLKitParserPerformance.m in Sources */ = {isa = PBXBuildFile; fileRef = 623CAF9C1AD88BEA00E34C32 /* HTMLKitParserPerformance.m */; };
-		62ECBFD01C0B6E2E00AF847B /* HTMLKitNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m */; };
+		62ECBFD01C0B6E2E00AF847B /* HTMLNodeIteratorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */; };
 		62ECBFD11C0B6E2E00AF847B /* HTMLTreeWalkerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */; };
-		62ECBFD21C0B6E2E00AF847B /* HTMLKitNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLKitNodesTests.m */; };
-		62ECBFD31C0B6E2E00AF847B /* HTMLKitMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m */; };
-		62ECBFD41C0B6E2E00AF847B /* HTMLKitStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLKitStringCategoryTests.m */; };
-		62ECBFD51C0B6E2E00AF847B /* HTMLKitOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m */; };
+		62ECBFD21C0B6E2E00AF847B /* HTMLNodesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */; };
+		62ECBFD31C0B6E2E00AF847B /* HTMLMutationAlgorithmsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */; };
+		62ECBFD41C0B6E2E00AF847B /* HTMLStringCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */; };
+		62ECBFD51C0B6E2E00AF847B /* HTMLOrderedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */; };
 		62ECBFD61C0B6E2E00AF847B /* CSSSelectorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62132E581C01F83200084175 /* CSSSelectorTest.m */; };
 		62ECBFD71C0B6E2E00AF847B /* CSSSelectorParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */; };
 		62ECBFD81C0B6E2E00AF847B /* CSSNthExpressionsParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 628AF62E1BC99A6C00496128 /* CSSNthExpressionsParserTests.m */; };
@@ -502,6 +548,10 @@
 		62ECBFDE1C0B6E4400AF847B /* HTML Standard.html in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90D19FC702E00BD3C4A /* HTML Standard.html */; };
 		62ECBFDF1C0B6E4400AF847B /* html5lib-tests in Resources */ = {isa = PBXBuildFile; fileRef = 624AC90419FBFE8A00BD3C4A /* html5lib-tests */; };
 		62F658711BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */; };
+		62F7E5A21DEB63F900DEF09B /* HTMLRange+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62F7E5A31DEB63F900DEF09B /* HTMLRange+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62F7E5A41DEB63F900DEF09B /* HTMLRange+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		62F7E5A51DEB63F900DEF09B /* HTMLRange+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -529,6 +579,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLNodeIterator+Private.h"; path = "include/HTMLNodeIterator+Private.h"; sourceTree = "<group>"; };
 		62079BE71AF56F1E00D3B402 /* CSSSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSSelector.h; path = include/CSSSelector.h; sourceTree = "<group>"; };
 		620C87791BD44CBE00FB3EEE /* CSSCompoundSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSCompoundSelector.h; path = include/CSSCompoundSelector.h; sourceTree = "<group>"; };
 		620C877A1BD44CBE00FB3EEE /* CSSCompoundSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSCompoundSelector.m; sourceTree = "<group>"; };
@@ -538,6 +589,8 @@
 		62132E581C01F83200084175 /* CSSSelectorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSSelectorTest.m; sourceTree = "<group>"; };
 		62132E5B1C021FF200084175 /* css-tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "css-tests"; sourceTree = "<group>"; };
 		6216ACFC1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSExtensionSelectorsParsingTests.m; sourceTree = "<group>"; };
+		621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLDocument+Private.h"; path = "include/HTMLDocument+Private.h"; sourceTree = "<group>"; };
+		621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLParser+Private.h"; path = "include/HTMLParser+Private.h"; sourceTree = "<group>"; };
 		621FBE591BDAD68700BC9555 /* CSSSelectorParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSSelectorParserTests.m; sourceTree = "<group>"; };
 		621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSCombinatorSelectorTests.m; sourceTree = "<group>"; };
 		6223211D1A969B9300BACED5 /* HTMLElementTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLElementTypes.h; path = include/HTMLElementTypes.h; sourceTree = "<group>"; };
@@ -575,7 +628,7 @@
 		6238579A1A9E8934003A45D9 /* HTMLComment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLComment.m; sourceTree = "<group>"; };
 		6238C9831AB8D6330006512E /* HTMLKitDOMExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLKitDOMExceptions.h; path = include/HTMLKitDOMExceptions.h; sourceTree = "<group>"; };
 		6238C9841AB8D6330006512E /* HTMLKitDOMExceptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitDOMExceptions.m; sourceTree = "<group>"; };
-		623916C61AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitNodeIteratorTests.m; sourceTree = "<group>"; };
+		623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeIteratorTests.m; sourceTree = "<group>"; };
 		623975591AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTreeConstructionTests.m; sourceTree = "<group>"; };
 		6239755C1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTML5LibTreeConstructionTest.h; sourceTree = "<group>"; };
 		6239755D1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTML5LibTreeConstructionTest.m; sourceTree = "<group>"; };
@@ -610,12 +663,14 @@
 		624B371C1B24E9BA0010BDDF /* CSSInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSInputStream.h; path = include/CSSInputStream.h; sourceTree = "<group>"; };
 		624B371D1B24E9BA0010BDDF /* CSSInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSInputStream.m; sourceTree = "<group>"; };
 		624B37211B250BB50010BDDF /* CSSCodePoints.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CSSCodePoints.h; path = include/CSSCodePoints.h; sourceTree = "<group>"; };
-		624B9FB11AE0313300646C4C /* HTMLKitStringCategoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitStringCategoryTests.m; sourceTree = "<group>"; };
-		624B9FB41AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitOrderedDictionaryTests.m; sourceTree = "<group>"; };
-		624FC3791AE591D80015DDF9 /* HTMLKitNodesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitNodesTests.m; sourceTree = "<group>"; };
+		624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLStringCategoryTests.m; sourceTree = "<group>"; };
+		624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLOrderedDictionaryTests.m; sourceTree = "<group>"; };
+		624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLCharacterData.h; path = include/HTMLCharacterData.h; sourceTree = "<group>"; };
+		624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterData.m; sourceTree = "<group>"; };
+		624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLNodesTests.m; sourceTree = "<group>"; };
 		62567F4E1C0CB5750025D458 /* HTMLDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLDOMTokenList.h; path = include/HTMLDOMTokenList.h; sourceTree = "<group>"; };
 		62567F4F1C0CB5750025D458 /* HTMLDOMTokenList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLDOMTokenList.m; sourceTree = "<group>"; };
-		62567F551C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitDOMTokenListTests.m; sourceTree = "<group>"; };
+		62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLDOMTokenListTests.m; sourceTree = "<group>"; };
 		625A14AC19C7829400AD0C32 /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		625A14AF19C7829400AD0C32 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		625A14B219C7829400AD0C32 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -623,7 +678,7 @@
 		625A14B419C7829400AD0C32 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		625A14B719C7829400AD0C32 /* HTMLKit-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HTMLKit-Info.plist"; sourceTree = "<group>"; };
 		625A14BC19C7829400AD0C32 /* HTMLKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLKit.h; path = include/HTMLKit.h; sourceTree = "<group>"; };
-		625A14C319C7829400AD0C32 /* HTMLKitTests-OSX.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKitTests-OSX.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		625A14C319C7829400AD0C32 /* HTMLKitTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKitTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		625A14C419C7829400AD0C32 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		625A14CC19C7829400AD0C32 /* HTMLKitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HTMLKitTests-Info.plist"; sourceTree = "<group>"; };
 		625A14DF19C7834100AD0C32 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -635,6 +690,9 @@
 		625EE4591CBB171300F2CC8E /* HTMLKitTestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLKitTestUtil.h; sourceTree = "<group>"; };
 		625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitTestUtil.m; sourceTree = "<group>"; };
 		626652F81C03D30F00C3F121 /* HTMLKitErrorDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLKitErrorDomain.h; path = include/HTMLKitErrorDomain.h; sourceTree = "<group>"; };
+		626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLCharacterData+Private.h"; path = "include/HTMLCharacterData+Private.h"; sourceTree = "<group>"; };
+		626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLDOMUtils.h; path = include/HTMLDOMUtils.h; sourceTree = "<group>"; };
+		626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLDOMUtils.m; sourceTree = "<group>"; };
 		6279F87119E17DC700F12EE5 /* HTMLParserInsertionModes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLParserInsertionModes.h; path = include/HTMLParserInsertionModes.h; sourceTree = "<group>"; };
 		6279F87219E1808D00F12EE5 /* HTMLElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLElement.h; path = include/HTMLElement.h; sourceTree = "<group>"; };
 		6279F87319E1808D00F12EE5 /* HTMLElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLElement.m; sourceTree = "<group>"; };
@@ -661,8 +719,12 @@
 		62AE594819F9948A0043F069 /* HTMLCharacterToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterToken.m; sourceTree = "<group>"; };
 		62D8345719FB1AC4009205A9 /* HTML5LibTokenizerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTML5LibTokenizerTest.h; sourceTree = "<group>"; };
 		62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTML5LibTokenizerTest.m; sourceTree = "<group>"; };
+		62D91C211DE218A500BEFADE /* HTMLRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLRange.h; path = include/HTMLRange.h; sourceTree = "<group>"; };
+		62D91C221DE218A500BEFADE /* HTMLRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLRange.m; sourceTree = "<group>"; };
+		62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterDataTests.m; sourceTree = "<group>"; };
 		62E7CAAE19CDFFB500465A83 /* HTMLTokenizerCharacters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerCharacters.h; path = include/HTMLTokenizerCharacters.h; sourceTree = "<group>"; };
-		62EC7AE51AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLKitMutationAlgorithmsTests.m; sourceTree = "<group>"; };
+		62EC0A841E158BD80007786B /* HTMLRangeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLRangeTests.m; sourceTree = "<group>"; };
+		62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLMutationAlgorithmsTests.m; sourceTree = "<group>"; };
 		62ECBF4D1C0B6C7600AF847B /* HTMLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		62ECBF561C0B6C7600AF847B /* HTMLKitTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HTMLKitTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		62F31FDB19E9DCCF007F0657 /* HTMLTokenizerEntities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerEntities.h; path = include/HTMLTokenizerEntities.h; sourceTree = "<group>"; };
@@ -670,6 +732,7 @@
 		62F501631BC9576B0069F47B /* CSSNthExpressionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSNthExpressionParser.h; path = include/CSSNthExpressionParser.h; sourceTree = "<group>"; };
 		62F501641BC9576B0069F47B /* CSSNthExpressionParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNthExpressionParser.m; sourceTree = "<group>"; };
 		62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSNThExpressionSelectorTests.m; sourceTree = "<group>"; };
+		62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLRange+Private.h"; path = "include/HTMLRange+Private.h"; sourceTree = "<group>"; };
 		62F873E919E088C90062683C /* HTMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParser.h; path = include/HTMLParser.h; sourceTree = "<group>"; };
 		62F873EA19E088C90062683C /* HTMLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLParser.m; sourceTree = "<group>"; };
 		62FA04E11BCC360D009ABF98 /* CSSCombinatorSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSCombinatorSelector.h; path = include/CSSCombinatorSelector.h; sourceTree = "<group>"; };
@@ -776,6 +839,8 @@
 				623406E51ADB05AD004677A3 /* HTMLDocumentFragment.m */,
 				6279F87219E1808D00F12EE5 /* HTMLElement.h */,
 				6279F87319E1808D00F12EE5 /* HTMLElement.m */,
+				624C77781DE9D05E00DD6DFA /* HTMLCharacterData.h */,
+				624C77791DE9D05E00DD6DFA /* HTMLCharacterData.m */,
 				623857991A9E8934003A45D9 /* HTMLComment.h */,
 				6238579A1A9E8934003A45D9 /* HTMLComment.m */,
 				62362A3A1A9FA70400301989 /* HTMLText.h */,
@@ -788,10 +853,10 @@
 				6247A9421B152F4F00CCF25C /* HTMLNodeIterator.m */,
 				624717BA1B22009200B38302 /* HTMLTreeWalker.h */,
 				624717BB1B22009200B38302 /* HTMLTreeWalker.m */,
-				624717161B22333200C11912 /* HTMLNodeTraversal.h */,
-				624717171B22333200C11912 /* HTMLNodeTraversal.m */,
 				6247A9461B152F8C00CCF25C /* HTMLNodeFilter.h */,
 				624717B71B21FE5400B38302 /* HTMLNodeFilter.m */,
+				62D91C211DE218A500BEFADE /* HTMLRange.h */,
+				62D91C221DE218A500BEFADE /* HTMLRange.m */,
 				6238C9831AB8D6330006512E /* HTMLKitDOMExceptions.h */,
 				6238C9841AB8D6330006512E /* HTMLKitDOMExceptions.m */,
 				628B7CE61A080E1000602C87 /* HTMLNamespaces.h */,
@@ -815,10 +880,12 @@
 		624B9FB71AE072CB00646C4C /* DOM */ = {
 			isa = PBXGroup;
 			children = (
-				623916C61AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m */,
+				623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */,
 				6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */,
-				624FC3791AE591D80015DDF9 /* HTMLKitNodesTests.m */,
-				62EC7AE51AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m */,
+				624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */,
+				62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */,
+				62EC0A841E158BD80007786B /* HTMLRangeTests.m */,
+				62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */,
 			);
 			name = DOM;
 			sourceTree = "<group>";
@@ -826,7 +893,7 @@
 		624B9FB81AE072D500646C4C /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				624B9FB11AE0313300646C4C /* HTMLKitStringCategoryTests.m */,
+				624B9FB11AE0313300646C4C /* HTMLStringCategoryTests.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -834,8 +901,8 @@
 		624E1A2D1B1D1C8A00E66AAC /* Structures */ = {
 			isa = PBXGroup;
 			children = (
-				624B9FB41AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m */,
-				62567F551C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m */,
+				624B9FB41AE0391400646C4C /* HTMLOrderedDictionaryTests.m */,
+				62567F551C0CC3AE0025D458 /* HTMLDOMTokenListTests.m */,
 			);
 			name = Structures;
 			sourceTree = "<group>";
@@ -854,7 +921,7 @@
 			isa = PBXGroup;
 			children = (
 				625A14AC19C7829400AD0C32 /* HTMLKit.framework */,
-				625A14C319C7829400AD0C32 /* HTMLKitTests-OSX.xctest */,
+				625A14C319C7829400AD0C32 /* HTMLKitTests-macOS.xctest */,
 				62ECBF4D1C0B6C7600AF847B /* HTMLKit.framework */,
 				62ECBF561C0B6C7600AF847B /* HTMLKitTests-iOS.xctest */,
 				62857C4E1D398642008DC254 /* HTMLKit.framework */,
@@ -912,6 +979,10 @@
 		625A14CA19C7829400AD0C32 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				625EE4551CBAA41D00F2CC8E /* HTMLKitTestObserver.h */,
+				625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */,
+				625EE4591CBB171300F2CC8E /* HTMLKitTestUtil.h */,
+				625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */,
 				6236738C1AC0CD2400FF89B3 /* Tokenizer */,
 				623975581AC362A5007E26F1 /* Tree Construction */,
 				624B9FB71AE072CB00646C4C /* DOM */,
@@ -919,10 +990,6 @@
 				624E1A2D1B1D1C8A00E66AAC /* Structures */,
 				62FF516C1C0A430A009BFDFE /* Selectors */,
 				625A14CB19C7829400AD0C32 /* Supporting Files */,
-				625EE4551CBAA41D00F2CC8E /* HTMLKitTestObserver.h */,
-				625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */,
-				625EE4591CBB171300F2CC8E /* HTMLKitTestUtil.h */,
-				625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -941,7 +1008,16 @@
 		625D0F071C2717E400D7BEB0 /* Private */ = {
 			isa = PBXGroup;
 			children = (
+				621CC48F1DEA704000D1992A /* HTMLDocument+Private.h */,
 				625D0F011C2717DE00D7BEB0 /* HTMLNode+Private.h */,
+				626679CD1DEA3DAF004353E7 /* HTMLCharacterData+Private.h */,
+				62F7E5A01DEB63F900DEF09B /* HTMLRange+Private.h */,
+				621CC4A31DEA721A00D1992A /* HTMLParser+Private.h */,
+				62056C4E1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h */,
+				624717161B22333200C11912 /* HTMLNodeTraversal.h */,
+				624717171B22333200C11912 /* HTMLNodeTraversal.m */,
+				626BE1E01DF3819500C49514 /* HTMLDOMUtils.h */,
+				626BE1E11DF3819500C49514 /* HTMLDOMUtils.m */,
 			);
 			name = Private;
 			sourceTree = "<group>";
@@ -1081,6 +1157,7 @@
 				62ECBEE21C0B69FD00AF847B /* HTMLInputStreamReader.h in Headers */,
 				62ECBEE31C0B69FD00AF847B /* HTMLTokenizer.h in Headers */,
 				62ECBEE41C0B69FD00AF847B /* HTMLTokenizerStates.h in Headers */,
+				62D91C231DE218A500BEFADE /* HTMLRange.h in Headers */,
 				62ECBEE51C0B69FD00AF847B /* HTMLTokenizerCharacters.h in Headers */,
 				62ECBEE61C0B69FD00AF847B /* HTMLTokenizerEntities.h in Headers */,
 				625D0F031C2717DE00D7BEB0 /* HTMLNode+Private.h in Headers */,
@@ -1090,19 +1167,24 @@
 				62ECBEE91C0B69FD00AF847B /* HTMLCharacterToken.h in Headers */,
 				62ECBEEA1C0B69FD00AF847B /* HTMLCommentToken.h in Headers */,
 				62ECBEEB1C0B69FD00AF847B /* HTMLDOCTYPEToken.h in Headers */,
+				626BE1E21DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				62ECBEEC1C0B69FD00AF847B /* HTMLParseErrorToken.h in Headers */,
 				62ECBEED1C0B69FD00AF847B /* HTMLTagToken.h in Headers */,
 				62ECBEEE1C0B69FD00AF847B /* HTMLEOFToken.h in Headers */,
 				62567F501C0CB5750025D458 /* HTMLDOMTokenList.h in Headers */,
+				626679CF1DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */,
+				621CC4911DEA704000D1992A /* HTMLDocument+Private.h in Headers */,
 				62ECBEEF1C0B69FD00AF847B /* HTMLParser.h in Headers */,
 				62ECBEF01C0B69FD00AF847B /* HTMLStackOfOpenElements.h in Headers */,
 				62ECBEF11C0B69FD00AF847B /* HTMLListOfActiveFormattingElements.h in Headers */,
 				62ECBEF21C0B69FD00AF847B /* HTMLElementTypes.h in Headers */,
 				62ECBEF31C0B69FD00AF847B /* HTMLElementAdjustment.h in Headers */,
 				62ECBEF41C0B69FD00AF847B /* HTMLParserInsertionModes.h in Headers */,
+				624C777A1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62ECBEF51C0B69FD00AF847B /* HTMLMarker.h in Headers */,
 				62ECBEF61C0B69FE00AF847B /* HTMLDOM.h in Headers */,
 				62ECBEF71C0B69FE00AF847B /* HTMLNode.h in Headers */,
+				621CC4A51DEA721A00D1992A /* HTMLParser+Private.h in Headers */,
 				62ECBEF81C0B69FE00AF847B /* HTMLDocument.h in Headers */,
 				62ECBEF91C0B69FE00AF847B /* HTMLDocumentType.h in Headers */,
 				62ECBEFA1C0B69FE00AF847B /* HTMLDocumentFragment.h in Headers */,
@@ -1112,6 +1194,7 @@
 				62ECBEFF1C0B69FE00AF847B /* HTMLNodeIterator.h in Headers */,
 				62ECBF001C0B69FF00AF847B /* HTMLTreeWalker.h in Headers */,
 				62ECBF011C0B69FF00AF847B /* HTMLNodeTraversal.h in Headers */,
+				62F7E5A21DEB63F900DEF09B /* HTMLRange+Private.h in Headers */,
 				62ECBF021C0B69FF00AF847B /* HTMLNodeFilter.h in Headers */,
 				62ECBF031C0B69FF00AF847B /* HTMLKitDOMExceptions.h in Headers */,
 				62ECBF041C0B69FF00AF847B /* HTMLNamespaces.h in Headers */,
@@ -1129,6 +1212,7 @@
 				62ECBF101C0B6A0100AF847B /* CSSSelectorBlock.h in Headers */,
 				62ECBF111C0B6A0200AF847B /* CSSTypeSelector.h in Headers */,
 				62ECBF121C0B6A0200AF847B /* CSSAttributeSelector.h in Headers */,
+				62056C4F1E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */,
 				62ECBF131C0B6A0200AF847B /* CSSPseudoClassSelector.h in Headers */,
 				62ECBF141C0B6A0200AF847B /* CSSNthExpressionSelector.h in Headers */,
 				62ECBF151C0B6A0200AF847B /* CSSPseudoFunctionSelector.h in Headers */,
@@ -1141,11 +1225,13 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62F7E5A51DEB63F900DEF09B /* HTMLRange+Private.h in Headers */,
 				62857CBE1D398999008DC254 /* NSString+HTMLKit.h in Headers */,
 				62857CAC1D398973008DC254 /* HTMLKitDOMExceptions.h in Headers */,
 				62857CD61D3989C2008DC254 /* CSSSelectorParser.h in Headers */,
 				62857CAA1D398973008DC254 /* HTMLTreeWalker.h in Headers */,
 				62857CA31D398973008DC254 /* HTMLDocumentType.h in Headers */,
+				62D91C261DE218A500BEFADE /* HTMLRange.h in Headers */,
 				62857C6B1D3988EE008DC254 /* HTMLKit.h in Headers */,
 				62857C701D398907008DC254 /* HTMLTokenizerCharacters.h in Headers */,
 				62857C6F1D398907008DC254 /* HTMLTokenizerStates.h in Headers */,
@@ -1155,19 +1241,24 @@
 				62857C841D398917008DC254 /* HTMLParser.h in Headers */,
 				62857CDB1D3989CE008DC254 /* CSSAttributeSelector.h in Headers */,
 				62857C791D398907008DC254 /* HTMLEOFToken.h in Headers */,
+				626BE1E51DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				62857CC41D3989A9008DC254 /* CSSSelectors.h in Headers */,
 				62857C731D398907008DC254 /* HTMLToken.h in Headers */,
 				62857CC51D3989AB008DC254 /* CSSStructuralPseudoSelectors.h in Headers */,
 				62857CDE1D3989CE008DC254 /* CSSPseudoFunctionSelector.h in Headers */,
+				626679D21DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */,
+				621CC4941DEA704000D1992A /* HTMLDocument+Private.h in Headers */,
 				62857CAB1D398973008DC254 /* HTMLNodeFilter.h in Headers */,
 				62857CA61D398973008DC254 /* HTMLText.h in Headers */,
 				62857C751D398907008DC254 /* HTMLCommentToken.h in Headers */,
 				62857C891D398927008DC254 /* HTMLParserInsertionModes.h in Headers */,
 				62857CA81D398973008DC254 /* HTMLDOMTokenList.h in Headers */,
 				62857C851D398927008DC254 /* HTMLStackOfOpenElements.h in Headers */,
+				624C777D1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62857CDF1D3989CE008DC254 /* CSSCombinatorSelector.h in Headers */,
 				62857CA91D398973008DC254 /* HTMLNodeIterator.h in Headers */,
 				62857CAE1D398973008DC254 /* HTMLQuirksMode.h in Headers */,
+				621CC4A81DEA721A00D1992A /* HTMLParser+Private.h in Headers */,
 				62857CAF1D398977008DC254 /* HTMLNodeTraversal.h in Headers */,
 				62857C771D398907008DC254 /* HTMLParseErrorToken.h in Headers */,
 				62857CDC1D3989CE008DC254 /* CSSPseudoClassSelector.h in Headers */,
@@ -1194,6 +1285,7 @@
 				62857CD41D3989BF008DC254 /* CSSCodePoints.h in Headers */,
 				62857C871D398927008DC254 /* HTMLElementTypes.h in Headers */,
 				62857C711D398907008DC254 /* HTMLTokenizerEntities.h in Headers */,
+				62056C521E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */,
 				62857C6C1D3988EE008DC254 /* HTMLKitErrorDomain.h in Headers */,
 				62857CD51D3989BF008DC254 /* CSSInputStream.h in Headers */,
 				62857C741D398907008DC254 /* HTMLCharacterToken.h in Headers */,
@@ -1206,11 +1298,13 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62F7E5A41DEB63F900DEF09B /* HTMLRange+Private.h in Headers */,
 				62857D831D39A46D008DC254 /* CSSStructuralPseudoSelectors.h in Headers */,
 				62857D7D1D39A457008DC254 /* HTMLNodeTraversal.h in Headers */,
 				62857D841D39A472008DC254 /* CSSSelectorParser.h in Headers */,
 				62857D7F1D39A461008DC254 /* NSString+HTMLKit.h in Headers */,
 				62857D7E1D39A45B008DC254 /* HTMLNode+Private.h in Headers */,
+				62D91C251DE218A500BEFADE /* HTMLRange.h in Headers */,
 				62857D701D39A44E008DC254 /* HTMLDocumentType.h in Headers */,
 				62857D861D39A476008DC254 /* CSSCodePoints.h in Headers */,
 				62857D8A1D39A47F008DC254 /* CSSTypeSelector.h in Headers */,
@@ -1220,19 +1314,24 @@
 				62857D4E1D39A40A008DC254 /* HTMLTokenizerCharacters.h in Headers */,
 				62857D4D1D39A40A008DC254 /* HTMLTokenizerStates.h in Headers */,
 				62857D501D39A411008DC254 /* HTMLTokens.h in Headers */,
+				626BE1E41DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				62857D7B1D39A452008DC254 /* HTMLNamespaces.h in Headers */,
 				62857D581D39A416008DC254 /* HTMLParser.h in Headers */,
 				62857D571D39A411008DC254 /* HTMLEOFToken.h in Headers */,
 				62857D8E1D39A47F008DC254 /* CSSPseudoFunctionSelector.h in Headers */,
+				626679D11DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */,
+				621CC4931DEA704000D1992A /* HTMLDocument+Private.h in Headers */,
 				62857D511D39A411008DC254 /* HTMLToken.h in Headers */,
 				62857D531D39A411008DC254 /* HTMLCommentToken.h in Headers */,
 				62857D741D39A44E008DC254 /* HTMLText.h in Headers */,
 				62857D5D1D39A41D008DC254 /* HTMLParserInsertionModes.h in Headers */,
 				62857D591D39A41D008DC254 /* HTMLStackOfOpenElements.h in Headers */,
 				62857D781D39A44E008DC254 /* HTMLTreeWalker.h in Headers */,
+				624C777C1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62857D551D39A411008DC254 /* HTMLParseErrorToken.h in Headers */,
 				62857D541D39A411008DC254 /* HTMLDOCTYPEToken.h in Headers */,
 				62857D871D39A476008DC254 /* CSSInputStream.h in Headers */,
+				621CC4A71DEA721A00D1992A /* HTMLParser+Private.h in Headers */,
 				62857D8F1D39A47F008DC254 /* CSSCombinatorSelector.h in Headers */,
 				62857D5C1D39A41D008DC254 /* HTMLElementAdjustment.h in Headers */,
 				62857D891D39A47F008DC254 /* CSSSelectorBlock.h in Headers */,
@@ -1259,6 +1358,7 @@
 				62857D881D39A47F008DC254 /* CSSSelector.h in Headers */,
 				62857D4F1D39A40A008DC254 /* HTMLTokenizerEntities.h in Headers */,
 				62857D901D39A47F008DC254 /* CSSCompoundSelector.h in Headers */,
+				62056C511E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */,
 				62857D4A1D39A3F4008DC254 /* HTMLKitErrorDomain.h in Headers */,
 				62857D7C1D39A452008DC254 /* HTMLQuirksMode.h in Headers */,
 				62857D791D39A44E008DC254 /* HTMLNodeFilter.h in Headers */,
@@ -1276,6 +1376,7 @@
 				62ECBF9F1C0B6D3900AF847B /* HTMLParser.h in Headers */,
 				62ECBFA61C0B6D3A00AF847B /* HTMLDOM.h in Headers */,
 				62ECBFA71C0B6D3A00AF847B /* HTMLNode.h in Headers */,
+				62D91C241DE218A500BEFADE /* HTMLRange.h in Headers */,
 				62ECBFA81C0B6D3A00AF847B /* HTMLDocument.h in Headers */,
 				62ECBFA91C0B6D3A00AF847B /* HTMLDocumentType.h in Headers */,
 				62ECBFAA1C0B6D3A00AF847B /* HTMLDocumentFragment.h in Headers */,
@@ -1289,15 +1390,19 @@
 				62567F511C0CB5750025D458 /* HTMLDOMTokenList.h in Headers */,
 				62ECBFB31C0B6D3C00AF847B /* HTMLKitDOMExceptions.h in Headers */,
 				62ECBFB41C0B6D3D00AF847B /* HTMLNamespaces.h in Headers */,
+				626679D01DEA3DAF004353E7 /* HTMLCharacterData+Private.h in Headers */,
+				621CC4921DEA704000D1992A /* HTMLDocument+Private.h in Headers */,
 				62ECBFB51C0B6D3D00AF847B /* HTMLQuirksMode.h in Headers */,
 				62ECBFB61C0B6D3D00AF847B /* NSString+HTMLKit.h in Headers */,
 				62ECBFB71C0B6D3D00AF847B /* NSCharacterSet+HTMLKit.h in Headers */,
 				62ECBFB81C0B6D3E00AF847B /* HTMLOrderedDictionary.h in Headers */,
 				62ECBFB91C0B6D3E00AF847B /* CSSSelectors.h in Headers */,
 				62ECBFBA1C0B6D3E00AF847B /* CSSStructuralPseudoSelectors.h in Headers */,
+				624C777B1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62ECBFBD1C0B6D3F00AF847B /* CSSSelectorParser.h in Headers */,
 				62ECBFBE1C0B6D4000AF847B /* CSSNthExpressionParser.h in Headers */,
 				62ECBFBF1C0B6D4000AF847B /* CSSSelector.h in Headers */,
+				621CC4A61DEA721A00D1992A /* HTMLParser+Private.h in Headers */,
 				62ECBFC01C0B6D4000AF847B /* CSSSelectorBlock.h in Headers */,
 				62ECBFC11C0B6D4100AF847B /* CSSTypeSelector.h in Headers */,
 				62ECBFC21C0B6D4100AF847B /* CSSAttributeSelector.h in Headers */,
@@ -1305,6 +1410,8 @@
 				62ECBFC41C0B6D4200AF847B /* CSSNthExpressionSelector.h in Headers */,
 				62ECBFC51C0B6D4200AF847B /* CSSPseudoFunctionSelector.h in Headers */,
 				62ECBFC61C0B6D4300AF847B /* CSSCombinatorSelector.h in Headers */,
+				62F7E5A31DEB63F900DEF09B /* HTMLRange+Private.h in Headers */,
+				626BE1E31DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				625D0F041C2717DE00D7BEB0 /* HTMLNode+Private.h in Headers */,
 				62ECBFC71C0B6D4300AF847B /* CSSCompoundSelector.h in Headers */,
 				62ECBFB11C0B6D3C00AF847B /* HTMLNodeTraversal.h in Headers */,
@@ -1324,6 +1431,7 @@
 				62ECBFA01C0B6D3900AF847B /* HTMLStackOfOpenElements.h in Headers */,
 				62ECBFA11C0B6D3900AF847B /* HTMLListOfActiveFormattingElements.h in Headers */,
 				62ECBFA21C0B6D3900AF847B /* HTMLElementTypes.h in Headers */,
+				62056C501E2AD9FB009A4EE0 /* HTMLNodeIterator+Private.h in Headers */,
 				62ECBFA31C0B6D3900AF847B /* HTMLElementAdjustment.h in Headers */,
 				62ECBFA41C0B6D3900AF847B /* HTMLParserInsertionModes.h in Headers */,
 				62ECBFA51C0B6D3900AF847B /* HTMLMarker.h in Headers */,
@@ -1335,9 +1443,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		625A14AB19C7829400AD0C32 /* HTMLKit-OSX */ = {
+		625A14AB19C7829400AD0C32 /* HTMLKit-macOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 625A14D419C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKit-OSX" */;
+			buildConfigurationList = 625A14D419C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKit-macOS" */;
 			buildPhases = (
 				625A14A719C7829400AD0C32 /* Sources */,
 				625A14A819C7829400AD0C32 /* Frameworks */,
@@ -1348,14 +1456,14 @@
 			);
 			dependencies = (
 			);
-			name = "HTMLKit-OSX";
+			name = "HTMLKit-macOS";
 			productName = HTMLKit;
 			productReference = 625A14AC19C7829400AD0C32 /* HTMLKit.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		625A14C219C7829400AD0C32 /* HTMLKitTests-OSX */ = {
+		625A14C219C7829400AD0C32 /* HTMLKitTests-macOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 625A14D719C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKitTests-OSX" */;
+			buildConfigurationList = 625A14D719C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKitTests-macOS" */;
 			buildPhases = (
 				625A14BF19C7829400AD0C32 /* Sources */,
 				625A14C019C7829400AD0C32 /* Frameworks */,
@@ -1366,9 +1474,9 @@
 			dependencies = (
 				625A14C819C7829400AD0C32 /* PBXTargetDependency */,
 			);
-			name = "HTMLKitTests-OSX";
+			name = "HTMLKitTests-macOS";
 			productName = HTMLKitTests;
-			productReference = 625A14C319C7829400AD0C32 /* HTMLKitTests-OSX.xctest */;
+			productReference = 625A14C319C7829400AD0C32 /* HTMLKitTests-macOS.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		62857C4D1D398642008DC254 /* HTMLKit-watchOS */ = {
@@ -1467,7 +1575,7 @@
 		625A14A319C7829400AD0C32 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = BrainCookie;
 				TargetAttributes = {
 					625A14C219C7829400AD0C32 = {
@@ -1506,8 +1614,8 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				625A14AB19C7829400AD0C32 /* HTMLKit-OSX */,
-				625A14C219C7829400AD0C32 /* HTMLKitTests-OSX */,
+				625A14AB19C7829400AD0C32 /* HTMLKit-macOS */,
+				625A14C219C7829400AD0C32 /* HTMLKitTests-macOS */,
 				62ECBF4C1C0B6C7600AF847B /* HTMLKit-iOS */,
 				62ECBF551C0B6C7600AF847B /* HTMLKitTests-iOS */,
 				62857CE91D39A262008DC254 /* HTMLKit-tvOS */,
@@ -1591,6 +1699,7 @@
 				62ECBF211C0B6B7900AF847B /* HTMLCommentToken.m in Sources */,
 				62ECBF221C0B6B7900AF847B /* HTMLDOCTYPEToken.m in Sources */,
 				62ECBF231C0B6B7900AF847B /* HTMLParseErrorToken.m in Sources */,
+				62D91C271DE218A500BEFADE /* HTMLRange.m in Sources */,
 				62ECBF241C0B6B7900AF847B /* HTMLTagToken.m in Sources */,
 				62ECBF251C0B6B7900AF847B /* HTMLEOFToken.m in Sources */,
 				62ECBF261C0B6B7900AF847B /* HTMLParser.m in Sources */,
@@ -1628,6 +1737,8 @@
 				62ECBF461C0B6B7900AF847B /* CSSCombinatorSelector.m in Sources */,
 				62ECBF471C0B6B7A00AF847B /* CSSCompoundSelector.m in Sources */,
 				62567F521C0CB5750025D458 /* HTMLDOMTokenList.m in Sources */,
+				624C777E1DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */,
+				626BE1E61DF3819600C49514 /* HTMLDOMUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1635,6 +1746,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62EC0A851E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				62E0BA971E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				6216ACFD1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */,
 				62132E5A1C01F83200084175 /* CSSSelectorTest.m in Sources */,
 				6239755B1AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m in Sources */,
@@ -1642,18 +1755,18 @@
 				623CAF9E1AD88BEA00E34C32 /* HTMLKitParserPerformance.m in Sources */,
 				625EE4571CBAA41D00F2CC8E /* HTMLKitTestObserver.m in Sources */,
 				6247171D1B2240B800C11912 /* HTMLTreeWalkerTests.m in Sources */,
-				62EC7AE71AEEAC6F0015D3BE /* HTMLKitMutationAlgorithmsTests.m in Sources */,
+				62EC7AE71AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m in Sources */,
 				624AB31B1B050A4D00F3830D /* CSSAttributeSelectorTests.m in Sources */,
-				624B9FB61AE0391400646C4C /* HTMLKitOrderedDictionaryTests.m in Sources */,
+				624B9FB61AE0391400646C4C /* HTMLOrderedDictionaryTests.m in Sources */,
 				624AB3181B0508AE00F3830D /* CSSTypeSelectorTests.m in Sources */,
 				6236738F1AC0CE2500FF89B3 /* HTMLKitTokenizerPerformance.m in Sources */,
-				62567F561C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m in Sources */,
+				62567F561C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */,
 				624AC90219FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m in Sources */,
-				624B9FB31AE0313300646C4C /* HTMLKitStringCategoryTests.m in Sources */,
-				623916C81AC7209E0066B4FE /* HTMLKitNodeIteratorTests.m in Sources */,
+				624B9FB31AE0313300646C4C /* HTMLStringCategoryTests.m in Sources */,
+				623916C81AC7209E0066B4FE /* HTMLNodeIteratorTests.m in Sources */,
 				62D8345A19FB1AC4009205A9 /* HTML5LibTokenizerTest.m in Sources */,
 				6239755F1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m in Sources */,
-				624FC37B1AE591D80015DDF9 /* HTMLKitNodesTests.m in Sources */,
+				624FC37B1AE591D80015DDF9 /* HTMLNodesTests.m in Sources */,
 				621FBE5B1BDAD68700BC9555 /* CSSSelectorParserTests.m in Sources */,
 				621FBE5E1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m in Sources */,
 				625EE45B1CBB171300F2CC8E /* HTMLKitTestUtil.m in Sources */,
@@ -1673,6 +1786,7 @@
 				62857CCB1D3989B8008DC254 /* CSSSelector.m in Sources */,
 				62857C8B1D39892D008DC254 /* HTMLParser.m in Sources */,
 				62857CC61D3989AF008DC254 /* CSSSelectors.m in Sources */,
+				62D91C2A1DE218A500BEFADE /* HTMLRange.m in Sources */,
 				62857CD31D3989B8008DC254 /* CSSCompoundSelector.m in Sources */,
 				62857C7B1D398912008DC254 /* HTMLTokenizer.m in Sources */,
 				62857CB21D398992008DC254 /* HTMLDocument.m in Sources */,
@@ -1710,6 +1824,8 @@
 				62857CD01D3989B8008DC254 /* CSSNthExpressionSelector.m in Sources */,
 				62857CB81D398992008DC254 /* HTMLDOMTokenList.m in Sources */,
 				62857C831D398912008DC254 /* HTMLEOFToken.m in Sources */,
+				624C77811DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */,
+				626BE1E91DF3819600C49514 /* HTMLDOMUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1725,6 +1841,7 @@
 				62857D251D39A334008DC254 /* CSSSelector.m in Sources */,
 				62857D021D39A324008DC254 /* HTMLTokenizer.m in Sources */,
 				62857D201D39A334008DC254 /* CSSSelectors.m in Sources */,
+				62D91C291DE218A500BEFADE /* HTMLRange.m in Sources */,
 				62857D2D1D39A334008DC254 /* CSSCompoundSelector.m in Sources */,
 				62857D061D39A324008DC254 /* HTMLCommentToken.m in Sources */,
 				62857D111D39A32A008DC254 /* HTMLDocumentType.m in Sources */,
@@ -1762,6 +1879,8 @@
 				62857D2A1D39A334008DC254 /* CSSNthExpressionSelector.m in Sources */,
 				62857D171D39A32A008DC254 /* HTMLDOMTokenList.m in Sources */,
 				62857D0A1D39A324008DC254 /* HTMLEOFToken.m in Sources */,
+				624C77801DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */,
+				626BE1E81DF3819600C49514 /* HTMLDOMUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1769,25 +1888,27 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62EC0A871E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				62E0BA991E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				62857D3B1D39A345008DC254 /* CSSSelectorTest.m in Sources */,
 				62857D421D39A345008DC254 /* CSSCombinatorSelectorTests.m in Sources */,
 				62857D3C1D39A345008DC254 /* CSSSelectorParserTests.m in Sources */,
 				62857D301D39A339008DC254 /* HTMLKitTokenizerPerformance.m in Sources */,
 				62857D321D39A33C008DC254 /* HTMLKitTreeConstructionTests.m in Sources */,
 				62857D431D39A34B008DC254 /* HTMLKitTestObserver.m in Sources */,
-				62857D371D39A33F008DC254 /* HTMLKitMutationAlgorithmsTests.m in Sources */,
+				62857D371D39A33F008DC254 /* HTMLMutationAlgorithmsTests.m in Sources */,
 				62857D3E1D39A345008DC254 /* CSSNthExpressionsParserTests.m in Sources */,
 				62857D3F1D39A345008DC254 /* CSSTypeSelectorTests.m in Sources */,
-				62857D361D39A33F008DC254 /* HTMLKitNodesTests.m in Sources */,
-				62857D3A1D39A342008DC254 /* HTMLKitDOMTokenListTests.m in Sources */,
+				62857D361D39A33F008DC254 /* HTMLNodesTests.m in Sources */,
+				62857D3A1D39A342008DC254 /* HTMLDOMTokenListTests.m in Sources */,
 				62857D3D1D39A345008DC254 /* CSSExtensionSelectorsParsingTests.m in Sources */,
 				62857D401D39A345008DC254 /* CSSAttributeSelectorTests.m in Sources */,
 				62857D311D39A33C008DC254 /* HTML5LibTreeConstructionTest.m in Sources */,
-				62857D391D39A342008DC254 /* HTMLKitOrderedDictionaryTests.m in Sources */,
+				62857D391D39A342008DC254 /* HTMLOrderedDictionaryTests.m in Sources */,
 				62857D411D39A345008DC254 /* CSSNThExpressionSelectorTests.m in Sources */,
-				62857D381D39A342008DC254 /* HTMLKitStringCategoryTests.m in Sources */,
+				62857D381D39A342008DC254 /* HTMLStringCategoryTests.m in Sources */,
 				62857D331D39A33C008DC254 /* HTMLKitParserPerformance.m in Sources */,
-				62857D341D39A33F008DC254 /* HTMLKitNodeIteratorTests.m in Sources */,
+				62857D341D39A33F008DC254 /* HTMLNodeIteratorTests.m in Sources */,
 				62857D2E1D39A339008DC254 /* HTML5LibTokenizerTest.m in Sources */,
 				62857D351D39A33F008DC254 /* HTMLTreeWalkerTests.m in Sources */,
 				62857D441D39A34D008DC254 /* HTMLKitTestUtil.m in Sources */,
@@ -1807,6 +1928,7 @@
 				62ECBF691C0B6D2A00AF847B /* HTMLCommentToken.m in Sources */,
 				62ECBF6A1C0B6D2A00AF847B /* HTMLDOCTYPEToken.m in Sources */,
 				62ECBF6B1C0B6D2A00AF847B /* HTMLParseErrorToken.m in Sources */,
+				62D91C281DE218A500BEFADE /* HTMLRange.m in Sources */,
 				62ECBF6C1C0B6D2A00AF847B /* HTMLTagToken.m in Sources */,
 				62ECBF6D1C0B6D2A00AF847B /* HTMLEOFToken.m in Sources */,
 				62ECBF6E1C0B6D2A00AF847B /* HTMLParser.m in Sources */,
@@ -1844,6 +1966,8 @@
 				62ECBF8E1C0B6D2A00AF847B /* CSSCombinatorSelector.m in Sources */,
 				62ECBF8F1C0B6D2A00AF847B /* CSSCompoundSelector.m in Sources */,
 				62567F531C0CB5750025D458 /* HTMLDOMTokenList.m in Sources */,
+				624C777F1DE9D05E00DD6DFA /* HTMLCharacterData.m in Sources */,
+				626BE1E71DF3819600C49514 /* HTMLDOMUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1851,6 +1975,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				62EC0A861E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				62E0BA981E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				6216ACFE1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */,
 				62ECBFCA1C0B6E2E00AF847B /* HTML5LibTokenizerTest.m in Sources */,
 				62ECBFCB1C0B6E2E00AF847B /* HTMLKitTokenizerTests.m in Sources */,
@@ -1859,13 +1985,13 @@
 				625EE4581CBAA41D00F2CC8E /* HTMLKitTestObserver.m in Sources */,
 				62ECBFCE1C0B6E2E00AF847B /* HTMLKitTreeConstructionTests.m in Sources */,
 				62ECBFCF1C0B6E2E00AF847B /* HTMLKitParserPerformance.m in Sources */,
-				62ECBFD01C0B6E2E00AF847B /* HTMLKitNodeIteratorTests.m in Sources */,
+				62ECBFD01C0B6E2E00AF847B /* HTMLNodeIteratorTests.m in Sources */,
 				62ECBFD11C0B6E2E00AF847B /* HTMLTreeWalkerTests.m in Sources */,
-				62ECBFD21C0B6E2E00AF847B /* HTMLKitNodesTests.m in Sources */,
-				62ECBFD31C0B6E2E00AF847B /* HTMLKitMutationAlgorithmsTests.m in Sources */,
-				62567F571C0CC3AE0025D458 /* HTMLKitDOMTokenListTests.m in Sources */,
-				62ECBFD41C0B6E2E00AF847B /* HTMLKitStringCategoryTests.m in Sources */,
-				62ECBFD51C0B6E2E00AF847B /* HTMLKitOrderedDictionaryTests.m in Sources */,
+				62ECBFD21C0B6E2E00AF847B /* HTMLNodesTests.m in Sources */,
+				62ECBFD31C0B6E2E00AF847B /* HTMLMutationAlgorithmsTests.m in Sources */,
+				62567F571C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */,
+				62ECBFD41C0B6E2E00AF847B /* HTMLStringCategoryTests.m in Sources */,
+				62ECBFD51C0B6E2E00AF847B /* HTMLOrderedDictionaryTests.m in Sources */,
 				62ECBFD61C0B6E2E00AF847B /* CSSSelectorTest.m in Sources */,
 				62ECBFD71C0B6E2E00AF847B /* CSSSelectorParserTests.m in Sources */,
 				62ECBFD81C0B6E2E00AF847B /* CSSNthExpressionsParserTests.m in Sources */,
@@ -1882,7 +2008,7 @@
 /* Begin PBXTargetDependency section */
 		625A14C819C7829400AD0C32 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 625A14AB19C7829400AD0C32 /* HTMLKit-OSX */;
+			target = 625A14AB19C7829400AD0C32 /* HTMLKit-macOS */;
 			targetProxy = 625A14C719C7829400AD0C32 /* PBXContainerItemProxy */;
 		};
 		62857CF61D39A262008DC254 /* PBXTargetDependency */ = {
@@ -1911,14 +2037,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1950,14 +2081,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1983,8 +2119,11 @@
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Debug;
@@ -2003,8 +2142,11 @@
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.iabudiab.HTMLKit;
 				PRODUCT_NAME = HTMLKit;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Release;
@@ -2025,9 +2167,12 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 				WRAPPER_EXTENSION = xctest;
 			};
 			name = Debug;
@@ -2044,9 +2189,12 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 				WRAPPER_EXTENSION = xctest;
 			};
 			name = Release;
@@ -2057,6 +2205,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
@@ -2091,6 +2240,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2127,6 +2277,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
@@ -2161,6 +2312,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2198,12 +2350,14 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -2216,13 +2370,15 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.2;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -2231,7 +2387,7 @@
 			buildSettings = {
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
@@ -2255,8 +2411,10 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -2265,7 +2423,7 @@
 			buildSettings = {
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2289,9 +2447,11 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -2304,12 +2464,14 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -2322,13 +2484,15 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Tests/HTMLKitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.iabudiab.HTMLKit-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -2344,7 +2508,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		625A14D419C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKit-OSX" */ = {
+		625A14D419C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKit-macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				625A14D519C7829400AD0C32 /* Debug */,
@@ -2353,7 +2517,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		625A14D719C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKitTests-OSX" */ = {
+		625A14D719C7829400AD0C32 /* Build configuration list for PBXNativeTarget "HTMLKitTests-macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				625A14D819C7829400AD0C32 /* Debug */,

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "625A14AB19C7829400AD0C32"
                BuildableName = "HTMLKit.framework"
-               BlueprintName = "HTMLKit-OSX"
+               BlueprintName = "HTMLKit-macOS"
                ReferencedContainer = "container:HTMLKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,15 +26,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "625A14C219C7829400AD0C32"
-               BuildableName = "HTMLKitTests-OSX.xctest"
-               BlueprintName = "HTMLKitTests-OSX"
+               BuildableName = "HTMLKitTests-macOS.xctest"
+               BlueprintName = "HTMLKitTests-macOS"
                ReferencedContainer = "container:HTMLKit.xcodeproj">
             </BuildableReference>
             <SkippedTests>
@@ -58,7 +59,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "625A14AB19C7829400AD0C32"
             BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-OSX"
+            BlueprintName = "HTMLKit-macOS"
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,7 +81,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "625A14AB19C7829400AD0C32"
             BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-OSX"
+            BlueprintName = "HTMLKit-macOS"
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -98,7 +99,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "625A14AB19C7829400AD0C32"
             BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-OSX"
+            BlueprintName = "HTMLKit-macOS"
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
       <AdditionalOptions>

HTMLKit.xcworkspace/contents.xcworkspacedata

@@ -7,4 +7,7 @@
    <FileRef
       location = "group:HTMLKit.playground">
    </FileRef>
+   <FileRef
+      location = "group:Example/HTMLKitExample/HTMLKitExample.xcodeproj">
+   </FileRef>
 </Workspace>

README.md

@@ -4,13 +4,19 @@
 
 An Objective-C framework for your everyday HTML needs.
 
-[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/master.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/develop.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/HTMLKit.svg?style=flat)](https://cocoapods.org/pods/HTMLKit)
 [![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/HTMLKit.svg?style=flat)](http://cocoadocs.org/docsets/HTMLKit)
 [![Platform](https://img.shields.io/cocoapods/p/HTMLKit.svg?style=flat)](http://cocoadocs.org/docsets/HTMLKit)
 [![License MIT](https://img.shields.io/badge/license-MIT-4481C7.svg?style=flat)](https://opensource.org/licenses/MIT)
 
+- [Quick Overview](#overview)
+- [Installation](#installation)
+- [Parsing](#parsing)
+- [The DOM](#the-dom)
+- [CSS3 Selectors](#css3-selectors)
+
 # Quick Overview
 
 HTMLKit is a [WHATWG specification](https://html.spec.whatwg.org/multipage/)-compliant framework for parsing and serializing HTML documents and document fragments for iOS and OSX. HTMLKit parses real-world HTML the same way modern web browsers would.
@@ -33,7 +39,7 @@ Check out the playground!
 
 # Installation
 
-### Carthage
+## Carthage
 
 [Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
 
@@ -56,7 +62,7 @@ Then run the following command to build the framework and drag the built `HTMLKi
 $ carthage update
 ```
 
-### CocoaPods
+## CocoaPods
 
 [CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects.
 
@@ -72,7 +78,7 @@ To add `HTMLKit` as a dependency into your project using CocoaPods just add the
 use_frameworks!
 
 target 'MyTarget' do
-  pod 'HTMLKit', '~> 0.9'
+  pod 'HTMLKit', '~> 1.1'
 end
 ```
 
@@ -82,14 +88,14 @@ Then, run the following command:
 $ pod install
 ```
 
-### Swift Package Manager
+## Swift Package Manager
 
 [Swift Package Manager](https://github.com/apple/swift-package-manager) is the package manager for the Swift programming language.
 
 Add `HTMLKit` to your `Package.swift` dependecies:
 
 ```swift
-.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 0, minor: 9)
+.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 1)
 ```
 
 Then run:
@@ -98,7 +104,7 @@ Then run:
 $ swift build
 ```
 
-### Manually
+## Manually
 
 1- Add `HTMLKit` as git submodule
 
@@ -110,9 +116,9 @@ $ git submodule add https://github.com/iabudiab/HTMLKit.git
 
 3- In the General panel of your target add `HTMLKit.framework` under the `Embedded Binaries` 
 
-# Features
+# Parsing
 
-# Parsing Documents
+## Parsing Documents
 
 Given some HTML content, you can parse it either via the `HTMLParser` or instatiate a `HTMLDocument` directly:
 
@@ -127,7 +133,7 @@ HTMLDocument *document = [parser parseDocument];
 HTMLDocument *document = [HTMLDocument documentWithString:htmlString];
 ```
 
-# Parsing Fragments
+## Parsing Fragments
 
 You can also prase HTML content as a document fragment with a specified context element:
 
@@ -150,7 +156,7 @@ nodes = [parser parseFragmentWithContextElement:bodyContext];
 
 # The DOM
 
-Here are some of the things you can do:
+The DOM tree can be manipulated in several ways, here are just a few:
 
 * Create new elements and assign attributes
 
@@ -174,7 +180,7 @@ NSArray *nodes = @[
 [body appendNodes:nodes];
 ```
 
-* Enumerate child elements and perform DOM manipulation
+* Enumerate child elements and perform DOM editing
 
 ```objective-c
 [body enumerateChildElementsUsingBlock:^(HTMLElement *element, NSUInteger idx, BOOL *stop) {
@@ -194,6 +200,12 @@ NSArray *nodes = @[
 [body.lastChild removeFromParentNode];
 ```
 
+* Manipulate the HTML directly
+
+```objective-c
+greenDiv.innerHTML = @"<ul><li>item 1<li>item 2";
+```
+
 * Navigate to child and sibling nodes
 
 ```objective-c
@@ -201,12 +213,6 @@ HTMLNode *firstChild = body.firstChild;
 HTMLNode *greenDiv = firstChild.nextSibling;
 ```
 
-* Manipulate the HTML directly
-
-```objective-c
-greenDiv.innerHTML = @"<ul><li>item 1<li>item 2";
-```
-
 * Iterate the DOM tree with custom filters
 
 ```objective-c
@@ -222,6 +228,17 @@ for (HTMLElement *element in [body nodeIteratorWithShowOptions:HTMLNodeFilterSho
 }
 ```
 
+* Create and manipulate DOM Ranges
+
+```objective-c
+HTMLDocument *document = [HTMLDocument documentWithString:@"<div><h1>HTMLKit</h1><p id='foo'>Hello there!</p></div>"];
+HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
+
+HTMLNode *paragraph = [document querySelector:@"#foo"];
+[range selectNode:paragraph];
+[range extractContents];
+```
+
 # CSS3 Selectors
 
 All CSS3 Selectors are supported except for the pseudo-elements (`::first-line`, `::first-letter`, ...etc.). You can use them the way you always have:

Sources/HTMLCharacterData.m

@@ -0,0 +1,103 @@
+//
+//  HTMLCharacterData.m
+//  HTMLKit
+//
+//  Created by Iska on 26/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLCharacterData.h"
+#import "HTMLNode+Private.h"
+#import "HTMLDocument+Private.h"
+#import "HTMLKitDOMExceptions.h"
+
+@interface HTMLCharacterData ()
+{
+	NSMutableString *_data;
+}
+@end
+
+@implementation HTMLCharacterData
+@synthesize data = _data;
+
+- (instancetype)initWithName:(NSString *)name type:(HTMLNodeType)type data:(NSString *)data
+{
+	self = [super initWithName:name type:type];
+	if (self) {
+		_data = [[NSMutableString alloc] initWithString:data ?: @""];
+	}
+	return self;
+}
+
+- (NSString *)textContent
+{
+	return [_data copy];
+}
+
+- (void)setTextContent:(NSString *)textContent
+{
+	[self setData:textContent];
+}
+
+- (NSUInteger)length
+{
+	return _data.length;
+}
+
+#pragma mark - Data
+
+NS_INLINE void CheckValidOffset(HTMLCharacterData *node, NSUInteger offset, NSString *cmd)
+{
+	if (offset > node.length) {
+		[NSException raise:HTMLKitIndexSizeError
+					format:@"%@: Index Size Error, invalid index %lu for character data node %@.",
+		 cmd, (unsigned long)offset, node];
+	}
+}
+
+- (void)setData:(NSString *)data
+{
+	[self replaceDataInRange:NSMakeRange(0, self.length) withData:data];
+}
+
+- (void)appendData:(NSString *)data
+{
+	[self replaceDataInRange:NSMakeRange(self.length, 0) withData:data];
+}
+
+- (void)insertData:(NSString *)data atOffset:(NSUInteger)offset
+{
+	[self replaceDataInRange:NSMakeRange(offset, 0) withData:data];
+}
+
+- (void)deleteDataInRange:(NSRange)range
+{
+	[self replaceDataInRange:range withData:@""];
+}
+
+- (void)replaceDataInRange:(NSRange)range withData:(NSString *)data
+{
+	CheckValidOffset(self, range.location, NSStringFromSelector(_cmd));
+
+	range.length = MIN(range.length, self.length - range.location);
+
+	[_data replaceCharactersInRange:range withString:data];
+	[self.ownerDocument didRemoveCharacterDataInNode:self atOffset:range.location withLength:range.length];
+	[self.ownerDocument didAddCharacterDataToNode:self atOffset:range.location withLength:data.length];
+}
+
+- (NSString *)substringDataWithRange:(NSRange)range
+{
+	return [_data substringWithRange:range];
+}
+
+#pragma mark - NSCopying
+
+- (id)copyWithZone:(NSZone *)zone
+{
+	HTMLCharacterData *copy = [super copyWithZone:zone];
+	copy->_data = [_data mutableCopy];
+	return copy;
+}
+
+@end

Sources/HTMLComment.m

@@ -7,7 +7,7 @@
 //
 
 #import "HTMLComment.h"
-#import "HTMLNode+Private.h"
+#import "HTMLCharacterData+Private.h"
 
 @implementation HTMLComment
 
@@ -18,30 +18,7 @@
 
 - (instancetype)initWithData:(NSString *)data
 {
-	self = [super initWithName:@"#comment" type:HTMLNodeComment];
-	if (self) {
-		self.data = data ?: @"";
-	}
-	return self;
-}
-
-- (NSString *)textContent
-{
-	return self.data;
-}
-
-- (void)setTextContent:(NSString *)textContent
-{
-	self.data = textContent ?: @"";
-}
-
-#pragma mark - NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-	HTMLComment *copy = [super copyWithZone:zone];
-	copy.data = self.data;
-	return copy;
+	return [super initWithName:@"#comment" type:HTMLNodeComment data:data];
 }
 
 #pragma mark - Serialization

Sources/HTMLDOMUtils.m

@@ -0,0 +1,32 @@
+//
+//  HTMLDOMUtils.m
+//  HTMLKit
+//
+//  Created by Iska on 03/12/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLDOMUtils.h"
+#import "HTMLNode.h"
+
+extern HTMLNode * GetCommonAncestorContainer(HTMLNode *nodeA, HTMLNode *nodeB)
+{
+	for (HTMLNode *parentA = nodeA; parentA != nil; parentA = parentA.parentNode) {
+		for (HTMLNode *parentB = nodeB; parentB != nil; parentB = parentB.parentNode) {
+			if (parentA == parentB) {
+				return parentA;
+			}
+		}
+	}
+
+	return nil;
+}
+
+extern NSArray<HTMLNode *> * GetAncestorNodes(HTMLNode *node)
+{
+	NSMutableArray *ancestors = [NSMutableArray array];
+	for (HTMLNode *it = node; it; it = it.parentNode) {
+		[ancestors addObject:it];
+	}
+	return ancestors;
+}

Sources/HTMLDocument.m

@@ -9,19 +9,19 @@
 #import "HTMLDocument.h"
 #import "HTMLParser.h"
 #import "HTMLNodeIterator.h"
+#import "HTMLRange.h"
+#import "HTMLCharacterData.h"
+#import "HTMLText.h"
 #import "HTMLKitDOMExceptions.h"
 #import "HTMLNode+Private.h"
-
-@interface HTMLNodeIterator (Private)
-- (void)runRemovingStepsForNode:(HTMLNode *)oldNode
-				  withOldParent:(HTMLNode *)oldParent
-		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling;
-@end
+#import "HTMLNodeIterator+Private.h"
+#import "HTMLRange+Private.h"
 
 @interface HTMLDocument ()
 {
 	HTMLDocument *_inertTemplateDocument;
 	NSMutableArray *_nodeIterators;
+	NSMutableArray *_ranges;
 }
 @property (nonatomic, assign) HTMLDocumentReadyState readyState;
 @end
@@ -42,6 +42,7 @@
 	if (self) {
 		_readyState = HTMLDocumentLoading;
 		_nodeIterators = [NSMutableArray new];
+		_ranges = [NSMutableArray new];
 	}
 	return self;
 }
@@ -143,14 +144,62 @@
 	[_nodeIterators removeObject:iterator];
 }
 
+#pragma mark - Ranges
+
+- (void)attachRange:(HTMLRange *)range
+{
+	[_ranges addObject:range];
+}
+
+- (void)detachRange:(HTMLRange *)range
+{
+	[_ranges removeObject:range];
+}
+
+- (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length
+{
+	for (HTMLRange *range in _ranges) {
+		[range didRemoveCharacterDataInNode:node atOffset:offset withLength:length];
+	}
+}
+
+- (void)didAddCharacterDataToNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length
+{
+	for (HTMLRange *range in _ranges) {
+		[range didAddCharacterDataToNode:node atOffset:offset withLength:length];
+	}
+}
+
+- (void)didInsertNewTextNode:(HTMLText *)newNode intoParent:(HTMLNode *)parent afterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset
+{
+	for (HTMLRange *range in _ranges) {
+		[range didInsertNewTextNode:newNode intoParent:parent afterSplittingTextNode:node atOffset:offset];
+	}
+}
+
+- (void)clampRangesAfterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset
+{
+	for (HTMLRange *range in _ranges) {
+		[range clampRangesAfterSplittingTextNode:node atOffset:offset];
+	}
+}
+
+#pragma mark - Mutation Callback
+
 - (void)runRemovingStepsForNode:(HTMLNode *)oldNode
 				  withOldParent:(HTMLNode *)oldParent
 		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling
 {
+	for (HTMLRange *range in _ranges) {
+		[range runRemovingStepsForNode:oldNode
+						 withOldParent:oldParent
+				 andOldPreviousSibling:oldPreviousSibling];
+	}
+
 	for (HTMLNodeIterator *iterator in _nodeIterators) {
 		[iterator runRemovingStepsForNode:oldNode
-							 withOldParent:oldParent
-					 andOldPreviousSibling:oldPreviousSibling];
+							withOldParent:oldParent
+					andOldPreviousSibling:oldPreviousSibling];
 	}
 }
 

Sources/HTMLDocumentType.m

@@ -129,13 +129,18 @@ NS_INLINE BOOL nilOrEqual(id first, id second) {
 	return HTMLQuirksModeNoQuirks;
 }
 
+- (NSUInteger)length
+{
+	return 0;
+}
+
 #pragma mark - NSCopying
 
 - (id)copyWithZone:(NSZone *)zone
 {
 	HTMLDocumentType *copy = [super copyWithZone:zone];
-	copy->_publicIdentifier = self.publicIdentifier;
-	copy->_systemIdentifier = self.systemIdentifier;
+	copy->_publicIdentifier = [_publicIdentifier copy];
+	copy->_systemIdentifier = [_systemIdentifier copy];
 	return copy;
 }
 

Sources/HTMLKit-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/HTMLKitDOMExceptions.m

@@ -14,3 +14,7 @@ NSString * const HTMLKitNotFoundError = @"NotFoundError";
 NSString * const HTMLKitNotSupportedError = @"NotSupportedError";
 NSString * const HTMLKitSyntaxError = @"SyntaxError";
 NSString * const HTMLKitInvalidCharacterError = @"InvalidCharacterError";
+NSString * const HTMLKitInvalidNodeTypeError = @"InvalidNodeTypeError";
+NSString * const HTMLKitIndexSizeError = @"IndexSizeError";
+NSString * const HTMLKitWrongDocumentError = @"WrongDocumentError";
+NSString * const HTMLKitInvalidStateError = @"InvalidStateError";

Sources/HTMLNode.m

@@ -16,12 +16,8 @@
 #import "HTMLKitDOMExceptions.h"
 #import "HTMLNodeFilter.h"
 #import "CSSSelector.h"
-
-@interface HTMLDocument (Private)
-- (void)runRemovingStepsForNode:(HTMLNode *)oldNode
-				  withOldParent:(HTMLNode *)oldParent
-		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling;
-@end
+#import "HTMLDocument+Private.h"
+#import "HTMLDOMUtils.h"
 
 @interface HTMLNode ()
 {
@@ -62,6 +58,11 @@
 	[self.childNodes.array makeObjectsPerformSelector:@selector(setOwnerDocument:) withObject:ownerDocument];
 }
 
+- (HTMLNode *)rootNode
+{
+	return _parentNode == nil ? self : _parentNode.rootNode;
+}
+
 - (void)setParentNode:(HTMLNode *)parentNode
 {
 	_parentNode = parentNode;
@@ -118,11 +119,21 @@
 	return node.asElement;
 }
 
+- (NSUInteger)index
+{
+	return [self.parentNode indexOfChildNode:self];
+}
+
 - (NSString *)textContent
 {
 	return nil;
 }
 
+- (NSUInteger)length
+{
+	return self.childNodesCount;
+}
+
 #pragma mark - Cast
 
 - (HTMLElement *)asElement
@@ -155,6 +166,11 @@
 	return self.childNodes.count;
 }
 
+- (BOOL)isEmpty
+{
+	return self.length == 0;
+}
+
 - (HTMLNode *)childNodeAtIndex:(NSUInteger)index
 {
 	return [self.childNodes objectAtIndex:index];
@@ -328,41 +344,43 @@
 		return HTMLDocumentPositionEquivalent;
 	}
 
-	NSArray * (^ ancestorNodes) (HTMLNode *) = ^ NSArray * (HTMLNode *node) {
-		NSMutableArray *ancestors = [NSMutableArray array];
-		for (HTMLNode *node = self; node; node = node.parentNode) {
-			[ancestors addObject:node];
-		}
-		return ancestors;
-	};
-
-	NSArray *ancestors1 = ancestorNodes(self);
-	NSArray *ancestors2 = ancestorNodes(otherNode);
-
-	if (ancestors1.lastObject != ancestors2.lastObject) {
-		return HTMLDocumentPositionDisconnected |
-		HTMLDocumentPositionImplementationSpecific |
-		HTMLDocumentPositionFollowing;
+	if (self.ownerDocument != otherNode.ownerDocument) {
+		return (HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
+				self.hash < otherNode.hash ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
 	}
 
-	for (NSUInteger i = MIN(ancestors1.count - 1, ancestors2.count - 1); i; --i) {
-		HTMLNode *child1 = ancestors1[i];
-		HTMLNode *child2 = ancestors2[i];
+	NSArray *ancestors1 = GetAncestorNodes(self);
+	NSArray *ancestors2 = GetAncestorNodes(otherNode);
+
+	if (ancestors1.lastObject != ancestors2.lastObject) {
+		return (HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
+				self.hash < otherNode.hash ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
+	}
+
+	NSUInteger index1 = ancestors1.count;
+	NSUInteger index2 = ancestors2.count;
+
+	for (NSUInteger i = MIN(index1, index2); i; --i) {
+		index1 -= 1;
+		index2 -= 1;
+
+		HTMLNode *child1 = ancestors1[index1];
+		HTMLNode *child2 = ancestors2[index2];
 
 		if (child1 != child2) {
 			for (HTMLNode *sibling = child1.nextSibling; sibling; sibling = sibling.nextSibling) {
 				if (sibling == child2) {
-					return HTMLDocumentPositionFollowing;
+					return HTMLDocumentPositionPreceding;
 				}
 			}
-			return HTMLDocumentPositionPreceding;
+			return HTMLDocumentPositionFollowing;
 		}
 	}
 
 	if (ancestors1.count < ancestors2.count) {
-		return HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing;
-	} else {
 		return HTMLDocumentPositionContains | HTMLDocumentPositionPreceding;
+	} else {
+		return HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing;
 	}
 }
 
@@ -650,6 +668,21 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin
 
 #endif
 
+#pragma mark - Clone
+
+- (instancetype)cloneNodeDeep:(BOOL)deep
+{
+	HTMLNode *copy = [self copy];
+
+	if (deep) {
+		for (HTMLNode *child in self.childNodes) {
+			[copy appendNode:[child cloneNodeDeep:YES]];
+		}
+	}
+
+	return copy;
+}
+
 #pragma mark - NSCopying
 
 - (id)copyWithZone:(NSZone *)zone

Sources/HTMLNodeIterator.m

@@ -11,6 +11,7 @@
 #import "HTMLNode.h"
 #import "HTMLNodeFilter.h"
 #import "HTMLNodeTraversal.h"
+#import "HTMLDocument+Private.h"
 
 typedef NS_ENUM(short, TraverseDirection)
 {
@@ -18,11 +19,6 @@ typedef NS_ENUM(short, TraverseDirection)
 	TraverseDirectionPrevious
 };
 
-@interface HTMLDocument (Private)
-- (void)attachNodeIterator:(HTMLNodeIterator *)iterator;
-- (void)detachNodeIterator:(HTMLNodeIterator *)iterator;
-@end
-
 @interface HTMLNodeIterator ()
 {
 	HTMLNode *_root;

Sources/HTMLParser.m

@@ -18,14 +18,7 @@
 #import "HTMLMarker.h"
 #import "NSString+HTMLKit.h"
 #import "CSSSelectors.h"
-
-@interface HTMLTokenizer (Private)
-@property (nonatomic, weak) HTMLParser *parser;
-@end
-
-@interface HTMLDocument (Private)
-@property (nonatomic, assign) HTMLDocumentReadyState readyState;
-@end
+#import "HTMLDocument+Private.h"
 
 @interface HTMLParser ()
 {
@@ -457,9 +450,11 @@
 																					beforeChildNode:&child];
 	if (adjustedInsertionLocation.nodeType != HTMLNodeDocument) {
 		if (child != nil && child.previousSibling.nodeType == HTMLNodeText) {
-			[(HTMLText *)child.previousSibling appendString:data];
+			HTMLText *textNode = (HTMLText *)child.previousSibling;
+			[textNode appendData:data];
 		} else if (adjustedInsertionLocation.lastChild.nodeType == HTMLNodeText) {
-			[(HTMLText *)adjustedInsertionLocation.lastChild appendString:data];
+			HTMLText *textNode = (HTMLText *)adjustedInsertionLocation.lastChild;
+			[textNode appendData:data];
 		} else {
 			HTMLText *text = [[HTMLText alloc] initWithData:data];
 			[adjustedInsertionLocation insertNode:text beforeChildNode:child];

Sources/HTMLRange.m

@@ -0,0 +1,753 @@
+//
+//  HTMLRange.m
+//  HTMLKit
+//
+//  Created by Iska on 20/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLRange.h"
+#import "HTMLDocument.h"
+#import "HTMLKitDOMExceptions.h"
+#import "HTMLDocument+Private.h"
+#import "HTMLDOMUtils.h"
+#import "HTMLNodeTraversal.h"
+
+@interface HTMLRange ()
+{
+	HTMLDocument *_ownerDocument;
+}
+@end
+
+@implementation HTMLRange
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithDowcument:(HTMLDocument *)document
+{
+	return [self initWithDowcument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
+}
+
+- (instancetype)initWithDowcument:(HTMLDocument *)document
+				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
+{
+	self = [super init];
+	if (self) {
+		_ownerDocument = document;
+		[_ownerDocument attachRange:self];
+		[self setStartNode:startContainer startOffset:startOffset];
+		[self setEndNode:endContainer endOffset:endOffset];
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[_ownerDocument detachRange:self];
+}
+
+#pragma mark - Properties
+
+- (BOOL)isCollapsed
+{
+	return _startContainer == _endContainer && _startOffset == _endOffset;
+}
+
+- (HTMLNode *)commonAncestorContainer
+{
+	return GetCommonAncestorContainer(_startContainer, _endContainer);
+}
+
+- (HTMLNode *)rootNode
+{
+	return _startContainer.rootNode;
+}
+
+#pragma mark - Boundaries
+
+NS_INLINE void CheckValidBoundaryNode(HTMLDocument *document, HTMLNode *node, NSString *cmd)
+{
+	if (node.ownerDocument != document) {
+		[NSException raise:HTMLKitWrongDocumentError
+					format:@"%@: Invalid Node Error, %@ is not in the same document.",
+		 cmd, node];
+	}
+}
+
+NS_INLINE void CheckValidBoundaryNodeType(HTMLNode *node, NSString *cmd)
+{
+	if (node == nil || node.nodeType == HTMLNodeDocumentType) {
+		[NSException raise:HTMLKitInvalidNodeTypeError
+					format:@"%@: Invalid Node Type Error, %@ is not a valid range boundary node.",
+		 cmd, node];
+	}
+}
+
+NS_INLINE void CheckValidBoundaryOffset(HTMLNode *node, NSUInteger offset, NSString *cmd)
+{
+	if (node.length < offset) {
+		[NSException raise:HTMLKitIndexSizeError
+					format:@"%@: Index Size Error, invalid index %lu for range boundary node %@.",
+		 cmd, (unsigned long)offset, node];
+	}
+}
+
+NS_INLINE void CheckValidDocument(HTMLRange *lhs, HTMLRange *rhs, NSString *cmd)
+{
+	if (lhs.rootNode != rhs.rootNode) {
+		[NSException raise:HTMLKitWrongDocumentError
+					format:@"%@: Wrong Document Error, ranges %@ and %@ are not in the same document.",
+		 cmd, lhs, rhs];
+	}
+}
+
+NS_INLINE NSComparisonResult CompareBoundaries(HTMLNode *startNode, NSUInteger startOffset, HTMLNode *endNode, NSUInteger endOffset)
+{
+	if (startNode == endNode) {
+		if (startOffset == endOffset) {
+			return NSOrderedSame;
+		} else if (startOffset < endOffset) {
+			return NSOrderedAscending;
+		} else {
+			return NSOrderedDescending;
+		}
+	}
+
+	HTMLDocumentPosition position = [startNode compareDocumentPositionWithNode:endNode];
+	if ((position & HTMLDocumentPositionFollowing) == HTMLDocumentPositionFollowing) {
+		if (CompareBoundaries(endNode, endOffset, startNode, startOffset) == NSOrderedAscending) {
+			return NSOrderedDescending;
+		} else {
+			return NSOrderedAscending;
+		}
+	}
+
+	if ((position & HTMLDocumentPositionContains) == HTMLDocumentPositionContains) {
+		HTMLNode *child = endNode;
+		while (child.parentNode != startNode) {
+			child = child.parentNode;
+		}
+		if (child.index < startOffset) {
+			return NSOrderedDescending;
+		}
+	}
+
+	return NSOrderedAscending;
+}
+
+- (void)setStartNode:(HTMLNode *)node startOffset:(NSUInteger)offset
+{
+	CheckValidBoundaryNode(_ownerDocument, node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryNodeType(node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryOffset(node, offset, NSStringFromSelector(_cmd));
+
+	if (self.rootNode != node.rootNode ||
+		CompareBoundaries(node, offset, _endContainer, _endOffset) == NSOrderedDescending) {
+		_endContainer = node;
+		_endOffset = offset;
+	}
+
+	_startContainer = node;
+	_startOffset = offset;
+}
+
+- (void)setEndNode:(HTMLNode *)node endOffset:(NSUInteger)offset
+{
+	CheckValidBoundaryNode(_ownerDocument, node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryNodeType(node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryOffset(node, offset, NSStringFromSelector(_cmd));
+
+	if (self.rootNode != node.rootNode ||
+		CompareBoundaries(node, offset, _startContainer, _startOffset) == NSOrderedAscending) {
+		_startContainer = node;
+		_startOffset = offset;
+	}
+
+	_endContainer = node;
+	_endOffset = offset;
+}
+
+- (void)setStartBeforeNode:(HTMLNode *)node
+{
+	HTMLNode *parent = node.parentNode;
+	[self setStartNode:parent startOffset:node.index];
+}
+
+- (void)setStartAfterNode:(HTMLNode *)node
+{
+	HTMLNode *parent = node.parentNode;
+	[self setStartNode:parent startOffset:node.index + 1];
+}
+
+- (void)setEndBeforeNode:(HTMLNode *)node
+{
+	HTMLNode *parent = node.parentNode;
+	[self setEndNode:parent endOffset:node.index];
+}
+
+- (void)setEndAfterNode:(HTMLNode *)node
+{
+	HTMLNode *parent = node.parentNode;
+	[self setEndNode:parent endOffset:node.index + 1];
+}
+
+- (void)collapseToStart
+{
+	[self setEndNode:_startContainer endOffset:_startOffset];
+}
+
+- (void)collapseToEnd
+{
+	[self setStartNode:_endContainer startOffset:_endOffset];
+}
+
+- (void)selectNode:(HTMLNode *)node
+{
+	HTMLNode *parent = node.parentNode;
+	[self setStartNode:parent startOffset:node.index];
+	[self setEndNode:parent endOffset:node.index + 1];
+}
+
+- (void)selectNodeContents:(HTMLNode *)node
+{
+	[self setStartNode:node startOffset:0];
+	[self setEndNode:node endOffset:node.length];
+}
+
+- (NSComparisonResult)compareBoundaryPoints:(HTMLRangeComparisonMethod)method sourceRange:(HTMLRange *)sourceRange
+{
+	CheckValidDocument(self, sourceRange, NSStringFromSelector(_cmd));
+
+	switch (method) {
+		case HTMLRangeComparisonMethodStartToStart:
+			return CompareBoundaries(_startContainer, _startOffset, sourceRange.startContainer, sourceRange.startOffset);
+		case HTMLRangeComparisonMethodStartToEnd:
+			return CompareBoundaries(_endContainer, _endOffset, sourceRange.startContainer, sourceRange.startOffset);
+		case HTMLRangeComparisonMethodEndToEnd:
+			return CompareBoundaries(_endContainer, _endOffset, sourceRange.endContainer, sourceRange.endOffset);
+		case HTMLRangeComparisonMethodEndToStart:
+			return CompareBoundaries(_startContainer, _startOffset, sourceRange.endContainer, sourceRange.endOffset);
+	}
+}
+
+#pragma mark - Containment
+
+- (NSComparisonResult)comparePoint:(HTMLNode *)node offset:(NSUInteger)offset
+{
+	CheckValidBoundaryNode(_ownerDocument, node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryNodeType(node, NSStringFromSelector(_cmd));
+
+	CheckValidBoundaryOffset(node, offset, NSStringFromSelector(_cmd));
+
+	if (CompareBoundaries(node, offset, _startContainer, _startOffset) == NSOrderedAscending) {
+		return NSOrderedAscending;
+	}
+
+	if (CompareBoundaries(node, offset, _endContainer, _endOffset) == NSOrderedDescending) {
+		return NSOrderedDescending;
+	}
+
+	return NSOrderedSame;
+}
+
+- (BOOL)containsPoint:(HTMLNode *)node offset:(NSUInteger)offset
+{
+	return [self comparePoint:node offset:offset] == NSOrderedSame;
+}
+
+- (BOOL)intersectsNode:(HTMLNode *)node
+{
+	if (self.rootNode != node.rootNode) {
+		return NO;
+	}
+
+	HTMLNode *parent = node.parentNode;
+	if (parent == nil) {
+		return YES;
+	}
+
+	NSUInteger offset = node.index;
+	if (CompareBoundaries(parent, offset, _endContainer, _endOffset) == NSOrderedAscending &&
+		CompareBoundaries(parent, offset + 1, _startContainer, _startOffset) == NSOrderedDescending) {
+		return YES;
+	}
+
+	return NO;
+}
+
+- (BOOL)containsNode:(HTMLNode *)node
+{
+	return CompareBoundaries(_startContainer, _startOffset, node, 0) == NSOrderedAscending &&
+	CompareBoundaries(_endContainer, _endOffset, node, node.length) == NSOrderedDescending;
+}
+
+- (BOOL)partiallyContainsNode:(HTMLNode *)node
+{
+	return [GetAncestorNodes(_startContainer) containsObject:node] || [GetAncestorNodes(_endContainer) containsObject:node];
+}
+
+- (NSArray *)containedNodes:(HTMLNode *)commonAncestor
+{
+	NSMutableArray *containedNodes = [NSMutableArray array];
+	[commonAncestor.childNodes enumerateObjectsUsingBlock:^(HTMLNode * _Nonnull node, NSUInteger idx, BOOL * _Nonnull stop) {
+		if (node.nodeType == HTMLNodeDocumentType) {
+			[NSException raise:HTMLKitHierarchyRequestError format:@"Hierarchy Request Error, encountered a DOCTYPE contained in range: %@", self];
+		}
+		if ([self containsNode:node]) {
+			[containedNodes addObject:node];
+		}
+	}];
+
+	return containedNodes;
+}
+
+#pragma mark - Update Callbacks
+
+- (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length
+{
+	if (_startContainer == node && _startOffset > offset) {
+		if (_startOffset <= offset + length) {
+			_startOffset = offset;
+		} else {
+			_startOffset = _startOffset - length;
+		}
+	}
+	if (_endContainer == node && _endOffset > offset) {
+		if (_endOffset <= offset + length) {
+			_endOffset = offset;
+		} else {
+			_endOffset = _endOffset - length;
+		}
+	}
+}
+
+- (void)didAddCharacterDataToNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length
+{
+	if (_startContainer == node && _startOffset > offset) {
+		_startOffset = _startOffset + length;
+	}
+	if (_endContainer == node && _endOffset > offset) {
+		_endOffset = _endOffset + length;
+	}
+}
+
+- (void)didInsertNewTextNode:(HTMLText *)newNode intoParent:(HTMLNode *)parent afterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset
+{
+	if (_startContainer == node && _startOffset > offset) {
+		_startContainer = newNode;
+		_startOffset -= offset;
+	}
+
+	if (_endContainer == node && _endOffset > offset) {
+		_endContainer = newNode;
+		_endOffset -= offset;
+	}
+
+	if (_startContainer == parent && _startOffset == node.index + 1) {
+		_startOffset += 1;
+	}
+
+	if (_endContainer == parent && _endOffset == node.index + 1) {
+		_endOffset += 1;
+	}
+}
+
+- (void)clampRangesAfterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset
+{
+	if (_startContainer == node && _startOffset > offset) {
+		_startOffset = offset;
+	}
+
+	if (_endContainer == node && _endOffset > offset) {
+		_endOffset = offset;
+	}
+}
+
+- (void)runRemovingStepsForNode:(HTMLNode *)oldNode withOldParent:(HTMLNode *)oldParent andOldPreviousSibling:(HTMLNode *)oldPreviousSibling
+{
+	NSUInteger oldIndex = oldPreviousSibling.index + 1;
+
+	if ([_startContainer containsNode:oldNode]) {
+		[self setStartNode:oldNode startOffset:oldIndex];
+	}
+
+	if ([_endContainer containsNode:oldNode]) {
+		[self setEndNode:oldNode endOffset:oldIndex];
+	}
+
+	if (_startContainer == oldParent && _startOffset > oldIndex) {
+		_startOffset -= 1;
+	}
+
+	if (_endContainer == oldParent && _endOffset > oldIndex) {
+		_endOffset -= 1;
+	}
+}
+
+#pragma mark - Mutations
+
+NS_INLINE HTMLNode * GetHighestPartiallyContainedChild(HTMLNode *node, HTMLNode *root)
+{
+	if (node == root) {
+		return nil;
+	}
+
+	while (node.parentNode != root) {
+		node = node.parentNode;
+	}
+	return node;
+}
+
+NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger start, NSUInteger length, BOOL delete)
+{
+	HTMLCharacterData *clone = (HTMLCharacterData *)[node copy];
+	NSRange range = NSMakeRange(start, length);
+	[clone setData:[clone.data substringWithRange:range]];
+
+	if (delete) {
+		[(HTMLCharacterData *)node deleteDataInRange:range];
+	}
+
+	return clone;
+}
+
+- (void)deleteContents
+{
+	if (self.isCollapsed) {
+		return;
+	}
+
+	if (_startContainer == _endContainer && [_startContainer isKindOfClass:[HTMLCharacterData class]]) {
+		[(HTMLCharacterData *)_startContainer deleteDataInRange:NSMakeRange(_startOffset, _endOffset - _startOffset)];
+		return;
+	}
+
+	HTMLNode *commonAncestor = self.commonAncestorContainer;
+
+	NSMutableArray *containedNodes = [NSMutableArray array];
+
+	HTMLNode *node = FollowingNode(_startContainer, commonAncestor);
+	while (node) {
+		if ([self containsNode:node]) {
+			[containedNodes addObject:node];
+			node = FollowingNodeSkippingChildren(node, commonAncestor);
+		} else {
+			node = FollowingNode(node, commonAncestor);
+		}
+	}
+
+	HTMLNode *newNode = _startContainer;
+	NSUInteger newOffset = _startOffset;
+
+	if (![_startContainer containsNode:_endContainer]) {
+		HTMLNode *referenceNode = _startContainer;
+		while (referenceNode.parentNode) {
+			if ([referenceNode.parentNode containsNode:_endContainer]) {
+				newNode = referenceNode.parentNode;
+				newOffset = referenceNode.index + 1;
+				break;
+			}
+			referenceNode = referenceNode.parentNode;
+		}
+	}
+
+	if ([_startContainer isKindOfClass:[HTMLCharacterData class]]) {
+		[(HTMLCharacterData *)_startContainer deleteDataInRange:NSMakeRange(_startOffset, _startContainer.length - _startOffset)];
+	}
+
+	for (HTMLNode *node in containedNodes) {
+		[node removeFromParentNode];
+	}
+
+	if ([_endContainer isKindOfClass:[HTMLCharacterData class]]) {
+		[(HTMLCharacterData *)_endContainer deleteDataInRange:NSMakeRange(0, _endOffset)];
+	}
+
+	[self setStartNode:newNode startOffset:newOffset];
+	[self setEndNode:newNode endOffset:newOffset];
+}
+
+- (HTMLDocumentFragment *)extractContents
+{
+	HTMLDocumentFragment *fragment = [[HTMLDocumentFragment alloc] initWithDocument:_ownerDocument];
+
+		// Nothing todo
+	if (self.isCollapsed) {
+		return fragment;
+	}
+
+		// Same character data container, handle that and return
+	if (_startContainer == _endContainer && [_startContainer isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_startContainer, _startOffset, _endOffset - _startOffset, YES);
+		[fragment appendNode:clone];
+
+		return fragment;
+	}
+
+	HTMLNode *commonAncestor = self.commonAncestorContainer;
+	HTMLNode *firstPartiallyContainedChild = GetHighestPartiallyContainedChild(_startContainer, commonAncestor);
+	HTMLNode *lastPartiallyContainedChild = GetHighestPartiallyContainedChild(_endContainer, commonAncestor);
+	NSArray *containedNodes = [self containedNodes:commonAncestor];
+
+	HTMLNode *newNode = _startContainer;
+	NSUInteger newOffset = _startOffset;
+
+	if (![_startContainer containsNode:_endContainer]) {
+		HTMLNode *referenceNode = _startContainer;
+		while (referenceNode.parentNode) {
+			if ([referenceNode.parentNode containsNode:_endContainer]) {
+				newNode = referenceNode.parentNode;
+				newOffset = referenceNode.index + 1;
+				break;
+			}
+			referenceNode = referenceNode.parentNode;
+		}
+	}
+
+	if ([firstPartiallyContainedChild isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_startContainer, _startOffset, _startContainer.length - _startOffset, YES);
+		[fragment appendNode:clone];
+	} else if (firstPartiallyContainedChild != nil) {
+		HTMLNode *clone = [firstPartiallyContainedChild copy];
+		[fragment appendNode:clone];
+
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+													startContainer:_startContainer
+													   startOffset:_startOffset
+													  endContainer:firstPartiallyContainedChild
+														 endOffset:firstPartiallyContainedChild.length];
+		HTMLDocumentFragment *subFragment = [subRange extractContents];
+		[clone appendNode:subFragment];
+	}
+
+	for (HTMLNode *node in containedNodes) {
+		[fragment appendNode:node];
+	}
+
+	if ([lastPartiallyContainedChild isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_endContainer, 0, _endOffset, YES);
+		[fragment appendNode:clone];
+	} else if (lastPartiallyContainedChild != nil) {
+		HTMLNode *clone = [lastPartiallyContainedChild copy];
+		[fragment appendNode:clone];
+
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+													startContainer:lastPartiallyContainedChild
+													   startOffset:0
+													  endContainer:_endContainer
+														 endOffset:_endOffset];
+		HTMLDocumentFragment *subFragment = [subRange extractContents];
+		[clone appendNode:subFragment];
+	}
+
+	[self setStartNode:newNode startOffset:newOffset];
+	[self setEndNode:newNode endOffset:newOffset];
+
+	return fragment;
+}
+
+- (HTMLDocumentFragment *)cloneContents
+{
+	HTMLDocumentFragment *fragment = [[HTMLDocumentFragment alloc] initWithDocument:_ownerDocument];
+
+	// Nothing todo
+	if (self.isCollapsed) {
+		return fragment;
+	}
+
+	// Same character data container, handle that and return
+	if (_startContainer == _endContainer && [_startContainer isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_startContainer, _startOffset, _endOffset - _startOffset, NO);
+		[fragment appendNode:clone];
+		return fragment;
+	}
+
+	HTMLNode *commonAncestor = self.commonAncestorContainer;
+	HTMLNode *firstPartiallyContainedChild = GetHighestPartiallyContainedChild(_startContainer, commonAncestor);
+	HTMLNode *lastPartiallyContainedChild = GetHighestPartiallyContainedChild(_endContainer, commonAncestor);
+	NSArray *containedNodes = [self containedNodes:commonAncestor];
+
+	if ([firstPartiallyContainedChild isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_startContainer, _startOffset, _startContainer.length - _startOffset, NO);
+		[fragment appendNode:clone];
+	} else if (firstPartiallyContainedChild != nil) {
+		HTMLNode *clone = [firstPartiallyContainedChild copy];
+		[fragment appendNode:clone];
+
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+													startContainer:_startContainer
+													   startOffset:_startOffset
+													  endContainer:firstPartiallyContainedChild
+														 endOffset:firstPartiallyContainedChild.length];
+		HTMLDocumentFragment *subFragment = [subRange cloneContents];
+		[clone appendNode:subFragment];
+	}
+
+	for (HTMLNode *node in containedNodes) {
+		HTMLNode *clone = [node cloneNodeDeep:YES];
+		[fragment appendNode:clone];
+	}
+
+	if ([lastPartiallyContainedChild isKindOfClass:[HTMLCharacterData class]]) {
+		HTMLCharacterData *clone = CloneCharachterData(_endContainer, 0, _endOffset, NO);
+		[fragment appendNode:clone];
+	} else if (lastPartiallyContainedChild != nil) {
+		HTMLNode *clone = [lastPartiallyContainedChild copy];
+		[fragment appendNode:clone];
+
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+													startContainer:lastPartiallyContainedChild
+													   startOffset:0
+													  endContainer:_endContainer
+														 endOffset:_endOffset];
+		HTMLDocumentFragment *subFragment = [subRange cloneContents];
+		[clone appendNode:subFragment];
+	}
+
+	return fragment;
+}
+
+#pragma mark - Insertion & Surround
+
+NS_INLINE void CheckValidInsertionNode(HTMLNode *startContainer, HTMLNode *node, NSString *cmd)
+{
+	if (startContainer == node || startContainer.nodeType == HTMLNodeComment ||
+		(startContainer.nodeType == HTMLNodeText && startContainer.parentNode == nil)) {
+		[NSException raise:HTMLKitHierarchyRequestError
+					format:@"%@: Hierarchy Request Error, cannot insert node into range: %@", cmd, node];
+	}
+}
+
+- (void)insertNode:(HTMLNode *)node
+{
+	CheckValidInsertionNode(_startContainer, node, NSStringFromSelector(_cmd));
+
+	HTMLNode *referenceNode = nil;
+
+	if (_startContainer.nodeType == HTMLNodeText) {
+		referenceNode = _startContainer;
+	} else {
+		referenceNode = [_startContainer childNodeAtIndex:_startOffset];
+	}
+
+	HTMLNode *parent = _startContainer;
+	if (referenceNode != nil) {
+		parent = referenceNode.parentNode;
+	}
+
+	if (_startContainer.nodeType == HTMLNodeText) {
+		referenceNode = [(HTMLText *)_startContainer splitTextAtOffset:_startOffset];
+	}
+
+	if (node == referenceNode) {
+		referenceNode = referenceNode.nextSibling;
+	}
+
+	[node removeFromParentNode];
+
+	NSUInteger newOffset = referenceNode ? referenceNode.index : parent.length;
+	newOffset += (node.nodeType == HTMLNodeDocumentFragment) ? node.length : 1;
+
+	[parent insertNode:node beforeChildNode:referenceNode];
+
+	if (self.isCollapsed) {
+		[self setEndNode:parent endOffset:newOffset];
+	}
+}
+
+NS_INLINE void CheckValidSurroundState(HTMLRange *range, NSString *cmd)
+{
+	for (HTMLNode *node in GetAncestorNodes(range.startContainer)) {
+		if ([node containsNode:range.endContainer]) {
+			return;
+		}
+
+		if (node.nodeType != HTMLNodeText) {
+			[NSException raise:HTMLKitInvalidStateError
+						format:@"%@: Invalid State Error, cannot surround range with a partially-contaied non-text node.", cmd];
+		}
+	};
+
+	for (HTMLNode *node in GetAncestorNodes(range.endContainer)) {
+		if ([node containsNode:range.startContainer]) {
+			return;
+		}
+
+		if (node.nodeType != HTMLNodeText) {
+			[NSException raise:HTMLKitInvalidNodeTypeError
+						format:@"%@: Invalid State Error, cannot surround range with a partially-contaied non-text node.", cmd];
+		}
+	};
+}
+
+NS_INLINE void CheckValidSurroundNodeType(HTMLNode *node, NSString *cmd)
+{
+	if (node == nil || node.nodeType == HTMLNodeDocumentType || node.nodeType == HTMLNodeDocument ||
+		node.nodeType == HTMLNodeDocumentFragment) {
+		[NSException raise:HTMLKitInvalidNodeTypeError
+					format:@"%@: Invalid Node Type Error, %@ is not a valid new parent for a range.",
+		 cmd, node];
+	}
+}
+
+- (void)surroundContents:(HTMLNode *)newParent
+{
+	CheckValidSurroundState(self, NSStringFromSelector(_cmd));
+
+	CheckValidSurroundNodeType(newParent, NSStringFromSelector(_cmd));
+
+	HTMLDocumentFragment *fragment = [self extractContents];
+	[newParent removeAllChildNodes];
+
+	[self insertNode:newParent];
+	[newParent appendNode:fragment];
+	[self selectNode:newParent];
+}
+
+#pragma mark - Description & Stringifier
+
+- (NSString *)description
+{
+	return [NSString stringWithFormat:@"<%@: %p (%@, %lu), (%@, %lu)>", self.class, self,
+			_startContainer, (unsigned long)_startOffset,
+			_endContainer, (unsigned long)_endOffset];
+}
+
+- (NSString *)textContent
+{
+	HTMLNode *lastNode = nil;
+	if ([_endContainer isKindOfClass:[HTMLCharacterData class]]) {
+		lastNode = FollowingNodeSkippingChildren(_endContainer, _ownerDocument);
+	} else if (_endContainer.childNodesCount > _endOffset) {
+		lastNode = [_endContainer childNodeAtIndex:_endOffset];
+	} else {
+		lastNode = FollowingNodeSkippingChildren(_endContainer, _ownerDocument);
+	}
+
+	NSMutableString *content = [NSMutableString string];
+	for (HTMLNode *node = _startContainer; node != lastNode; node = FollowingNode(node, _ownerDocument)) {
+		if (node.nodeType == HTMLNodeText) {
+			HTMLText *text = (HTMLText *)node;
+
+			if (node == _startContainer) {
+				NSString *string = [text substringDataWithRange:NSMakeRange(_startOffset, _startContainer.length - _startOffset)];
+				[content appendString:string];
+			} else if (node == _endContainer) {
+				NSString *string = [text substringDataWithRange:NSMakeRange(0, _endOffset)];
+				[content appendString:string];
+			} else {
+				[content appendString:text.data];
+			}
+		}
+	}
+
+	return content;
+}
+
+@end

Sources/HTMLTemplate.m

@@ -8,10 +8,7 @@
 
 #import "HTMLTemplate.h"
 #import "HTMLDocument.h"
-
-@interface HTMLNode (Private)
-@property (nonatomic, weak) HTMLDocument *ownerDocument;
-@end
+#import "HTMLNode+Private.h"
 
 @implementation HTMLTemplate
 

Sources/HTMLText.m

@@ -9,7 +9,9 @@
 #import "HTMLText.h"
 #import "HTMLElement.h"
 #import "NSString+HTMLKit.h"
-#import "HTMLNode+Private.h"
+#import "HTMLCharacterData+Private.h"
+#import "HTMLKitDOMExceptions.h"
+#import "HTMLDocument+Private.h"
 
 @implementation HTMLText
 
@@ -20,35 +22,48 @@
 
 - (instancetype)initWithData:(NSString *)data
 {
-	self = [super initWithName:@"#text" type:HTMLNodeText];
-	if (self) {
-		_data = [[NSMutableString alloc] initWithString:data ?: @""];
-	}
-	return self;
-}
-
-- (NSString *)textContent
-{
-	return [self.data copy];
-}
-
-- (void)setTextContent:(NSString *)textContent
-{
-	[self.data setString:textContent ?: @""];
+	return [super initWithName:@"#text" type:HTMLNodeText data:data];
 }
 
 - (void)appendString:(NSString *)string
 {
-	[self.data appendString:string];
+	[self appendData:string];
 }
 
-#pragma mark - NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
+NS_INLINE void CheckValidOffset(HTMLNode *node, NSUInteger offset, NSString *cmd)
 {
-	HTMLText *copy = [super copyWithZone:zone];
-	copy.data = self.data;
-	return copy;
+	if (offset > node.length) {
+		[NSException raise:HTMLKitIndexSizeError
+					format:@"%@: Index Size Error, invalid offset %lu for splitting text node %@.",
+		 cmd, (unsigned long)offset, node];
+	}
+}
+
+- (HTMLText *)splitTextAtOffset:(NSUInteger)offset
+{
+	CheckValidOffset(self, offset, NSStringFromSelector(_cmd));
+
+	NSUInteger length = self.length;
+	NSUInteger count = length - offset;
+	NSRange range = NSMakeRange(offset, count);
+
+	NSString *newData = [self.data substringWithRange:range];
+	HTMLText *newNode = [[HTMLText alloc] initWithData:newData];
+	[self.ownerDocument adoptNode:newNode];
+
+	HTMLNode *parent = self.parentNode;
+	if (parent != nil) {
+		[parent insertNode:newNode beforeChildNode:self.nextSibling];
+		[self.ownerDocument didInsertNewTextNode:newNode intoParent:parent afterSplittingTextNode:self atOffset:offset];
+	}
+
+	[self deleteDataInRange:range];
+
+	if (parent != nil) {
+		[self.ownerDocument clampRangesAfterSplittingTextNode:self atOffset:offset];
+	}
+
+	return newNode;
 }
 
 #pragma mark - Serialization

Sources/HTMLTokenizer.m

@@ -13,10 +13,7 @@
 #import "HTMLTokenizerStates.h"
 #import "HTMLTokenizerCharacters.h"
 #import "HTMLTokenizerEntities.h"
-
-@interface HTMLParser (Private)
-@property (nonatomic, strong, readonly) HTMLElement *adjustedCurrentNode;
-@end
+#import "HTMLParser+Private.h"
 
 @interface HTMLTokenizer ()
 {
@@ -45,7 +42,6 @@
 
 	BOOL _eof;
 }
-@property (nonatomic, weak) HTMLParser *parser;
 @end
 
 @implementation HTMLTokenizer

Sources/include/CSSSelectorParser.h

@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @see CSSelector
  */
-+ (CSSSelector *)parseSelector:(NSString *)string error:(NSError **)error;
++ (nullable CSSSelector *)parseSelector:(NSString *)string error:(NSError **)error;
 
 @end
 

Sources/include/HTMLCharacterData+Private.h

@@ -0,0 +1,28 @@
+//
+//  HTMLCharacterData+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 26/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLCharacterData.h"
+#import "HTMLNode.h"
+
+/**
+ Private HTML Character Data methods which are not intended for public API.
+ */
+@interface HTMLCharacterData ()
+
+/**
+ Designated initializer of the HTML CharacterData, which, however, should not be used directly. It is intended to be 
+ called only by subclasses, i.e. HTMLText and HTMLComment.
+
+ @param name The node's name.
+ @param type The node's type.
+ @param data The node's data string.
+ @return A new instance of a HTML CharacterData.
+ */
+- (instancetype)initWithName:(NSString *)name type:(HTMLNodeType)type data:(NSString *)data NS_DESIGNATED_INITIALIZER;
+
+@end

Sources/include/HTMLCharacterData.h

@@ -0,0 +1,32 @@
+//
+//  HTMLCharacterData.h
+//  HTMLKit
+//
+//  Created by Iska on 26/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLNode.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ A HTML CharacterData
+ 
+ https://dom.spec.whatwg.org/#characterdata
+ */
+@interface HTMLCharacterData : HTMLNode
+
+/** @brief The associated data string. */
+@property (nonatomic, copy, readonly) NSString *data;
+
+- (void)setData:(NSString *)data;
+- (void)appendData:(NSString *)data;
+- (void)insertData:(NSString *)data atOffset:(NSUInteger)offset;
+- (void)deleteDataInRange:(NSRange)range;
+- (void)replaceDataInRange:(NSRange)range withData:(NSString *)data;
+- (NSString *)substringDataWithRange:(NSRange)range;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/include/HTMLComment.h

@@ -6,17 +6,14 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
-#import "HTMLNode.h"
+#import "HTMLCharacterData.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  A HTML Comment node
  */
-@interface HTMLComment : HTMLNode
-
-/** @brief The comment string. */
-@property (nonatomic, copy) NSString *data;
+@interface HTMLComment : HTMLCharacterData
 
 /**
  Initializes a new HTML comment node.

Sources/include/HTMLDOM.h

@@ -11,9 +11,11 @@
 #import "HTMLDocumentType.h"
 #import "HTMLDocumentFragment.h"
 #import "HTMLElement.h"
+#import "HTMLCharacterData.h"
 #import "HTMLComment.h"
 #import "HTMLText.h"
 #import "HTMLTemplate.h"
+#import "HTMLRange.h"
 #import "HTMLDOMTokenList.h"
 #import "HTMLNodeIterator.h"
 #import "HTMLTreeWalker.h"

Sources/include/HTMLDOMUtils.h

@@ -0,0 +1,15 @@
+//
+//  HTMLDOMUtils.h
+//  HTMLKit
+//
+//  Created by Iska on 03/12/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HTMLDOM.h"
+
+@class HTMLNode;
+
+extern HTMLNode * GetCommonAncestorContainer(HTMLNode *nodeA, HTMLNode *nodeB);
+extern NSArray<HTMLNode *> * GetAncestorNodes(HTMLNode *node);

Sources/include/HTMLDocument+Private.h

@@ -0,0 +1,99 @@
+//
+//  HTMLDocument+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 27/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLDocument.h"
+#import "HTMLNode.h"
+#import "HTMLCharacterData.h"
+#import "HTMLNodeIterator.h"
+#import "HTMLRange.h"
+#import "HTMLText.h"
+
+/**
+ Private HTML Document methods which are not intended for public API.
+ */
+@interface HTMLDocument ()
+
+@property (nonatomic, assign) HTMLDocumentReadyState readyState;
+
+/**
+ Runs the necessary steps after removing a node from the DOM.
+
+ @param oldNode The old node that was removed.
+ @param oldParent The old parent of the node that was removed.
+ @param oldPreviousSibling The old previous sibling node of the node that was removed.
+ */
+- (void)runRemovingStepsForNode:(HTMLNode *)oldNode
+				  withOldParent:(HTMLNode *)oldParent
+		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling;
+
+/**
+ Attaches a node iterator to this document.
+
+ @param iterator The iterator to attach.
+ */
+- (void)attachNodeIterator:(HTMLNodeIterator *)iterator;
+
+/**
+ Detaches a node interator from this document.
+
+ @param iterator The iterator to detach.
+ */
+- (void)detachNodeIterator:(HTMLNodeIterator *)iterator;
+
+
+/**
+ Attaches a range to this document.
+
+ @param range The range to attach.
+ */
+- (void)attachRange:(HTMLRange *)range;
+
+/**
+ Detaches a range from this document.
+
+ @param range The range to detach.
+ */
+- (void)detachRange:(HTMLRange *)range;
+
+/**
+ Callback on removing text from a CharacterData node.
+
+ @param node The CharacterData node.
+ @param offset The offset at which the data was removed.
+ @param length The length of the data that was removed.
+ */
+- (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length;
+
+/**
+ Callback on adding text from a CharacterData node.
+
+ @param node The CharacterData node.
+ @param offset The offset at which the data was added.
+ @param length The length of the data that was added.
+ */
+- (void)didAddCharacterDataToNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length;
+
+/**
+ Callback on inserting a new text node when an old text node is split.
+
+ @param newNode The new text node after splitting.
+ @param parent The parent where newNode was inserted.
+ @param node The old text node that was split.
+ @param offset The offset of splitting.
+ */
+- (void)didInsertNewTextNode:(HTMLText *)newNode intoParent:(HTMLNode *)parent afterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset;
+
+/**
+ Callback for clamping current ranges whose end boundary is after the text node upon splitting it.
+
+ @param node The text node that was split.
+ @param offset The offset of splitting
+ */
+- (void)clampRangesAfterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset;
+
+@end

Sources/include/HTMLElement.h

@@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  The element's attribites.
  */
-@property (nonatomic, strong) NSMutableDictionary *attributes;
+@property (nonatomic, strong) NSMutableDictionary<NSString *, NSString *> *attributes;
 
 /**
  @warning Use one of the initWithTagName: methods instead.
@@ -75,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Initializes a new HTML element with the given tag name, namespace, and attributes.
@@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(NSDictionary *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Checks whether this element has an attribute with the given name.

Sources/include/HTMLKitDOMExceptions.h

@@ -14,3 +14,8 @@ extern NSString * const HTMLKitNotSupportedError;
 
 extern NSString * const HTMLKitSyntaxError;
 extern NSString * const HTMLKitInvalidCharacterError;
+
+extern NSString * const HTMLKitInvalidNodeTypeError;
+extern NSString * const HTMLKitIndexSizeError;
+extern NSString * const HTMLKitWrongDocumentError;
+extern NSString * const HTMLKitInvalidStateError;

Sources/include/HTMLNode.h

@@ -28,7 +28,7 @@ typedef NS_ENUM(short, HTMLNodeType)
 /**
  A node's position in the HTML document when compared with other nodes.
  */
-typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
+typedef NS_OPTIONS(unsigned short, HTMLDocumentPosition)
 {
 	HTMLDocumentPositionEquivalent = 0x0,
 	HTMLDocumentPositionDisconnected = 0x01,
@@ -71,6 +71,11 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
  */
 @property (nonatomic, weak, readonly, nullable) HTMLDocument *ownerDocument;
 
+/**
+ The root node of this node, if any.
+ */
+@property (nonatomic, weak, readonly, nullable) HTMLNode *rootNode;
+
 /**
  The parent node of this node, if any.
  */
@@ -86,7 +91,7 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
 /**
  A read-only ordered set of child nodes.
  */
-@property (nonatomic, strong, readonly) NSOrderedSet *childNodes;
+@property (nonatomic, strong, readonly) NSOrderedSet<HTMLNode *> *childNodes;
 
 /**
  The first child node, if any.
@@ -122,6 +127,11 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
  */
 @property (nonatomic, strong, readonly, nullable) HTMLElement *nextSiblingElement;
 
+/**
+ The index of this node.
+ */
+@property (nonatomic, readonly, assign) NSUInteger index;
+
 /**
  The text content of this node.
  */
@@ -137,6 +147,11 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
  */
 @property (nonatomic, copy)	NSString *innerHTML;
 
+/**
+ The length of the node as described in https://dom.spec.whatwg.org/#concept-node-length
+ */
+@property (nonatomic, assign) NSUInteger length;
+
 /**
  @abstract Use concrete subclasses of the HTML Node.
  */
@@ -164,6 +179,21 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
  */
 - (NSUInteger)childNodesCount;
 
+/**
+ Checks whether the node is empty as described in https://dom.spec.whatwg.org/#concept-node-length
+
+ @return `YES` if the node is empty, `NO` otherwise.
+ */
+- (BOOL)isEmpty;
+
+/**
+ Clones this node.
+
+ @param deep If `YES` then also clones child nodes. Otherwise a shallow clone is returned, which behaves the same as `copy`.
+ @return A clone of this node.
+ */
+- (instancetype)cloneNodeDeep:(BOOL)deep;
+
 /**
  Returns the child node at a given index.
 
@@ -220,7 +250,7 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
 
  @param node The nodes to prepend.
  */
-- (void)prependNodes:(NSArray *)nodes;
+- (void)prependNodes:(NSArray<HTMLNode *> *)nodes;
 
 /**
  Appends the given node to the set of child nodes.
@@ -235,7 +265,7 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
 
  @param nodes The nodes to append.
  */
-- (void)appendNodes:(NSArray *)nodes;
+- (void)appendNodes:(NSArray<HTMLNode *> *)nodes;
 
 /**
  Inserts a given node before a child node.
@@ -318,7 +348,8 @@ typedef NS_ENUM(unsigned short, HTMLDocumentPosition)
 - (BOOL)isDescendantOfNode:(HTMLNode *)node;
 
 /**
- Checks whether this node contains the given node.
+ Checks whether this node contains the given node. This performs an `invlusive ancestor` check, i.e. it returns `YES`
+ if the given node is the same object as this node.
 
  @param node The node to check.
  @return `YES` if this node contains the given node, `NO` otherwsie.

Sources/include/HTMLNodeIterator+Private.h

@@ -0,0 +1,28 @@
+//
+//  HTMLNodeIterator+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 27/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLNodeIterator.h"
+#import "HTMLNode.h"
+
+/**
+ Private HTML Node Iterator methods which are not intended for public API.
+ */
+@interface HTMLNodeIterator (Private)
+
+/**
+ Runs the necessary steps after removing a node from the DOM.
+
+ @param oldNode The old node that was removed.
+ @param oldParent The old parent of the node that was removed.
+ @param oldPreviousSibling The old previous sibling node of the node that was removed.
+ */
+- (void)runRemovingStepsForNode:(HTMLNode *)oldNode
+				  withOldParent:(HTMLNode *)oldParent
+		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling;
+
+@end

Sources/include/HTMLParser+Private.h

@@ -0,0 +1,23 @@
+//
+//  HTLMLParser+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 27/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLParser.h"
+#import "HTMLElement.h"
+
+/**
+ Private HTML Parser properties & methods which are not intended for public API.
+ */
+@interface HTMLParser (Private)
+
+/**
+ The adjusted current node in the context of HTML parsing as described in:
+ https://html.spec.whatwg.org/#adjusted-current-node
+ */
+@property (nonatomic, strong, readonly) HTMLElement *adjustedCurrentNode;
+
+@end

Sources/include/HTMLParser.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  An array of errors that occurred during document parsing.
  */
-@property (nonatomic, strong, readonly) NSArray *parseErrors;
+@property (nonatomic, strong, readonly) NSArray<NSString *> *parseErrors;
 
 /**
  The parsed HTML Document.
@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @see HTMLElement
  */
-- (NSArray *)parseFragmentWithContextElement:(HTMLElement *)contextElement;
+- (NSArray<HTMLNode *> *)parseFragmentWithContextElement:(HTMLElement *)contextElement;
 
 @end
 

Sources/include/HTMLRange+Private.h

@@ -0,0 +1,61 @@
+//
+//  HTMLRange+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 27/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLRange.h"
+#import "HTMLCharacterData.h"
+
+@interface HTMLRange ()
+
+/**
+ Runs the necessary steps after removing data from a character data node that may be a range's boundary.
+
+ @param node The character data node.
+ @param offset The offset at which the data was removed.
+ @param length The length of the data that was removed.
+ */
+- (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length;
+
+/**
+ Runs the necessary steps after adding data to a character data node that may be a range's boundary.
+
+ @param node The character data node.
+ @param offset The offset at which the data was added.
+ @param length The length of the data that was added.
+ */
+- (void)didAddCharacterDataToNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length;
+
+/**
+ Runs the necessary steps after inserting a new text node when an old text node is split.
+
+ @param newNode The new text node after splitting.
+ @param parent The parent where newNode was inserted.
+ @param node The old text node that was split.
+ @param offset The offset of splitting.
+ */
+- (void)didInsertNewTextNode:(HTMLText *)newNode intoParent:(HTMLNode *)parent afterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset;
+
+/**
+ Runs the necessary steps to clamp the range whose end boundary is after the text node upon splitting it.
+
+ @param node The text node that was split.
+ @param offset The offset of splitting
+ */
+- (void)clampRangesAfterSplittingTextNode:(HTMLText *)node atOffset:(NSUInteger)offset;
+
+/**
+ Runs the necessary steps after removing a node from the DOM.
+
+ @param oldNode The old node that was removed.
+ @param oldParent The old parent of the node that was removed.
+@param oldPreviousSibling The old previous sibling node of the node that was removed.
+ */
+- (void)runRemovingStepsForNode:(HTMLNode *)oldNode
+				  withOldParent:(HTMLNode *)oldParent
+		  andOldPreviousSibling:(HTMLNode *)oldPreviousSibling;
+
+@end

Sources/include/HTMLRange.h

@@ -0,0 +1,252 @@
+//
+//  HTMLRange.h
+//  HTMLKit
+//
+//  Created by Iska on 20/11/16.
+//  Copyright © 2016 BrainCookie. All rights reserved.
+//
+
+#import "HTMLNode.h"
+#import "HTMLDocumentFragment.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ The comparison method of range boundaries
+
+ - HTMLRangeComparisonMethodStartToStart: Compares the start boundary-point of sourceRange to the start boundary-point of this range.
+ - HTMLRangeComparisonMethodStartToEnd: Compares the start boundary-point of sourceRange to the end boundary-point of this range.
+ - HTMLRangeComparisonMethodEndToEnd: Compares the end boundary-point of sourceRange to the end boundary-point of this range.
+ - HTMLRangeComparisonMethodEndToStart: Compares the end boundary-point of sourceRange to the start boundary-point of this range.
+ */
+typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
+{
+	HTMLRangeComparisonMethodStartToStart = 0,
+	HTMLRangeComparisonMethodStartToEnd = 1,
+	HTMLRangeComparisonMethodEndToEnd = 2,
+	HTMLRangeComparisonMethodEndToStart = 3
+};
+
+#pragma mark - DOM Range
+
+/**
+ A HTML Range, represents a sequence of content within a node tree. 
+ Each range has a start and an end which are boundary points. 
+ A boundary point is a tuple consisting of a node and a non-negative numeric offset.
+
+ https://dom.spec.whatwg.org/#ranges
+ */
+@interface HTMLRange : NSObject
+
+/**
+ The node of the start boundary point.
+ */
+@property (nonatomic, readonly, strong) HTMLNode *startContainer;
+
+/**
+  The offset of the start boundary point.
+ */
+@property (nonatomic, readonly, assign) NSUInteger startOffset;
+
+/**
+ The node of the end boundary point.
+ */
+@property (nonatomic, readonly, strong) HTMLNode *endContainer;
+
+/**
+ The offset of the end boundary point.
+ */
+@property (nonatomic, readonly, assign) NSUInteger endOffset;
+
+/**
+ Checks whether the range is collapsed, i.e. if start is the same as end.
+
+ @return `YES` if the range is collapsed, `NO` otherwise.
+ */
+@property (nonatomic, readonly, assign, getter=isCollapsed) BOOL collapsed;
+
+/**
+ The common container node that contains both start and end nodes.
+ */
+@property (nonatomic, readonly, weak) HTMLNode *commonAncestorContainer;
+
+/**
+ @abstract A range is always associated with a HTML Document. Use `initWithDocument:` initializer instead.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ Initializes a new range instance for the given document.
+
+ @param document The HTML doucment for which the range will be constructed.
+ @return A new HTML Range instance.
+ */
+- (instancetype)initWithDowcument:(HTMLDocument *)document;
+
+/**
+ Initializes a new range instance for the given document and boundaries.
+
+ @param document The HTML doucment for which the range will be constructed.
+ @param startContainer The node for the start boundary
+ @param startOffset The offset of the start boundary
+ @param endContainer The node for the end boundary
+ @param endOffset The offset of the end boundary
+ @return A new HTML Range instance.
+ */
+- (instancetype)initWithDowcument:(HTMLDocument *)document
+				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset;
+
+/**
+ Sets the start boundary.
+
+ @param startNode The new node of the start boundary.
+ @param startOffset The new offset of the start boundary.
+ */
+- (void)setStartNode:(HTMLNode *)node startOffset:(NSUInteger)offset;
+
+/**
+ Sets the end boundary.
+
+ @param startNode The new node of the end boundary.
+ @param startOffset The new offset of the end boundary.
+ */
+- (void)setEndNode:(HTMLNode *)node endOffset:(NSUInteger)offset;
+
+/**
+ Sets the start boundary before the given node.
+
+ @param node The node before which the boundary will be set.
+ */
+- (void)setStartBeforeNode:(HTMLNode *)node;
+
+/**
+ Sets the start boundary after the given node.
+
+ @param node The node after which the boundary will be set.
+ */
+- (void)setStartAfterNode:(HTMLNode *)node;
+
+/**
+ Sets the end boundary before the given node.
+
+ @param node The node before which the boundary will be set.
+ */
+- (void)setEndBeforeNode:(HTMLNode *)node;
+
+/**
+ Sets the end boundary after the given node.
+
+ @param node The node after which the boundary will be set.
+ */
+- (void)setEndAfterNode:(HTMLNode *)node;
+
+/**
+ Collapses this range to its start.
+ */
+- (void)collapseToStart;
+
+/**
+ Collapses this range to its end.
+ */
+- (void)collapseToEnd;
+
+/**
+ Selects the given node in the range.
+
+ @param node The node to select
+ */
+- (void)selectNode:(HTMLNode *)node;
+
+/**
+ Selects the node's contents in the range.
+
+ @param node The node to select the contents.
+ */
+- (void)selectNodeContents:(HTMLNode *)node;
+
+/**
+ Compares the boundary points of the given range with this range.
+
+ @param method The comparison method.
+ @param sourceRange The source range for comparison.
+ @return `NSOrderedAscending` if ordered before, `NSOrderedSame` if ordered same, `NSOrderedDescending` otherwise.
+ 
+ @see HTMLRangeComparisonMethod
+ */
+- (NSComparisonResult)compareBoundaryPoints:(HTMLRangeComparisonMethod)method sourceRange:(HTMLRange *)sourceRange;
+
+/**
+ Compares the given point (reference node, offset) with this range.
+
+ @param node The node to compare with this range.
+ @param offset The offset inside the reference node.
+ @return `NSOrderedAscending`, `NSOrderedSame`, or `NSOrderedDescending` depending on whether the node is before, the same as, or after this range.
+ */
+- (NSComparisonResult)comparePoint:(HTMLNode *)node offset:(NSUInteger)offset;
+
+/**
+ Checks if the given point (reference node, offset) is in this range.
+
+ @param node The node to compare with this range.
+ @param offset The offset inside the reference node.
+ @return `YES` if the given point is in this range, `NO` otherwise.
+ */
+- (BOOL)containsPoint:(HTMLNode *)node offset:(NSUInteger)offset;
+
+/**
+ Checks if the given node intersects this range.
+
+ @param node The node to compare with this range.
+ @return `YES` if the given node intersects the range, `NO` otherwise.
+ */
+- (BOOL)intersectsNode:(HTMLNode *)node;
+
+/**
+ Deletes the contents represented by this range from the associated document.
+ */
+- (void)deleteContents;
+
+/**
+ Extracts the contents represented by this range from the associated document.
+
+ @return A document fragment with the extracted contents.
+ */
+- (HTMLDocumentFragment *)extractContents;
+
+/**
+ Clones the contents represented by this range in the associated document.
+
+ @return A document fragment with the cloned contents.
+ */
+- (HTMLDocumentFragment *)cloneContents;
+
+/**
+ Inserts the given node at the start of this range.
+
+ If the node is being added to a text node, then the text node is split at the insertion point and the given node
+ is inserted between the resulting text nodes.
+
+ @param node The node to insert.
+ */
+- (void)insertNode:(HTMLNode *)node;
+
+/**
+ Surrounds the contents of this range with the given node.
+
+ The range's boundaries will placed around the given node, i.e. start is before and end is after newParent.
+
+ @param newParent The new parent node which will surround the range.
+ */
+- (void)surroundContents:(HTMLNode *)newParent;
+
+/**
+ The stringifier of the range.
+
+ @return The text contents of the range.
+ */
+- (NSString *)textContent;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/include/HTMLText.h

@@ -6,17 +6,14 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
-#import "HTMLNode.h"
+#import "HTMLCharacterData.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  A HTML Text node
  */
-@interface HTMLText : HTMLNode
-
-/** @brief The text string. */
-@property (nonatomic, copy) NSMutableString *data;
+@interface HTMLText : HTMLCharacterData
 
 /**
  Initializes a new HTML text node.
@@ -31,7 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
  
  @param string The string to append.
  */
-- (void)appendString:(NSString *)string;
+- (void)appendString:(NSString *)string __attribute__((deprecated("Use `appendData:` instead.")));
+
+- (HTMLText *)splitTextAtOffset:(NSUInteger)offset;
 
 @end
 

Sources/include/HTMLTokenizer.h

@@ -37,7 +37,7 @@
  
  @see HTMLParser
  */
-@property (nonatomic, weak, readonly) HTMLParser *parser;
+@property (nonatomic, weak) HTMLParser *parser;
 
 /**
  Initializes a new Tokenizer with the given string.

Sources/module.modulemap

@@ -1,30 +1,38 @@
 module HTMLKit {
 	umbrella header "HTMLKit.h"
 
-	private header "CSSCodePoints.h"
-	private header "CSSInputStream.h"
-	private header "HTMLCharacterToken.h"
-	private header "HTMLCommentToken.h"
-	private header "HTMLDOCTYPEToken.h"
-	private header "HTMLElementAdjustment.h"
-	private header "HTMLElementTypes.h"
-	private header "HTMLEOFToken.h"
-	private header "HTMLInputStreamReader.h"
-	private header "HTMLListOfActiveFormattingElements.h"
-	private header "HTMLMarker.h"
-	private header "HTMLNode+Private.h"
-	private header "HTMLNodeTraversal.h"
-	private header "HTMLParseErrorToken.h"
-	private header "HTMLParserInsertionModes.h"
-	private header "HTMLStackOfOpenElements.h"
-	private header "HTMLTagToken.h"
-	private header "HTMLToken.h"
-	private header "HTMLTokenizer.h"
-	private header "HTMLTokenizerCharacters.h"
-	private header "HTMLTokenizerEntities.h"
-	private header "HTMLTokenizerStates.h"
-	private header "HTMLTokens.h"
-
 	module * { export * }
 	export *
+
+	explicit module Private {
+		header "CSSCodePoints.h"
+		header "CSSInputStream.h"
+		header "HTMLCharacterToken.h"
+		header "HTMLCommentToken.h"
+		header "HTMLDOCTYPEToken.h"
+		header "HTMLElementAdjustment.h"
+		header "HTMLElementTypes.h"
+		header "HTMLEOFToken.h"
+		header "HTMLInputStreamReader.h"
+		header "HTMLListOfActiveFormattingElements.h"
+		header "HTMLMarker.h"
+		header "HTMLParseErrorToken.h"
+		header "HTMLParserInsertionModes.h"
+		header "HTMLStackOfOpenElements.h"
+		header "HTMLTagToken.h"
+		header "HTMLToken.h"
+		header "HTMLTokenizer.h"
+		header "HTMLTokenizerCharacters.h"
+		header "HTMLTokenizerEntities.h"
+		header "HTMLTokenizerStates.h"
+		header "HTMLTokens.h"
+		header "HTMLNode+Private.h"
+		header "HTMLDocument+Private.h"
+		header "HTMLCharacterData+Private.h"
+		header "HTMLRange+Private.h"
+		header "HTMLNodeIterator+Private.h"
+		header "HTMLParser+Private.h"
+		header "HTMLNodeTraversal.h"
+		header "HTMLDOMUtils.h"
+	}
 }

Tests/HTMLCharacterDataTests.m

@@ -0,0 +1,100 @@
+//
+//  HTMLCharacterDataTests.m
+//  HTMLKit
+//
+//  Created by Iska on 10/01/17.
+//  Copyright © 2017 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "HTMLElement.h"
+#import "HTMLCharacterData.h"
+#import "HTMLText.h"
+
+@interface HTMLCharacterDataTests : XCTestCase
+
+@end
+
+@implementation HTMLCharacterDataTests
+
+- (void)testSetData
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+
+	[text setData:@"New text"];
+	XCTAssertEqualObjects(text.data, @"New text");
+}
+
+- (void)testAppendData
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+
+	[text appendData:@"New text"];
+	XCTAssertEqualObjects(text.data, @"This is a textNew text");
+}
+
+- (void)testReplaceData
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+
+	[text replaceDataInRange:NSMakeRange(0, 5) withData:@"New text "];
+	XCTAssertEqualObjects(text.data, @"New text is a text");
+
+	[text replaceDataInRange:NSMakeRange(4, 4) withData:@"data"];
+	XCTAssertEqualObjects(text.data, @"New data is a text");
+}
+
+- (void)testDeleteData
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+
+	[text deleteDataInRange:NSMakeRange(5, 3)];
+	XCTAssertEqualObjects(text.data, @"This a text");
+
+	[text deleteDataInRange:NSMakeRange(0, text.data.length)];
+	XCTAssertEqualObjects(text.data, @"");
+}
+
+- (void)testInsertData
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+
+	[text insertData:@"New " atOffset:10];
+	XCTAssertEqualObjects(text.data, @"This is a New text");
+
+	[text insertData:@"Prefix " atOffset:0];
+	XCTAssertEqualObjects(text.data, @"Prefix This is a New text");
+}
+
+- (void)testSplitText_Invalid
+{
+	HTMLText *text = [[HTMLText alloc] initWithData:@"text"];
+	XCTAssertThrows([text splitTextAtOffset:5]);
+}
+
+- (void)testSplitText
+{
+	HTMLElement *div = [[HTMLElement alloc] initWithTagName:@"div"];
+	HTMLText *text = [[HTMLText alloc] initWithData:@"This is a text"];
+	[div appendNode:text];
+
+	HTMLText *newText = [text splitTextAtOffset:7];
+	XCTAssertEqualObjects(newText.data, @" a text");
+
+	XCTAssertEqual(div.childNodesCount, 2);
+	XCTAssertEqualObjects(div.firstChild.textContent, @"This is");
+	XCTAssertEqualObjects(div.lastChild.textContent, @" a text");
+
+	[div appendNode:[[HTMLElement alloc] initWithTagName:@"p"]];
+
+	newText = [newText splitTextAtOffset:0];
+	XCTAssertEqualObjects(newText.data, @" a text");
+
+	XCTAssertEqual(div.childNodesCount, 4);
+	XCTAssertEqualObjects([div childNodeAtIndex:0].textContent, @"This is");
+	XCTAssertEqualObjects([div childNodeAtIndex:1].textContent, @"");
+	XCTAssertEqualObjects([div childNodeAtIndex:2].textContent, @" a text");
+	XCTAssertEqual([div childNodeAtIndex:3].nodeType, HTMLNodeElement);
+}
+
+@end

Tests/HTMLNodesTests.m

@@ -483,4 +483,33 @@
 	XCTAssertEqualObjects([element childNodeAtIndex:1].asElement.tagName, @"p");
 }
 
+- (void)testCompareDocumentPosition
+{
+	HTMLDocument *document = [HTMLDocument documentWithString:@"<div><p>hello</p><div><a></a><img></div></div>"];
+
+	HTMLNode *outerDiv = document.body.firstChild;
+	HTMLNode *paragraph = document.body.firstChild.firstChild;
+	HTMLNode *anchor = [[document.body.firstChild childNodeAtIndex:1] childNodeAtIndex:0];
+	HTMLNode *image = [[document.body.firstChild childNodeAtIndex:1] childNodeAtIndex:1];
+
+	XCTAssertTrue([paragraph compareDocumentPositionWithNode:paragraph] == HTMLDocumentPositionEquivalent);
+
+	HTMLElement *element = [HTMLElement new];
+	XCTAssertTrue([paragraph compareDocumentPositionWithNode:element] ==
+				  (HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
+				   paragraph.hash < element.hash ? HTMLDocumentPositionPreceding: HTMLDocumentPositionFollowing));
+
+	XCTAssertTrue([paragraph compareDocumentPositionWithNode:image] == HTMLDocumentPositionPreceding);
+	XCTAssertTrue([anchor compareDocumentPositionWithNode:image] == HTMLDocumentPositionPreceding);
+	XCTAssertTrue([image compareDocumentPositionWithNode:anchor] == HTMLDocumentPositionFollowing);
+
+	XCTAssertTrue([outerDiv compareDocumentPositionWithNode:paragraph] == (HTMLDocumentPositionContains | HTMLDocumentPositionPreceding));
+	XCTAssertTrue([outerDiv compareDocumentPositionWithNode:anchor] == (HTMLDocumentPositionContains | HTMLDocumentPositionPreceding));
+	XCTAssertTrue([outerDiv compareDocumentPositionWithNode:image] == (HTMLDocumentPositionContains | HTMLDocumentPositionPreceding));
+
+	XCTAssertTrue([paragraph compareDocumentPositionWithNode:outerDiv] == (HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing));
+	XCTAssertTrue([anchor compareDocumentPositionWithNode:outerDiv] == (HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing));
+	XCTAssertTrue([image compareDocumentPositionWithNode:outerDiv] == (HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing));
+}
+
 @end