Merge branch 'release/0.9.4'

# Conflicts:
#	Tests/html5lib-tests

.gitignore

@@ -26,6 +26,7 @@ xcuserdata
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+.build/
 
 # CocoaPods
 #

.gitmodules

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

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 
 branches:
   except:
@@ -15,20 +15,28 @@ env:
     - WORKSPACE=HTMLKit.xcworkspace
     - IOS_FRAMEWORK_SCHEME=HTMLKit-iOS
     - OSX_FRAMEWORK_SCHEME=HTMLKit-OSX
-    - IOS_SDK=iphonesimulator9.2
+    - 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
   matrix:
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"   SIMULATOR="iPhone 6 Plus (9.0)"   SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="OS=9.1,name=iPhone 6S"       SIMULATOR="iPhone 6S (9.1)"       SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="OS=9.2,name=iPhone 6S Plus"  SIMULATOR="iPhone 6S Plus (9.2)"  SCHEME="$IOS_FRAMEWORK_SCHEME"  SDK="$IOS_SDK"
-    - DESTINATION="arch=x86_64"                 SIMULATOR=""                      SCHEME="$OSX_FRAMEWORK_SCHEME"  SDK="$OSX_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="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"
 
 script:
-- set -o pipefail
-- xcodebuild -version
-- 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
-- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
-
+  - set -o pipefail
+  - xcodebuild -version
+  - 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
+  - if [ "$SDK" != "$WATCHOS_SDK" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    fi

CHANGELOG.md

@@ -0,0 +1,148 @@
+# Change Log
+
+## [0.9.4](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.4) 
+
+Released on 2016.09.03
+
+### Added
+
+- `Swift Package Manager` support
+
+## [0.9.3](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.3)
+
+Released on 2016.07.16
+
+This release passes all tokenizer and tree construction html5lib-tests as of 2016.07.16
+
+### Added
+
+- `watchOS` and `tvOS` targets
+- Updated HTML5Lib-Tests submodule (c305da7)
+
+## [0.9.2](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.2)
+
+Released on 2016.05.18
+
+This release passes all tokenizer and tree construction html5lib-tests as of 2016.05.18
+
+### Added
+
+- Handling for `<menu>` and `<menuitem>`
+- Changelog
+
+### Changed
+
+- Updated adoption agency algorithm according to the latest specification, see:
+	- [whatwg/html@22ce3c3](https://github.com/whatwg/html/commit/22ce3c3)
+	- [Mozilla Bug 901319](https://bugzilla.mozilla.org/show_bug.cgi?id=901319)
+	- [Chrome Issue 268121](https://bugs.chromium.org/p/chromium/issues/detail?id=268121) 
+	- [WebKit Bug 119478](https://bugs.webkit.org/show_bug.cgi?id=119478)
+- `<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
+
+### Fixed
+
+- 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
+
+### Added
+
+- Travis-CI integration.
+- CocoaPods spec.
+
+
+### Changed
+
+- Warnings are treated as errors.
+
+### Fixed
+
+- Warnings related to format specifier and loss of precision due to NS(U)-integer usage.
+- Replaced `@returns` with `@return` throughout the documentation to play nicely with Jazzy.
+- Some README examples used Swift syntax.
+
+## [0.9.0](https://github.com/iabudiab/HTMLKit/releases/tag/0.9.0)
+
+Released on 2015.12.23
+
+This is the first public release of `HTMLKit`.
+
+### Added
+
+- `iOS` & `OSX` Frameworks.
+- Source code documentation.
+- CSS Selectors extension (analogous to jQuery selectors).
+- `DOMTokenList` for malipulating `HTMLElements` attributes as a list, e.g. `class`.
+- Handling for `<ruby>` elements in the Parser implementation.
+	- Updated HTML5Lib-Tests submodule (56c435f)
+- Xcode Playground with Swift documentation.
+
+### Removed
+
+- Unused namespaces.
+- Historical node types.
+
+
+### Fixed
+
+- `lt`, `gt` & `eq` CSS Selectors method declarations.
+
+## [0.3.0](https://github.com/iabudiab/HTMLKit/releases/tag/0.3.0)
+
+Released on 2015.11.29
+
+### Added
+
+- CSS3 Selectors support.
+- Nullability annotations.
+- `HTMLNode` properties for previous and next sibling elements.
+- `HTMLNode` methods for accessing child elements (analogous to child nodes).
+- `NSCharacterSet` category for HTML-related character sets.
+
+### Fixed
+
+- `InputStreaReader`'s reconsume-logic that is required by the CSS Parser.
+
+## [0.2.0](https://github.com/iabudiab/HTMLKit/releases/tag/0.1.0)
+
+Released on 2015.06.06
+
+### Added
+
+- `HTMLDocument` methods to access `root`, `head` & `body` elements.
+- `innerHTML` implementation for the `HTMLElement`.
+- `HTMLNode` methods to append, prepend, check containment and descendancy of nodes.
+- `HTMLNode` methods to enumerate child nodes.
+- Implementations for `NodeIterator` and `NodeFilter`
+- Implementation for `TreeWalker`
+- Validation for DOM manipulations.
+- Tests for the DOM implementation.
+
+### Changed
+
+- `type` property renamed to `nodeType` in `HTMLNode`.
+- `firstChildNode` and `lastChildNode` renamed to `firtChild` and `lastChild` in `HTMLNode`.
+
+### Removed
+
+- `baseURI` proeprty from `HTMLNode`
+- `HTMLNodeTreeEnumerator` is superseded by the `HTMLNodeIterator`. 
+
+## [0.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/0.1.0)
+
+Released on 2015.04.20
+
+### Added
+
+- Initial release.
+- Initial DOM implementation.
+- Tokenizer and Parser pass all [HTML5Lib](https://github.com/html5lib/html5lib-tests) tokenizer and tree construction tests except for `<ruby>` elements.

HTMLKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "0.9.1"
+  s.version            = "0.9.4"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"
@@ -9,12 +9,14 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
+  s.watchos.deployment_target = "2.0"
+  s.tvos.deployment_target = "9.0"
 
   s.source = { :git => "https://github.com/iabudiab/HTMLKit.git", :tag => s.version }
 
-  s.source_files         = "HTMLKit", "HTMLKit/**/*.{h,m}"
+  s.source_files         = "Sources", "Sources/**/*.{h,m}"
   s.private_header_files = [
-    'HTMLKit/**/*{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,HTMLNodeTraversal,HTMLParseErrorToken,HTMLParserInsertionModes,HTMLStackOfOpenElements,HTMLNode+Private,HTMLMarker,CSSCodePoints,CSSInputStream}.h'
   ]
 
   s.requires_arc = true

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

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857CE91D39A262008DC254"
+               BuildableName = "HTMLKit.framework"
+               BlueprintName = "HTMLKit-tvOS"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857CF21D39A262008DC254"
+               BuildableName = "HTMLKit-tvOSTests.xctest"
+               BlueprintName = "HTMLKit-tvOSTests"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "HTMLKitParserPerformance">
+               </Test>
+               <Test
+                  Identifier = "HTMLKitTokenizerPerformance">
+               </Test>
+            </SkippedTests>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "62857C4D1D398642008DC254"
+               BuildableName = "HTMLKit.framework"
+               BlueprintName = "HTMLKit-watchOS"
+               ReferencedContainer = "container:HTMLKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857C4D1D398642008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-watchOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857C4D1D398642008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-watchOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

HTMLKit/HTMLKit-Prefix.pch

@@ -1,9 +0,0 @@
-//
-//  Prefix header
-//
-//  The contents of this file are implicitly included at the beginning of every source file.
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-#endif

HTMLKit/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

HTMLKitTests/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+	name: "HTMLKit"
+)

README.md

@@ -1,10 +1,15 @@
 # HTMLKit
 
-![HTMLKit Logo](HTMLKit.png)
+![HTMLKit Logo](https://raw.githubusercontent.com/iabudiab/HTMLKit/master/HTMLKit.png)
 
 An Objective-C framework for your everyday HTML needs.
 
-[![Build Status](https://travis-ci.org/iabudiab/HTMLKit.svg?branch=develop)](https://travis-ci.org/iabudiab/HTMLKit) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![License MIT](https://img.shields.io/badge/license-MIT-4481C7.svg)](https://opensource.org/licenses/MIT)
+[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/master.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
 
@@ -18,7 +23,7 @@ DOM mutations are validated as described in the [WHATWG DOM Standard](https://do
 
 ## Tests
 
-HTMLKit passes all of the [HTML5Lib](https://github.com/html5lib/html5lib-tests) Tokenizer and Tree Construction tests except for the Blink changes introduced on the 16.09.2015. The `html5lib-tests` is configured as a git-submodule. If you plan to run the tests, do not forget to pull it too.
+HTMLKit passes all of the [HTML5Lib](https://github.com/html5lib/html5lib-tests) Tokenizer and Tree Construction tests. The `html5lib-tests` is configured as a git-submodule. If you plan to run the tests, do not forget to pull it too.
 
 The CSS3 Selector implementation is tested with an adapted version of the [CSS3 Selectors Test Suite](http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/full/flat/index.html), ignoring the tests that require user interaction, session history, and scripting.
 
@@ -26,6 +31,87 @@ The CSS3 Selector implementation is tested with an adapted version of the [CSS3
 
 Check out the playground!
 
+# Installation
+
+### Carthage
+
+[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+
+If you don't have Carthage yet, you can install it with Homebrew using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To add `HTMLKit` as a dependency into your project using Carthage just add the following line in your `Cartfile`:
+
+```
+github "iabudiab/HTMLKit"
+```
+
+Then run the following command to build the framework and drag the built `HTMLKit.framework` into your Xcode project.
+
+```bash
+$ carthage update
+```
+
+### CocoaPods
+
+[CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects.
+
+If you don't have CocoaPods yet, you can install it with the following command:
+
+```bash
+$ gem install cocoapods
+```
+
+To add `HTMLKit` as a dependency into your project using CocoaPods just add the following in your `Podfile`:
+
+```ruby
+use_frameworks!
+
+target 'MyTarget' do
+  pod 'HTMLKit', '~> 0.9'
+end
+```
+
+Then, run the following command:
+
+```bash
+$ pod install
+```
+
+### 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)
+```
+
+Then run:
+
+```bash
+$ swift build
+```
+
+### Manually
+
+1- Add `HTMLKit` as git submodule
+
+```bash
+$ git submodule add https://github.com/iabudiab/HTMLKit.git
+```
+
+2- Open the `HTMLKit` folder and drag'n'drop the `HTMLKit.xcodeproj` into the Project Navigator in Xcode to add it as a sub-project.
+
+3- In the General panel of your target add `HTMLKit.framework` under the `Embedded Binaries` 
+
+# Features
+
 # Parsing Documents
 
 Given some HTML content, you can parse it either via the `HTMLParser` or instatiate a `HTMLDocument` directly:
@@ -180,7 +266,7 @@ NSArray *hasSiblingParagraph = [document elementsMatchingSelector:generalSibling
 NSArray *nonParagraphChildOfDiv = [document elementsMatchingSelector:
 	allOf(@[
 		childOfElementSelector(typeSelector(@"div")),
-		nay(typeSelector(@"p"))
+		not(typeSelector(@"p"))
 	])
 ];
 ```
@@ -214,6 +300,10 @@ CSSSelector *myAwesomeSelector = namedBlockSelector(@"myAwesomeSelector", ^BOOL
 notParagraphAndNotDiv = [firstDivElement elementsMatchingSelector:myAwesomeSelector];
 ```
 
+# Change Log
+
+See the [CHANGELOG.md](CHANGELOG.md) for more info.
+
 # License
 
-HTMLKit is available under the MIT license. See the LICENSE file for more info.
+HTMLKit is available under the MIT license. See the [LICENSE](LICENSE) file for more info.

Sources/HTMLKit-Info.plist

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

Sources/HTMLKitDOMExceptions.m

@@ -6,6 +6,7 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "HTMLKitDOMExceptions.h"
 
 NSString * const HTMLKitHierarchyRequestError = @"HierarchyRequestError";

Sources/HTMLParser.m

@@ -519,7 +519,7 @@
 
 - (void)generateImpliedEndTagsExceptForElement:(NSString *)tagName
 {
-	while ([self.currentNode.tagName isEqualToAny:@"dd", @"dt", @"li", @"option", @"optgroup", @"p", @"rb", @"rp", @"rt", @"rtc", nil] &&
+	while ([self.currentNode.tagName isEqualToAny:@"dd", @"dt", @"li", @"menuitem", @"option", @"optgroup", @"p", @"rb", @"rp", @"rt", @"rtc", nil] &&
 		   ![self.currentNode.tagName isEqualToString:tagName]) {
 		[_stackOfOpenElements popCurrentNode];
 	}
@@ -588,20 +588,29 @@
 		HTMLElement *lastNode = furthestBlock;
 
 		NSUInteger index = [_stackOfOpenElements indexOfElement:node];
-		for (int innerLoopCounter = 0; innerLoopCounter < 3; innerLoopCounter ++) {
 
-			index--;
+		int innerLoopCounter = 0;
+		while (YES) {
+
+			innerLoopCounter += 1;
+			index -= 1;
+
 			node = _stackOfOpenElements[index];
 
+			if ([node isEqual:formattingElement]) {
+				break;
+			}
+
+			if (innerLoopCounter > 3 && [_listOfActiveFormattingElements containsElement:node]) {
+				[_listOfActiveFormattingElements removeElement:node];
+				continue;
+			}
+
 			if (![_listOfActiveFormattingElements containsElement:node]) {
 				[_stackOfOpenElements removeElement:node];
 				continue;
 			}
 
-			if ([node isEqual:formattingElement]) {
-				break;
-			}
-
 			HTMLElement *newElement = [node copy];
 			[_listOfActiveFormattingElements replaceElementAtIndex:[_listOfActiveFormattingElements indexOfElement:node]
 													   withElement:newElement];
@@ -1158,8 +1167,8 @@
 				[self HTMLInsertionModeInTemplate:token];
 			} else {
 				for (HTMLElement *node in _stackOfOpenElements) {
-					if ([node.tagName isEqualToAny:@"dd", @"dt", @"li", @"optgroup", @"option", @"p", @"rb", @"rp",
-						 @"rt", @"rtc", @"tbody", @"td", @"tfoot", @"th", @"thead", @"tr", @"body", @"html", nil]) {
+					if ([node.tagName isEqualToAny:@"dd", @"dt", @"li", @"menuitem", @"optgroup", @"option", @"p", @"rb",
+						 @"rp", @"rt", @"rtc", @"tbody", @"td", @"tfoot", @"th", @"thead", @"tr", @"body", @"html", nil]) {
 						[self emitParseError:@"EOF reached with unclosed element <%@> in <body>", node.tagName];
 						break;
 					}
@@ -1222,12 +1231,20 @@
 		[self switchInsertionMode:HTMLInsertionModeInFrameset];
 	} else if ([tagName isEqualToAny:@"address", @"article", @"aside", @"blockquote", @"center",
 				@"details", @"dialog", @"dir", @"div", @"dl", @"fieldset", @"figcaption", @"figure",
-				@"footer", @"header", @"hgroup", @"main", @"menu", @"nav", @"ol", @"p", @"section",
+				@"footer", @"header", @"hgroup", @"main", @"nav", @"ol", @"p", @"section",
 				@"summary", @"ul", nil]) {
 		if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
 			[self closePElement];
 		}
 		[self insertElementForToken:token];
+	} else if ([tagName isEqualToString:@"menu"]) {
+		if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
+			[self closePElement];
+		}
+		if ([self.currentNode.tagName isEqualToString:@"menuitem"]) {
+			[_stackOfOpenElements popCurrentNode];
+		}
+		[self insertElementForToken:token];
 	} else if ([tagName isEqualToAny:@"h1", @"h2", @"h3", @"h4", @"h5", @"h6", nil]) {
 		if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
 			[self closePElement];
@@ -1364,13 +1381,16 @@
 		if (type == nil || ![type isEqualToStringIgnoringCase:@"hidden"]) {
 			_framesetOkFlag = NO;
 		}
-	} else if ([tagName isEqualToAny:@"menuitem", @"param", @"source", @"track", nil]) {
+	} else if ([tagName isEqualToAny:@"param", @"source", @"track", nil]) {
 		[self insertElementForToken:token];
 		[_stackOfOpenElements popCurrentNode];
 	} else if ([tagName isEqualToString:@"hr"]) {
 		if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
 			[self closePElement];
 		}
+		if ([self.currentNode.tagName isEqualToString:@"menuitem"]) {
+			[_stackOfOpenElements popCurrentNode];
+		}
 		[self insertElementForToken:token];
 		[_stackOfOpenElements popCurrentNode];
 		_framesetOkFlag = NO;
@@ -1378,52 +1398,6 @@
 		[self emitParseError:@"Image Start Tag Token with tagname <image> should be <img>. Don't ask."];
 		token.tagName = @"img";
 		[self reprocessToken:token];
-	} else if ([tagName isEqualToString:@"isindex"]) {
-		[self emitParseError:@"Unexpected start tag <isindex> in <body>"];
-		if (_formElementPointer != nil && ![_stackOfOpenElements containsElementWithTagName:@"template"]) {
-			return;
-		}
-		_framesetOkFlag = NO;
-		if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
-			[self closePElement];
-		}
-
-		HTMLStartTagToken *formToken = [[HTMLStartTagToken alloc] initWithTagName:@"form"];
-		HTMLElement *form = [self insertElementForToken:formToken];
-		if (![_stackOfOpenElements containsElementWithTagName:@"template"]) {
-			_formElementPointer = form;
-		}
-		NSString *action = token.attributes[@"action"];
-		if (action != nil) {
-			form.attributes[@"action"] = action;
-		}
-
-		HTMLStartTagToken *hrToken = [[HTMLStartTagToken alloc] initWithTagName:@"hr"];
-		[self insertElementForToken:hrToken];
-
-		[_stackOfOpenElements popCurrentNode];
-		[self reconstructActiveFormattingElements];
-
-		HTMLStartTagToken *labelToken = [[HTMLStartTagToken alloc] initWithTagName:@"label"];
-		[self insertElementForToken:labelToken];
-
-		NSString *prompt = token.attributes[@"prompt"] ?: @"This is a searchable index. Enter search keywords: ";
-		[self insertCharacters:prompt];
-
-		NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithDictionary:token.attributes];
-		attributes[@"name"] = @"isindex";
-		[attributes removeObjectForKey:@"action"];
-		[attributes removeObjectForKey:@"prompt"];
-
-		HTMLStartTagToken *inputToken = [[HTMLStartTagToken alloc] initWithTagName:@"input" attributes:attributes];
-		[self insertElementForToken:inputToken];
-		[_stackOfOpenElements popCurrentNode];
-
-		[_stackOfOpenElements popCurrentNode];
-		[self insertElementForToken:hrToken];
-		[_stackOfOpenElements popCurrentNode];
-		[_stackOfOpenElements popCurrentNode];
-		_formElementPointer = nil;
 	} else if ([tagName isEqualToString:@"textarea"]) {
 		[self insertElementForToken:token];
 		_ignoreNextLineFeedCharacterToken = YES;
@@ -1462,6 +1436,12 @@
 		}
 		[self reconstructActiveFormattingElements];
 		[self insertElementForToken:token];
+	} else if ([tagName isEqualToString:@"menuitem"]) {
+		if ([self.currentNode.tagName isEqualToString:@"menuitem"]) {
+			[_stackOfOpenElements popCurrentNode];
+		}
+		[self reconstructActiveFormattingElements];
+		[self insertElementForToken:token];
 	} else if ([tagName isEqualToAny:@"rb", @"rtc", nil]) {
 		if ([_stackOfOpenElements hasElementInScopeWithTagName:@"ruby"]) {
 			[self generateImpliedEndTagsExceptForElement:nil];
@@ -1516,8 +1496,8 @@
 			[self emitParseError:@"Unexpected end tag </body> without body element in scope in <body>"];
 		}
 		for (HTMLElement *node in _stackOfOpenElements) {
-			if ([node.tagName isEqualToAny:@"dd", @"dt", @"li", @"optgroup", @"option", @"p", @"rb", @"rp", @"rt",
-				 @"rtc", @"tbody", @"td", @"tfoot", @"th", @"thead", @"tr", @"body", @"html", nil]) {
+			if ([node.tagName isEqualToAny:@"dd", @"dt", @"li", @"menuitem", @"optgroup", @"option", @"p", @"rb", @"rp",
+				 @"rt", @"rtc", @"tbody", @"td", @"tfoot", @"th", @"thead", @"tr", @"body", @"html", nil]) {
 				[self emitParseError:@"Misnested end tag </%@> with open element <%@> in <body>", tagName, node.tagName];
 				break;
 			}

Sources/HTMLStackOfOpenElements.m

@@ -129,7 +129,11 @@
 
 - (void)popElementsUntilElementPoppedWithTagName:(NSString *)tagName
 {
-	while (self.currentNode && ![self.currentNode.tagName isEqualToString:tagName]) {
+	while (self.currentNode) {
+		if (self.currentNode.htmlNamespace == HTMLNamespaceHTML &&
+			[self.currentNode.tagName isEqualToString:tagName]) {
+			break;
+		}
 		[_stack removeLastObject];
 	}
 	[_stack removeLastObject];
@@ -137,7 +141,11 @@
 
 - (void)popElementsUntilAnElementPoppedWithAnyOfTagNames:(NSArray *)tagNames
 {
-	while (self.currentNode && ![tagNames containsObject:self.currentNode.tagName]) {
+	while (self.currentNode) {
+		if (self.currentNode.htmlNamespace == HTMLNamespaceHTML &&
+			[tagNames containsObject:self.currentNode.tagName]) {
+			break;
+		}
 		[_stack removeLastObject];
 	}
 	[_stack removeLastObject];
@@ -257,7 +265,10 @@
 {
 	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
 		if ([tagNames containsObject:node.tagName]) {
-			return node;
+			NSNumber *namespace = elementTypes[node.tagName] ?: @(HTMLNamespaceHTML);
+			if ([namespace isEqual:@(node.htmlNamespace)]) {
+				return node;
+			}
 		}
 		if ([elementTypes[node.tagName] isEqual:@(node.htmlNamespace)]) {
 			return nil;

Sources/include/CSSStructuralPseudoSelectors.h

@@ -6,6 +6,8 @@
 //  Copyright © 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 @class CSSSelector;
 
 NS_ASSUME_NONNULL_BEGIN

Sources/include/HTMLElementTypes.h

@@ -39,8 +39,8 @@ NS_INLINE BOOL IsSpecialElement(HTMLElement *element)
 				@"dir", @"div", @"dl", @"dt", @"embed", @"fieldset", @"figcaption",
 				@"figure", @"footer", @"form", @"frame", @"frameset", @"h1", @"h2", @"h3",
 				@"h4", @"h5", @"h6", @"head", @"header", @"hgroup", @"hr", @"html", @"iframe",
-				@"img", @"input", @"isindex", @"li", @"link", @"listing", @"main", @"marquee",
-				@"menu", @"menuitem", @"meta", @"nav", @"noembed", @"noframes", @"noscript",
+				@"img", @"input", @"li", @"link", @"listing", @"main", @"marquee",
+				@"menu", @"meta", @"nav", @"noembed", @"noframes", @"noscript",
 				@"object", @"ol", @"p", @"param", @"plaintext", @"pre", @"script", @"section",
 				@"select", @"source", @"style", @"summary", @"table", @"tbody", @"td",
 				@"template", @"textarea", @"tfoot", @"th", @"thead", @"title", @"tr",

Sources/include/HTMLKitDOMExceptions.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 extern NSString * const HTMLKitHierarchyRequestError;
 extern NSString * const HTMLKitNotFoundError;
 extern NSString * const HTMLKitNotSupportedError;

Sources/include/HTMLNode+Private.h

@@ -10,7 +10,7 @@
 /// HTMLKit private header
 ///------------------------------------------------------
 
-#import <HTMLKit/HTMLKit.h>
+#import "HTMLNode.h"
 
 /**
  Private HTML Node methods which are not intended for public API.