Merge branch 'release/3.1.0'

Bump HTMLKit version to 3.1.0
Update podspec for 3.0.0
2019-08-20 18:20:03 +02:00 · 2019-08-20 18:19:31 +02:00 · 2019-08-20 18:19:08 +02:00 · 2019-08-20 18:18:58 +02:00 · 2019-08-20 18:18:49 +02:00 · 2019-08-20 18:18:06 +02:00
56 changed files with 1214 additions and 245 deletions
@@ -1,5 +1,5 @@
 module: HTMLKit
-module_version: 2.1.2
+module_version: 3.1.0
 author: Iskandar Abudiab 
 author_url: https://twitter.com/iabudiab
 github_url: https://github.com/iabudiab/HTMLKit
@@ -33,6 +33,7 @@ custom_categories:
    - HTMLTemplate
    - HTMLDOMTokenList
    - HTMLRange
+    - HTMLSerializer

  - name: Iteration & Filtering
    children:
@@ -41,7 +42,9 @@ custom_categories:
    - HTMLNodeFilterShowOptions
    - HTMLNodeFilterValue
    - HTMLNodeFilterBlock
+    - HTMLNodeVisitor
    - HTMLSelectorNodeFilter
+    - HTMLTreeVisitor
    - HTMLTreeWalker

  - name: Structures
@@ -1,5 +1,59 @@
 # Change Log

+## [3.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.1.0)
+
+Release on 2019.08.20
+
+### Added
+
+- `HTMLTreeVisitor` that walks the DOM in tree order
+- New HTML serialization implementation based on visitor pattern
+
+### Fixes
+
+- HTML serialization for deeply nested DOM trees (issue #33)
+- Occasional Internal Consistency exceptions when deallocating node iterator (issue #36)
+
+
+## [3.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.0.0) 
+
+Released on 2019.03.28
+
+### Breaking Change
+
+- Introduce prefix for `NSString` and `NSCharacterSet` categories to prevent collision with existing code (issue #35)
+
+
+## [2.1.5](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.5) 
+
+Released on 2018.07.16
+
+### Fixes
+
+- Parser would handle foreign attributes incorrectly (issue #30)
+
+
+## [2.1.4](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.4) 
+
+Released on 2018.05.01
+
+### Fixes
+
+- `gt(n)`, `lt(n)` and `eq(n)` selectors would select wrong elements for the zero-index (issue #25)
+
+
+## [2.1.3](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.3) 
+
+Released on 2018.03.21
+
+### Fixes
+
+- `HTMLElement` clone would return an immutable dictionary for attributes (issue #20)
+	- Fixed by @CRivlaldo in PR #24
+- `HTMLNodeFilterBlock` would behave differently on simulator and device (issue #22)
+	- Fixed by @CRivlaldo in PR #23
+
+
 ## [2.1.2](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.2) 

 Released on 2017.11.6
@@ -112,7 +112,7 @@ do {
 	try scraper.load()

 	// Parse the selector
-	let repositoryContent = try CSSSelectorParser.parseSelector("[role='main'] .repository-content > .file-wrap > .files tr.js-navigation-item")
+	let repositoryContent = try CSSSelectorParser.parseSelector(".repository-content > .file-wrap > table.files tr.js-navigation-item")

 	// Query matching elements
 	let files =  try scraper.listElements(matching: repositoryContent)
@@ -131,13 +131,10 @@ do {
 	// 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")
+				classSelector("repository-content")
 			])
 		),
 		descendantOfElementSelector(
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name               = "HTMLKit"
-  s.version            = "2.1.2"
+  s.version            = "3.1.0"
  s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
  s.license            = "MIT"
  s.homepage           = "https://github.com/iabudiab/HTMLKit"
@@ -11,6 +11,9 @@
 		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, ); }; };
+		620AB7B12087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */ = {isa = PBXBuildFile; fileRef = 620AB7B02087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m */; };
+		620AB7B22087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */ = {isa = PBXBuildFile; fileRef = 620AB7B02087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m */; };
+		620AB7B32087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */ = {isa = PBXBuildFile; fileRef = 620AB7B02087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m */; };
 		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 */; };
@@ -55,6 +58,18 @@
 		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 */; };
+		625A67C9224AC62C00C6D57D /* NSString+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A67C7224AC62C00C6D57D /* NSString+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		625A67CA224AC62C00C6D57D /* NSString+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A67C7224AC62C00C6D57D /* NSString+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		625A67CB224AC62C00C6D57D /* NSString+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A67C7224AC62C00C6D57D /* NSString+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		625A67CC224AC62C00C6D57D /* NSString+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625A67C7224AC62C00C6D57D /* NSString+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		625A67CD224AC62C00C6D57D /* NSString+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67C8224AC62C00C6D57D /* NSString+Private.m */; };
+		625A67CE224AC62C00C6D57D /* NSString+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67C8224AC62C00C6D57D /* NSString+Private.m */; };
+		625A67CF224AC62C00C6D57D /* NSString+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67C8224AC62C00C6D57D /* NSString+Private.m */; };
+		625A67D0224AC62C00C6D57D /* NSString+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67C8224AC62C00C6D57D /* NSString+Private.m */; };
+		625A67D2224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */; };
+		625A67D3224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */; };
+		625A67D4224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */; };
+		625A67D5224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */; };
 		625D0F031C2717DE00D7BEB0 /* HTMLNode+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625D0F011C2717DE00D7BEB0 /* HTMLNode+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		625D0F041C2717DE00D7BEB0 /* HTMLNode+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 625D0F011C2717DE00D7BEB0 /* HTMLNode+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		625EE4571CBAA41D00F2CC8E /* HTMLKitTestObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */; };
@@ -306,9 +321,31 @@
 		62857D8F1D39A47F008DC254 /* CSSCombinatorSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 62FA04E11BCC360D009ABF98 /* CSSCombinatorSelector.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		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 */; };
+		6295FB0722F0E770005C6DE8 /* HTMLNodeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB0822F0E770005C6DE8 /* HTMLNodeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB0922F0E770005C6DE8 /* HTMLNodeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB0A22F0E770005C6DE8 /* HTMLNodeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB0B22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */; };
+		6295FB0C22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */; };
+		6295FB0D22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */; };
+		6295FB0E22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */; };
+		6295FB1122F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB1222F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB1322F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB1422F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6295FB1522F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */; };
+		6295FB1622F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */; };
+		6295FB1722F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */; };
+		6295FB1822F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */; };
+		6295FB1A22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1922F0F309005C6DE8 /* HTMLTreeVisitorTests.m */; };
+		6295FB1B22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1922F0F309005C6DE8 /* HTMLTreeVisitorTests.m */; };
+		6295FB1C22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6295FB1922F0F309005C6DE8 /* HTMLTreeVisitorTests.m */; };
 		62A95A4D1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */; };
 		62A95A4E1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */; };
 		62A95A4F1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */; };
+		62C82E0D20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C82E0C20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m */; };
+		62C82E0E20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C82E0C20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m */; };
+		62C82E0F20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C82E0C20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m */; };
 		62D8345A19FB1AC4009205A9 /* HTML5LibTokenizerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.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, ); }; };
@@ -318,6 +355,14 @@
 		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 */; };
+		62E0917F22EDEB9D00C61073 /* HTMLSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62E0918022EDEB9D00C61073 /* HTMLSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62E0918122EDEB9D00C61073 /* HTMLSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62E0918222EDEB9D00C61073 /* HTMLSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		62E0918322EDEB9D00C61073 /* HTMLSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0917E22EDEB9D00C61073 /* HTMLSerializer.m */; };
+		62E0918422EDEB9D00C61073 /* HTMLSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0917E22EDEB9D00C61073 /* HTMLSerializer.m */; };
+		62E0918522EDEB9D00C61073 /* HTMLSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0917E22EDEB9D00C61073 /* HTMLSerializer.m */; };
+		62E0918622EDEB9D00C61073 /* HTMLSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 62E0917E22EDEB9D00C61073 /* HTMLSerializer.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 */; };
@@ -584,6 +629,7 @@
 /* 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>"; };
+		620AB7B02087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CSSStructuralPseudoSelectors.m; path = HTMLKitTests/CSSStructuralPseudoSelectors.m; 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>"; };
 		620EE9471BC46F2A0028ED34 /* CSSPseudoClassSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSPseudoClassSelector.h; path = include/CSSPseudoClassSelector.h; sourceTree = "<group>"; };
@@ -685,6 +731,9 @@
 		625A14DF19C7834100AD0C32 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		625A150619C78ABA00AD0C32 /* HTMLInputStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLInputStreamReader.h; path = include/HTMLInputStreamReader.h; sourceTree = "<group>"; };
 		625A150719C78ABA00AD0C32 /* HTMLInputStreamReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLInputStreamReader.m; sourceTree = "<group>"; };
+		625A67C7224AC62C00C6D57D /* NSString+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSString+Private.h"; path = "include/NSString+Private.h"; sourceTree = "<group>"; };
+		625A67C8224AC62C00C6D57D /* NSString+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Private.m"; sourceTree = "<group>"; };
+		625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HTMLQuircksMode.m; sourceTree = "<group>"; };
 		625D0F011C2717DE00D7BEB0 /* HTMLNode+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "HTMLNode+Private.h"; path = "include/HTMLNode+Private.h"; sourceTree = "<group>"; };
 		625EE4551CBAA41D00F2CC8E /* HTMLKitTestObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLKitTestObserver.h; path = HTMLKitTests/HTMLKitTestObserver.h; sourceTree = "<group>"; };
 		625EE4561CBAA41D00F2CC8E /* HTMLKitTestObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLKitTestObserver.m; path = HTMLKitTests/HTMLKitTestObserver.m; sourceTree = "<group>"; };
@@ -706,6 +755,11 @@
 		628AF63C1BC9D6FB00496128 /* CSSStructuralPseudoSelectors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSStructuralPseudoSelectors.h; path = include/CSSStructuralPseudoSelectors.h; sourceTree = "<group>"; };
 		628AF63D1BC9D6FB00496128 /* CSSStructuralPseudoSelectors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSStructuralPseudoSelectors.m; sourceTree = "<group>"; };
 		628B7CE61A080E1000602C87 /* HTMLNamespaces.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLNamespaces.h; path = include/HTMLNamespaces.h; sourceTree = "<group>"; };
+		6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLNodeVisitor.h; path = include/HTMLNodeVisitor.h; sourceTree = "<group>"; };
+		6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HTMLNodeVisitor.m; sourceTree = "<group>"; };
+		6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTreeVisitor.h; path = include/HTMLTreeVisitor.h; sourceTree = "<group>"; };
+		6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HTMLTreeVisitor.m; sourceTree = "<group>"; };
+		6295FB1922F0F309005C6DE8 /* HTMLTreeVisitorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = HTMLTreeVisitorTests.m; path = HTMLKitTests/HTMLTreeVisitorTests.m; sourceTree = "<group>"; };
 		62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = HTMLSerializationTests.m; path = HTMLKitTests/HTMLSerializationTests.m; sourceTree = "<group>"; };
 		62ACB8DB1BC5C13E00E283C1 /* CSSPseudoFunctionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSPseudoFunctionSelector.h; path = include/CSSPseudoFunctionSelector.h; sourceTree = "<group>"; };
 		62ACB8DC1BC5C13E00E283C1 /* CSSPseudoFunctionSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSSPseudoFunctionSelector.m; sourceTree = "<group>"; };
@@ -719,10 +773,13 @@
 		62AE594319F992F30043F069 /* HTMLCommentToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCommentToken.m; sourceTree = "<group>"; };
 		62AE594719F9948A0043F069 /* HTMLCharacterToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLCharacterToken.h; path = include/HTMLCharacterToken.h; sourceTree = "<group>"; };
 		62AE594819F9948A0043F069 /* HTMLCharacterToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLCharacterToken.m; sourceTree = "<group>"; };
+		62C82E0C20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = HTMLKitParserIssuesTests.m; path = HTMLKitTests/HTMLKitParserIssuesTests.m; sourceTree = "<group>"; };
 		62D8345719FB1AC4009205A9 /* HTML5LibTokenizerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTML5LibTokenizerTest.h; path = HTMLKitTests/HTML5LibTokenizerTest.h; sourceTree = "<group>"; };
 		62D8345819FB1AC4009205A9 /* HTML5LibTokenizerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTML5LibTokenizerTest.m; path = HTMLKitTests/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>"; };
+		62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLSerializer.h; path = include/HTMLSerializer.h; sourceTree = "<group>"; };
+		62E0917E22EDEB9D00C61073 /* HTMLSerializer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HTMLSerializer.m; sourceTree = "<group>"; };
 		62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTMLCharacterDataTests.m; path = HTMLKitTests/HTMLCharacterDataTests.m; sourceTree = "<group>"; };
 		62E1A3B41E610E5300C41C3B /* Fixtures */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Fixtures; sourceTree = "<group>"; };
 		62E7CAAE19CDFFB500465A83 /* HTMLTokenizerCharacters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HTMLTokenizerCharacters.h; path = include/HTMLTokenizerCharacters.h; sourceTree = "<group>"; };
@@ -852,18 +909,23 @@
 				623406E01ADB04F9004677A3 /* HTMLTemplate.m */,
 				62567F4E1C0CB5750025D458 /* HTMLDOMTokenList.h */,
 				62567F4F1C0CB5750025D458 /* HTMLDOMTokenList.m */,
-				6247A9411B152F4F00CCF25C /* HTMLNodeIterator.h */,
-				6247A9421B152F4F00CCF25C /* HTMLNodeIterator.m */,
-				624717BA1B22009200B38302 /* HTMLTreeWalker.h */,
-				624717BB1B22009200B38302 /* HTMLTreeWalker.m */,
 				6247A9461B152F8C00CCF25C /* HTMLNodeFilter.h */,
 				624717B71B21FE5400B38302 /* HTMLNodeFilter.m */,
+				6247A9411B152F4F00CCF25C /* HTMLNodeIterator.h */,
+				6247A9421B152F4F00CCF25C /* HTMLNodeIterator.m */,
+				6295FB0522F0E770005C6DE8 /* HTMLNodeVisitor.h */,
+				6295FB0622F0E770005C6DE8 /* HTMLNodeVisitor.m */,
+				6295FB0F22F0ECEE005C6DE8 /* HTMLTreeVisitor.h */,
+				6295FB1022F0ECEE005C6DE8 /* HTMLTreeVisitor.m */,
+				624717BA1B22009200B38302 /* HTMLTreeWalker.h */,
+				624717BB1B22009200B38302 /* HTMLTreeWalker.m */,
 				62D91C211DE218A500BEFADE /* HTMLRange.h */,
 				62D91C221DE218A500BEFADE /* HTMLRange.m */,
 				6238C9831AB8D6330006512E /* HTMLKitDOMExceptions.h */,
 				6238C9841AB8D6330006512E /* HTMLKitDOMExceptions.m */,
 				628B7CE61A080E1000602C87 /* HTMLNamespaces.h */,
 				623719431AA12EE8002E03C8 /* HTMLQuirksMode.h */,
+				625A67D1224ADC7700C6D57D /* HTMLQuircksMode.m */,
 				625D0F071C2717E400D7BEB0 /* Private */,
 			);
 			name = DOM;
@@ -884,12 +946,12 @@
 			isa = PBXGroup;
 			children = (
 				623916C61AC7209E0066B4FE /* HTMLNodeIteratorTests.m */,
+				6295FB1922F0F309005C6DE8 /* HTMLTreeVisitorTests.m */,
 				6247171B1B2240B800C11912 /* HTMLTreeWalkerTests.m */,
 				624FC3791AE591D80015DDF9 /* HTMLNodesTests.m */,
 				62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */,
 				62EC0A841E158BD80007786B /* HTMLRangeTests.m */,
 				62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */,
-				62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */,
 			);
 			name = DOM;
 			sourceTree = "<group>";
@@ -964,6 +1026,7 @@
 				62AE593219F97CCA0043F069 /* Tokenizing */,
 				628E16EC1ADAE71700B15A06 /* Parsing */,
 				623719441AA1472B002E03C8 /* DOM */,
+				62E0917C22EDEB8700C61073 /* Serializing */,
 				628E16ED1ADAE73700B15A06 /* Categories */,
 				628E16EE1ADAE75300B15A06 /* Structures */,
 				62079BE61AF5656600D3B402 /* CSS */,
@@ -989,6 +1052,8 @@
 				625EE45A1CBB171300F2CC8E /* HTMLKitTestUtil.m */,
 				6236738C1AC0CD2400FF89B3 /* Tokenizer */,
 				623975581AC362A5007E26F1 /* Tree Construction */,
+				62C82E0B20FD2FCB008497A8 /* Parser */,
+				629621A222F5A24400F81B5A /* Serialization */,
 				624B9FB71AE072CB00646C4C /* DOM */,
 				624B9FB81AE072D500646C4C /* Categories */,
 				624E1A2D1B1D1C8A00E66AAC /* Structures */,
@@ -1046,6 +1111,8 @@
 		628E16ED1ADAE73700B15A06 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
+				625A67C7224AC62C00C6D57D /* NSString+Private.h */,
+				625A67C8224AC62C00C6D57D /* NSString+Private.m */,
 				6235CE991AA509430026937B /* NSString+HTMLKit.h */,
 				6235CE9A1AA509430026937B /* NSString+HTMLKit.m */,
 				624B28C21B04190D0048D328 /* NSCharacterSet+HTMLKit.h */,
@@ -1063,6 +1130,14 @@
 			name = Structures;
 			sourceTree = "<group>";
 		};
+		629621A222F5A24400F81B5A /* Serialization */ = {
+			isa = PBXGroup;
+			children = (
+				62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */,
+			);
+			name = Serialization;
+			sourceTree = "<group>";
+		};
 		62AE593219F97CCA0043F069 /* Tokenizing */ = {
 			isa = PBXGroup;
 			children = (
@@ -1093,6 +1168,23 @@
 			name = Tokenizing;
 			sourceTree = "<group>";
 		};
+		62C82E0B20FD2FCB008497A8 /* Parser */ = {
+			isa = PBXGroup;
+			children = (
+				62C82E0C20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m */,
+			);
+			name = Parser;
+			sourceTree = "<group>";
+		};
+		62E0917C22EDEB8700C61073 /* Serializing */ = {
+			isa = PBXGroup;
+			children = (
+				62E0917D22EDEB9D00C61073 /* HTMLSerializer.h */,
+				62E0917E22EDEB9D00C61073 /* HTMLSerializer.m */,
+			);
+			name = Serializing;
+			sourceTree = "<group>";
+		};
 		62ECBEDF1C0B671000AF847B /* Parsing */ = {
 			isa = PBXGroup;
 			children = (
@@ -1144,6 +1236,7 @@
 				624AB3191B050A4D00F3830D /* CSSAttributeSelectorTests.m */,
 				62F6586F1BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m */,
 				621FBE5C1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m */,
+				620AB7B02087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m */,
 			);
 			name = Selectors;
 			sourceTree = "<group>";
@@ -1171,6 +1264,8 @@
 				62ECBEEA1C0B69FD00AF847B /* HTMLCommentToken.h in Headers */,
 				62ECBEEB1C0B69FD00AF847B /* HTMLDOCTYPEToken.h in Headers */,
 				626BE1E21DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
+				6295FB1122F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */,
+				625A67C9224AC62C00C6D57D /* NSString+Private.h in Headers */,
 				62ECBEEC1C0B69FD00AF847B /* HTMLParseErrorToken.h in Headers */,
 				62ECBEED1C0B69FD00AF847B /* HTMLTagToken.h in Headers */,
 				62ECBEEE1C0B69FD00AF847B /* HTMLEOFToken.h in Headers */,
@@ -1186,11 +1281,13 @@
 				624C777A1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62ECBEF51C0B69FD00AF847B /* HTMLMarker.h in Headers */,
 				62ECBEF61C0B69FE00AF847B /* HTMLDOM.h in Headers */,
+				6295FB0722F0E770005C6DE8 /* HTMLNodeVisitor.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 */,
+				62E0917F22EDEB9D00C61073 /* HTMLSerializer.h in Headers */,
 				62ECBEFC1C0B69FE00AF847B /* HTMLComment.h in Headers */,
 				62ECBEFD1C0B69FE00AF847B /* HTMLText.h in Headers */,
 				62ECBEFE1C0B69FE00AF847B /* HTMLTemplate.h in Headers */,
@@ -1244,6 +1341,8 @@
 				62857C841D398917008DC254 /* HTMLParser.h in Headers */,
 				62857CDB1D3989CE008DC254 /* CSSAttributeSelector.h in Headers */,
 				62857C791D398907008DC254 /* HTMLEOFToken.h in Headers */,
+				6295FB1422F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */,
+				625A67CC224AC62C00C6D57D /* NSString+Private.h in Headers */,
 				626BE1E51DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				62857CC41D3989A9008DC254 /* CSSSelectors.h in Headers */,
 				62857C731D398907008DC254 /* HTMLToken.h in Headers */,
@@ -1259,11 +1358,13 @@
 				62857C851D398927008DC254 /* HTMLStackOfOpenElements.h in Headers */,
 				624C777D1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62857CDF1D3989CE008DC254 /* CSSCombinatorSelector.h in Headers */,
+				6295FB0A22F0E770005C6DE8 /* HTMLNodeVisitor.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 */,
+				62E0918222EDEB9D00C61073 /* HTMLSerializer.h in Headers */,
 				62857CDC1D3989CE008DC254 /* CSSPseudoClassSelector.h in Headers */,
 				62857CC21D3989A1008DC254 /* HTMLOrderedDictionary.h in Headers */,
 				62857C761D398907008DC254 /* HTMLDOCTYPEToken.h in Headers */,
@@ -1317,6 +1418,8 @@
 				62857D4E1D39A40A008DC254 /* HTMLTokenizerCharacters.h in Headers */,
 				62857D4D1D39A40A008DC254 /* HTMLTokenizerStates.h in Headers */,
 				62857D501D39A411008DC254 /* HTMLTokens.h in Headers */,
+				6295FB1322F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */,
+				625A67CB224AC62C00C6D57D /* NSString+Private.h in Headers */,
 				626BE1E41DF3819500C49514 /* HTMLDOMUtils.h in Headers */,
 				62857D7B1D39A452008DC254 /* HTMLNamespaces.h in Headers */,
 				62857D581D39A416008DC254 /* HTMLParser.h in Headers */,
@@ -1332,11 +1435,13 @@
 				62857D781D39A44E008DC254 /* HTMLTreeWalker.h in Headers */,
 				624C777C1DE9D05E00DD6DFA /* HTMLCharacterData.h in Headers */,
 				62857D551D39A411008DC254 /* HTMLParseErrorToken.h in Headers */,
+				6295FB0922F0E770005C6DE8 /* HTMLNodeVisitor.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 */,
+				62E0918122EDEB9D00C61073 /* HTMLSerializer.h in Headers */,
 				62857D891D39A47F008DC254 /* CSSSelectorBlock.h in Headers */,
 				62857D6D1D39A44E008DC254 /* HTMLDOM.h in Headers */,
 				62857D751D39A44E008DC254 /* HTMLTemplate.h in Headers */,
@@ -1390,6 +1495,8 @@
 				62ECBFAF1C0B6D3B00AF847B /* HTMLNodeIterator.h in Headers */,
 				62ECBFB01C0B6D3C00AF847B /* HTMLTreeWalker.h in Headers */,
 				62ECBFB21C0B6D3C00AF847B /* HTMLNodeFilter.h in Headers */,
+				6295FB1222F0ECEE005C6DE8 /* HTMLTreeVisitor.h in Headers */,
+				625A67CA224AC62C00C6D57D /* NSString+Private.h in Headers */,
 				62567F511C0CB5750025D458 /* HTMLDOMTokenList.h in Headers */,
 				62ECBFB31C0B6D3C00AF847B /* HTMLKitDOMExceptions.h in Headers */,
 				62ECBFB41C0B6D3D00AF847B /* HTMLNamespaces.h in Headers */,
@@ -1405,11 +1512,13 @@
 				62ECBFBD1C0B6D3F00AF847B /* CSSSelectorParser.h in Headers */,
 				62ECBFBE1C0B6D4000AF847B /* CSSNthExpressionParser.h in Headers */,
 				62ECBFBF1C0B6D4000AF847B /* CSSSelector.h in Headers */,
+				6295FB0822F0E770005C6DE8 /* HTMLNodeVisitor.h in Headers */,
 				621CC4A61DEA721A00D1992A /* HTMLParser+Private.h in Headers */,
 				62ECBFC01C0B6D4000AF847B /* CSSSelectorBlock.h in Headers */,
 				62ECBFC11C0B6D4100AF847B /* CSSTypeSelector.h in Headers */,
 				62ECBFC21C0B6D4100AF847B /* CSSAttributeSelector.h in Headers */,
 				62ECBFC31C0B6D4100AF847B /* CSSPseudoClassSelector.h in Headers */,
+				62E0918022EDEB9D00C61073 /* HTMLSerializer.h in Headers */,
 				62ECBFC41C0B6D4200AF847B /* CSSNthExpressionSelector.h in Headers */,
 				62ECBFC51C0B6D4200AF847B /* CSSPseudoFunctionSelector.h in Headers */,
 				62ECBFC61C0B6D4300AF847B /* CSSCombinatorSelector.h in Headers */,
@@ -1707,13 +1816,17 @@
 				62ECBF251C0B6B7900AF847B /* HTMLEOFToken.m in Sources */,
 				62ECBF261C0B6B7900AF847B /* HTMLParser.m in Sources */,
 				62ECBF271C0B6B7900AF847B /* HTMLStackOfOpenElements.m in Sources */,
+				62E0918322EDEB9D00C61073 /* HTMLSerializer.m in Sources */,
 				62ECBF281C0B6B7900AF847B /* HTMLListOfActiveFormattingElements.m in Sources */,
+				6295FB0B22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */,
 				62ECBF291C0B6B7900AF847B /* HTMLMarker.m in Sources */,
 				62ECBF2A1C0B6B7900AF847B /* HTMLNode.m in Sources */,
 				62ECBF2B1C0B6B7900AF847B /* HTMLDocument.m in Sources */,
 				62ECBF2C1C0B6B7900AF847B /* HTMLDocumentType.m in Sources */,
+				625A67D2224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */,
 				62ECBF2D1C0B6B7900AF847B /* HTMLDocumentFragment.m in Sources */,
 				62ECBF2E1C0B6B7900AF847B /* HTMLElement.m in Sources */,
+				6295FB1522F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */,
 				62ECBF2F1C0B6B7900AF847B /* HTMLComment.m in Sources */,
 				62ECBF301C0B6B7900AF847B /* HTMLText.m in Sources */,
 				62ECBF311C0B6B7900AF847B /* HTMLTemplate.m in Sources */,
@@ -1730,6 +1843,7 @@
 				62ECBF3C1C0B6B7900AF847B /* CSSInputStream.m in Sources */,
 				62ECBF3D1C0B6B7900AF847B /* CSSSelectorParser.m in Sources */,
 				62ECBF3E1C0B6B7900AF847B /* CSSNthExpressionParser.m in Sources */,
+				625A67CD224AC62C00C6D57D /* NSString+Private.m in Sources */,
 				62ECBF3F1C0B6B7900AF847B /* CSSSelector.m in Sources */,
 				62ECBF401C0B6B7900AF847B /* CSSSelectorBlock.m in Sources */,
 				62ECBF411C0B6B7900AF847B /* CSSTypeSelector.m in Sources */,
@@ -1750,8 +1864,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				62EC0A851E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				620AB7B12087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */,
 				62E0BA971E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				6216ACFD1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */,
+				62C82E0D20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */,
 				62132E5A1C01F83200084175 /* CSSSelectorTest.m in Sources */,
 				6239755B1AC362CA007E26F1 /* HTMLKitTreeConstructionTests.m in Sources */,
 				62F658711BD83C8E0045F137 /* CSSNThExpressionSelectorTests.m in Sources */,
@@ -1773,6 +1889,7 @@
 				624FC37B1AE591D80015DDF9 /* HTMLNodesTests.m in Sources */,
 				621FBE5B1BDAD68700BC9555 /* CSSSelectorParserTests.m in Sources */,
 				621FBE5E1BDAD90200BC9555 /* CSSCombinatorSelectorTests.m in Sources */,
+				6295FB1A22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */,
 				625EE45B1CBB171300F2CC8E /* HTMLKitTestUtil.m in Sources */,
 				628AF6301BC99A6C00496128 /* CSSNthExpressionsParserTests.m in Sources */,
 			);
@@ -1795,13 +1912,17 @@
 				62857C7B1D398912008DC254 /* HTMLTokenizer.m in Sources */,
 				62857CB21D398992008DC254 /* HTMLDocument.m in Sources */,
 				62857CBD1D398992008DC254 /* HTMLKitDOMExceptions.m in Sources */,
+				62E0918622EDEB9D00C61073 /* HTMLSerializer.m in Sources */,
 				62857CD11D3989B8008DC254 /* CSSPseudoFunctionSelector.m in Sources */,
+				6295FB0E22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */,
 				62857C7F1D398912008DC254 /* HTMLCommentToken.m in Sources */,
 				62857C811D398912008DC254 /* HTMLParseErrorToken.m in Sources */,
 				62857CD21D3989B8008DC254 /* CSSCombinatorSelector.m in Sources */,
 				62857CB91D398992008DC254 /* HTMLNodeIterator.m in Sources */,
+				625A67D5224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */,
 				62857CCF1D3989B8008DC254 /* CSSPseudoClassSelector.m in Sources */,
 				62857C7A1D398912008DC254 /* HTMLInputStreamReader.m in Sources */,
+				6295FB1822F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */,
 				62857CC11D39899C008DC254 /* NSCharacterSet+HTMLKit.m in Sources */,
 				62857CCD1D3989B8008DC254 /* CSSTypeSelector.m in Sources */,
 				62857C8E1D39892D008DC254 /* HTMLMarker.m in Sources */,
@@ -1818,6 +1939,7 @@
 				62857CBC1D398992008DC254 /* HTMLNodeFilter.m in Sources */,
 				62857CC01D39899C008DC254 /* NSString+HTMLKit.m in Sources */,
 				62857CCA1D3989B8008DC254 /* CSSInputStream.m in Sources */,
+				625A67D0224AC62C00C6D57D /* NSString+Private.m in Sources */,
 				62857CCE1D3989B8008DC254 /* CSSAttributeSelector.m in Sources */,
 				62857CC31D3989A3008DC254 /* HTMLOrderedDictionary.m in Sources */,
 				62857CC91D3989B8008DC254 /* CSSNthExpressionParser.m in Sources */,
@@ -1850,13 +1972,17 @@
 				62857D061D39A324008DC254 /* HTMLCommentToken.m in Sources */,
 				62857D111D39A32A008DC254 /* HTMLDocumentType.m in Sources */,
 				62857D1C1D39A32A008DC254 /* HTMLKitDOMExceptions.m in Sources */,
+				62E0918522EDEB9D00C61073 /* HTMLSerializer.m in Sources */,
 				62857D2B1D39A334008DC254 /* CSSPseudoFunctionSelector.m in Sources */,
+				6295FB0D22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */,
 				62857D081D39A324008DC254 /* HTMLParseErrorToken.m in Sources */,
 				62857D0F1D39A32A008DC254 /* HTMLNode.m in Sources */,
 				62857D2C1D39A334008DC254 /* CSSCombinatorSelector.m in Sources */,
 				62857D181D39A32A008DC254 /* HTMLNodeIterator.m in Sources */,
+				625A67D4224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */,
 				62857D291D39A334008DC254 /* CSSPseudoClassSelector.m in Sources */,
 				62857D011D39A324008DC254 /* HTMLInputStreamReader.m in Sources */,
+				6295FB1722F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */,
 				62857D1E1D39A334008DC254 /* NSCharacterSet+HTMLKit.m in Sources */,
 				62857D271D39A334008DC254 /* CSSTypeSelector.m in Sources */,
 				62857D0E1D39A328008DC254 /* HTMLMarker.m in Sources */,
@@ -1873,6 +1999,7 @@
 				62857D1B1D39A32A008DC254 /* HTMLNodeFilter.m in Sources */,
 				62857D1D1D39A334008DC254 /* NSString+HTMLKit.m in Sources */,
 				62857D241D39A334008DC254 /* CSSInputStream.m in Sources */,
+				625A67CF224AC62C00C6D57D /* NSString+Private.m in Sources */,
 				62857D281D39A334008DC254 /* CSSAttributeSelector.m in Sources */,
 				62857D1F1D39A334008DC254 /* HTMLOrderedDictionary.m in Sources */,
 				62857D231D39A334008DC254 /* CSSNthExpressionParser.m in Sources */,
@@ -1893,8 +2020,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				62EC0A871E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				620AB7B32087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */,
 				62E0BA991E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				62857D3B1D39A345008DC254 /* CSSSelectorTest.m in Sources */,
+				62C82E0F20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */,
 				62857D421D39A345008DC254 /* CSSCombinatorSelectorTests.m in Sources */,
 				62857D3C1D39A345008DC254 /* CSSSelectorParserTests.m in Sources */,
 				62857D301D39A339008DC254 /* HTMLKitTokenizerPerformance.m in Sources */,
@@ -1916,6 +2045,7 @@
 				62857D341D39A33F008DC254 /* HTMLNodeIteratorTests.m in Sources */,
 				62857D2E1D39A339008DC254 /* HTML5LibTokenizerTest.m in Sources */,
 				62857D351D39A33F008DC254 /* HTMLTreeWalkerTests.m in Sources */,
+				6295FB1C22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */,
 				62857D441D39A34D008DC254 /* HTMLKitTestUtil.m in Sources */,
 				62857D2F1D39A339008DC254 /* HTMLKitTokenizerTests.m in Sources */,
 			);
@@ -1938,13 +2068,17 @@
 				62ECBF6D1C0B6D2A00AF847B /* HTMLEOFToken.m in Sources */,
 				62ECBF6E1C0B6D2A00AF847B /* HTMLParser.m in Sources */,
 				62ECBF6F1C0B6D2A00AF847B /* HTMLStackOfOpenElements.m in Sources */,
+				62E0918422EDEB9D00C61073 /* HTMLSerializer.m in Sources */,
 				62ECBF701C0B6D2A00AF847B /* HTMLListOfActiveFormattingElements.m in Sources */,
+				6295FB0C22F0E770005C6DE8 /* HTMLNodeVisitor.m in Sources */,
 				62ECBF711C0B6D2A00AF847B /* HTMLMarker.m in Sources */,
 				62ECBF721C0B6D2A00AF847B /* HTMLNode.m in Sources */,
 				62ECBF731C0B6D2A00AF847B /* HTMLDocument.m in Sources */,
 				62ECBF741C0B6D2A00AF847B /* HTMLDocumentType.m in Sources */,
+				625A67D3224ADC7700C6D57D /* HTMLQuircksMode.m in Sources */,
 				62ECBF751C0B6D2A00AF847B /* HTMLDocumentFragment.m in Sources */,
 				62ECBF761C0B6D2A00AF847B /* HTMLElement.m in Sources */,
+				6295FB1622F0ECEE005C6DE8 /* HTMLTreeVisitor.m in Sources */,
 				62ECBF771C0B6D2A00AF847B /* HTMLComment.m in Sources */,
 				62ECBF781C0B6D2A00AF847B /* HTMLText.m in Sources */,
 				62ECBF791C0B6D2A00AF847B /* HTMLTemplate.m in Sources */,
@@ -1961,6 +2095,7 @@
 				62ECBF841C0B6D2A00AF847B /* CSSInputStream.m in Sources */,
 				62ECBF851C0B6D2A00AF847B /* CSSSelectorParser.m in Sources */,
 				62ECBF861C0B6D2A00AF847B /* CSSNthExpressionParser.m in Sources */,
+				625A67CE224AC62C00C6D57D /* NSString+Private.m in Sources */,
 				62ECBF871C0B6D2A00AF847B /* CSSSelector.m in Sources */,
 				62ECBF881C0B6D2A00AF847B /* CSSSelectorBlock.m in Sources */,
 				62ECBF891C0B6D2A00AF847B /* CSSTypeSelector.m in Sources */,
@@ -1981,8 +2116,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				62EC0A861E158BD80007786B /* HTMLRangeTests.m in Sources */,
+				620AB7B22087F18D00AFCCC7 /* CSSStructuralPseudoSelectors.m in Sources */,
 				62E0BA981E25456700E4D193 /* HTMLCharacterDataTests.m in Sources */,
 				6216ACFE1C28DCC80074CAB4 /* CSSExtensionSelectorsParsingTests.m in Sources */,
+				62C82E0E20FD2FFD008497A8 /* HTMLKitParserIssuesTests.m in Sources */,
 				62ECBFCA1C0B6E2E00AF847B /* HTML5LibTokenizerTest.m in Sources */,
 				62ECBFCB1C0B6E2E00AF847B /* HTMLKitTokenizerTests.m in Sources */,
 				62ECBFCC1C0B6E2E00AF847B /* HTMLKitTokenizerPerformance.m in Sources */,
@@ -2004,6 +2141,7 @@
 				62ECBFD91C0B6E2E00AF847B /* CSSTypeSelectorTests.m in Sources */,
 				62ECBFDA1C0B6E2E00AF847B /* CSSAttributeSelectorTests.m in Sources */,
 				62ECBFDB1C0B6E2E00AF847B /* CSSNThExpressionSelectorTests.m in Sources */,
+				6295FB1B22F0F309005C6DE8 /* HTMLTreeVisitorTests.m in Sources */,
 				625EE45C1CBB171300F2CC8E /* HTMLKitTestUtil.m in Sources */,
 				62ECBFDC1C0B6E2E00AF847B /* CSSCombinatorSelectorTests.m in Sources */,
 			);
@@ -76,10 +76,8 @@ $ 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', '~> 2.0'
+  pod 'HTMLKit', '~> 3.1'
 end
 ```

@@ -96,7 +94,7 @@ $ pod install
 Add `HTMLKit` to your `Package.swift` dependecies:

 ```swift
-.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 2)
+.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 3)
 ```

 Then run:
@@ -61,7 +61,7 @@
 		}
 		case CSSAttributeSelectorIncludes:
 		{
-			NSArray *components = [element[_name] componentsSeparatedByCharactersInSet:[NSCharacterSet HTMLWhitespaceCharacterSet]];
+			NSArray *components = [element[_name] componentsSeparatedByCharactersInSet:[NSCharacterSet htmlkit_HTMLWhitespaceCharacterSet]];
 			return [components containsObject:_value];
 		}
 		case CSSAttributeSelectorBegins:
@@ -8,7 +8,7 @@

 #import "CSSNthExpressionParser.h"
 #import "CSSCodePoints.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "NSCharacterSet+HTMLKit.h"

@implementation CSSNthExpressionParser
@@ -26,7 +26,7 @@
 		return CSSNthExpressionEven;
 	}

-	NSCharacterSet *set = [[NSCharacterSet CSSNthExpressionCharacterSet] invertedSet];
+	NSCharacterSet *set = [[NSCharacterSet htmlkit_CSSNthExpressionCharacterSet] invertedSet];
 	if ([string rangeOfCharacterFromSet:set].location != NSNotFound) {
 		return CSSNthExpressionMake(0, 0);
 	}
@@ -10,7 +10,7 @@
 #import "CSSInputStream.h"
 #import "CSSCodePoints.h"
 #import "CSSSelectors.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "NSCharacterSet+HTMLKit.h"
 #import "CSSNthExpressionParser.h"
 #import "CSSCompoundSelector.h"
@@ -9,7 +9,7 @@
 #import "CSSStructuralPseudoSelectors.h"
 #import "CSSSelectors.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"

 #pragma mark - Elements

@@ -276,7 +276,7 @@ CSSSelector * ltSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];

-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex < index;
 		} else {
 			return elementIndex < element.parentElement.childNodesCount - index - 1;
@@ -290,7 +290,7 @@ CSSSelector * gtSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];

-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex > index;
 		} else {
 			return elementIndex > element.parentElement.childNodesCount - index - 1;
@@ -304,7 +304,7 @@ CSSSelector * eqSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];

-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex == index;
 		} else {
 			return elementIndex == element.parentElement.childNodesCount - index - 1;
@@ -8,7 +8,7 @@

 #import "CSSTypeSelector.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"

@interface CSSTypeSelector ()
 {
@@ -36,7 +36,7 @@

 - (BOOL)isWhitespaceToken
 {
-	return [_characters isHTMLWhitespaceString];
+	return [_characters htmlkit_isHTMLWhitespaceString];
 }

 - (BOOL)isEmpty
@@ -46,7 +46,7 @@

 - (void)retainLeadingWhitespace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		[_characters setString:[_characters substringToIndex:index]];
 	}
@@ -54,7 +54,7 @@

 - (void)trimLeadingWhitespace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		[_characters setString:[_characters substringFromIndex:index]];
 	}
@@ -67,7 +67,7 @@

 - (HTMLCharacterToken *)tokenBySplitingLeadingWhiteSpace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		NSString *leading = [_characters substringToIndex:index];
 		[_characters setString:[_characters substringFromIndex:index]];
@@ -21,13 +21,6 @@
 	return [super initWithName:@"#comment" type:HTMLNodeComment data:data];
 }

-#pragma mark - Serialization
-
- (NSString *)outerHTML
-{
-	return [NSString stringWithFormat:@"<!--%@-->", self.data];
-}
-
 #pragma mark - Description

 - (NSString *)description
@@ -141,7 +141,7 @@

 - (void)detachNodeIterator:(HTMLNodeIterator *)iterator
 {
-	[_nodeIterators removeObject:iterator];
+	// NOOP
 }

 #pragma mark - Ranges
@@ -153,7 +153,7 @@

 - (void)detachRange:(HTMLRange *)range
 {
-	[_ranges removeObject:range];
+	// NOOP
 }

 - (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length
@@ -7,7 +7,7 @@
 //

 #import "HTMLDocumentType.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLNode+Private.h"

 NS_INLINE BOOL nilOrEqual(id first, id second) {
@@ -144,13 +144,6 @@ NS_INLINE BOOL nilOrEqual(id first, id second) {
 	return copy;
 }

-#pragma mark - Serialization
-
- (NSString *)outerHTML
-{
-	return [NSString stringWithFormat:@"<!DOCTYPE %@>", self.name];
-}
-
 #pragma mark - Description

 - (NSString *)description
@@ -12,7 +12,7 @@
 #import "HTMLText.h"
 #import "HTMLDOMTokenList.h"
 #import "HTMLOrderedDictionary.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLNode+Private.h"

@interface HTMLElement ()
@@ -144,47 +144,11 @@
 {
 	HTMLElement *copy = [super copyWithZone:zone];
 	copy->_tagName = [_tagName copy];
-	copy->_attributes = [_attributes copy];
+	copy->_attributes = [_attributes mutableCopy];
 	copy->_htmlNamespace = _htmlNamespace;
 	return copy;
 }

-#pragma mark - Serialization
-
- (NSString *)outerHTML
-{
-	NSMutableString *result = [NSMutableString string];
-
-	[result appendFormat:@"<%@", self.tagName];
-	[self.attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-		NSMutableString *escaped = [value mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
-		[escaped replaceOccurrencesOfString:@"0x00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
-		[escaped replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:0 range:NSMakeRange(0, escaped.length)];
-
-		[result appendFormat:@" %@=\"%@\"", key, escaped];
-	}];
-
-	[result appendString:@">"];
-
-	if ([self.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
-		 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
-		 @"track", @"wbr", nil]) {
-		return result;
-	}
-
-	if ([self.tagName isEqualToAny:@"pre", @"textarea", @"listing", nil] && self.firstChild.nodeType == HTMLNodeText) {
-		HTMLText *textNode = (HTMLText *)self.firstChild;
-		if ([textNode.data hasPrefix:@"\n"]) {
-			[result appendString:@"\n"];
-		}
-	}
-	[result appendString:self.innerHTML];
-	[result appendFormat:@"</%@>", self.tagName];
-
-	return result;
-}
-
 #pragma mark - Description

 - (NSString *)description
@@ -170,7 +170,7 @@

 - (BOOL)consumeHexNumber:(unsigned long long *)result
 {
-	NSCharacterSet *set = [NSCharacterSet HTMLHexNumberCharacterSet];
+	NSCharacterSet *set = [NSCharacterSet htmlkit_HTMLHexNumberCharacterSet];

 	NSString *string = nil;
 	BOOL success = [_scanner scanCharactersFromSet:set intoString:&string];
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>3.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -18,6 +18,7 @@
 #import "CSSSelector.h"
 #import "HTMLDocument+Private.h"
 #import "HTMLDOMUtils.h"
+#import "HTMLSerializer.h"

 NSString * const ValidationNodePreInsertion = @"-ensurePreInsertionValidityOfNode:beforeChildNode:";
 NSString * const ValidationNodeReplacement = @"-ensureReplacementValidityOfChildNode:withNode:";
@@ -127,7 +128,7 @@ NSString * const RemoveChildNode = @"-removeChildNode:";

 - (HTMLElement *)nextSiblingElement
 {
-	HTMLNode *node = self.previousSibling;
+	HTMLNode *node = self.nextSibling;
 	while (node && node.nodeType != HTMLNodeElement) {
 		node = node.nextSibling;
 	}
@@ -156,6 +157,20 @@ NSString * const RemoveChildNode = @"-removeChildNode:";
 	return (HTMLElement *)self;
 }

+- (HTMLText *)asText
+{
+	return (HTMLText *)self;
+}
+
+- (HTMLComment *)asComment
+{
+	return (HTMLComment *)self;
+}
+- (HTMLDocumentType *)asDocumentType
+{
+	return (HTMLDocumentType *)self;
+}
+
 #pragma mark - Child Nodes

 - (BOOL)hasChildNodes
@@ -718,13 +733,12 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin

 - (NSString *)outerHTML
 {
-	[self doesNotRecognizeSelector:_cmd];
-	return nil;
+	return [HTMLSerializer serializeNode:self scope:HTMLSerializationScopeIncludeRoot];
 }

 - (NSString *)innerHTML
 {
-	return [[self.childNodes.array valueForKey:@"outerHTML"] componentsJoinedByString:@""];
+	return [HTMLSerializer serializeNode:self scope:HTMLSerializationScopeChildrenOnly];
 }

 - (void)setInnerHTML:(NSString *)outerHTML
@@ -15,7 +15,7 @@

@interface HTMLNodeFilterBlock ()
 {
-	BOOL (^ _block)(HTMLNode *);
+	HTMLNodeFilterValue (^ _block)(HTMLNode *);
 }
@end

@@ -0,0 +1,54 @@
+//
+//  HTMLNodeVisitor.m
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLNodeVisitor.h"
+
+#pragma mark - Block Visitor
+
+@interface HTMLNodeVisitorBlock ()
+{
+	void (^ _enter)(HTMLNode *);
+	void (^ _leave)(HTMLNode *);
+}
+@end
+
+@implementation HTMLNodeVisitorBlock
+
+ (instancetype)visitorWithEnterBlock:(void (^)(HTMLNode * _Nonnull))enterBlock
+						   leaveBlock:(void (^)(HTMLNode * _Nonnull))leaveBlock
+{
+	return [[HTMLNodeVisitorBlock alloc] initWithEnterBlock:enterBlock leaveBlock:leaveBlock];
+}
+
+- (instancetype)initWithEnterBlock:(void (^)(HTMLNode * _Nonnull))enterBlock
+						leaveBlock:(void (^)(HTMLNode * _Nonnull))leaveBlock
+{
+	self = [super init];
+	if (self) {
+		_enter = [enterBlock copy];
+		_leave = [leaveBlock copy];
+	}
+	return self;
+}
+
+- (void)enter:(HTMLNode *)node
+{
+	if (_enter) {
+		_enter(node);
+	}
+}
+
+- (void)leave:(HTMLNode *)node
+{
+	if (_leave) {
+		_leave(node);
+	}
+}
+
+@end
+
@@ -154,4 +154,11 @@
 	return [_keys countByEnumeratingWithState:state objects:buffer count:len];
 }

+#pragma mark - Copying
+
+- (id)mutableCopy
+{
+	return [[HTMLOrderedDictionary alloc] initWithDictionary:self];
+}
+
@end
@@ -1142,7 +1142,7 @@
 			if (charactes.length > 0) {
 				[self reconstructActiveFormattingElements];
 				[self insertCharacters:charactes];
-				if (!charactes.isHTMLWhitespaceString) {
+				if (!charactes.htmlkit_isHTMLWhitespaceString) {
 					_framesetOkFlag = NO;
 				}
 			}
@@ -1443,7 +1443,6 @@
 	} else if ([tagName isEqualToString:@"math"]) {
 		[self reconstructActiveFormattingElements];
 		AdjustMathMLAttributes(token);
-		AdjustForeignAttributes(token);
 		[self insertForeignElementForToken:token inNamespace:HTMLNamespaceMathML];
 		if (token.isSelfClosing) {
 			[_stackOfOpenElements popCurrentNode];
@@ -1451,7 +1450,6 @@
 	} else if ([tagName isEqualToString:@"svg"]) {
 		[self reconstructActiveFormattingElements];
 		AdjustSVGAttributes(token);
-		AdjustForeignAttributes(token);
 		[self insertForeignElementForToken:token inNamespace:HTMLNamespaceSVG];
 		if (token.isSelfClosing) {
 			[_stackOfOpenElements popCurrentNode];
@@ -2315,7 +2313,7 @@
 			[characters enumerateSubstringsInRange:NSMakeRange(0, characters.length)
 										   options:NSStringEnumerationByComposedCharacterSequences
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
-											if (substring.isHTMLWhitespaceString) {
+											if (substring.htmlkit_isHTMLWhitespaceString) {
 												[self insertCharacters:substring];
 											} else {
 												[self emitParseError:@"Unexpected Character (%@) in <frameset>", substring];
@@ -2383,7 +2381,7 @@
 			[characters enumerateSubstringsInRange:NSMakeRange(0, characters.length)
 										   options:NSStringEnumerationByComposedCharacterSequences
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
-											if (substring.isHTMLWhitespaceString) {
+											if (substring.htmlkit_isHTMLWhitespaceString) {
 												[self insertCharacters:substring];
 											} else {
 												[self emitParseError:@"Unexpected Character (%@) after <frameset>", substring];
@@ -2517,7 +2515,7 @@
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
 											if ([substring isEqualToString:@"\uFFFD"]) {
 												[self emitParseError:@"Unexpected Character (0x0000) in foreign content"];
-											} else if (!substring.isHTMLWhitespaceString) {
+											} else if (!substring.htmlkit_isHTMLWhitespaceString) {
 												_framesetOkFlag = NO;
 											}
 											[self insertCharacters:substring];
@@ -2541,7 +2539,6 @@
 					AdjustSVGNameCase(token.asTagToken);
 					AdjustSVGAttributes(token.asTagToken);
 				}
-				AdjustForeignAttributes(token.asTagToken);
 				[self insertForeignElementForToken:token.asTagToken inNamespace:self.adjustedCurrentNode.htmlNamespace];
 				if (token.asTagToken.selfClosing) {
 					[_stackOfOpenElements popCurrentNode];
@@ -0,0 +1,21 @@
+//
+//  HTMLQuircksMode.m
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HTMLQuirksMode.h"
+#import "NSString+Private.h"
+
+BOOL QuirksModePrefixMatch(NSString *publicIdentifier)
+{
+	for (int i = 0; i < sizeof(HTMLQuirksModePrefixes) / sizeof(HTMLQuirksModePrefixes[0]); i++) {
+		if ([publicIdentifier hasPrefixIgnoringCase:HTMLQuirksModePrefixes[i]]) {
+			return YES;
+		}
+	}
+	return NO;
+}
@@ -0,0 +1,155 @@
+//
+//  HTMLSerializer.m
+//  HTMLKit
+//
+//  Created by Iska on 28.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLSerializer.h"
+#import "HTMLDOM.h"
+#import "HTMLNode+Private.h"
+#import "HTMLTreeVisitor.h"
+#import "NSString+Private.h"
+
+#pragma mark - Serializer
+
+@interface HTMLSerializer ()
+{
+	HTMLNode *_root;
+	HTMLTreeVisitor *_treeVisitor;
+	NSUInteger _ignore;
+	NSMutableString *_result;
+}
+- (instancetype)initWithNode:(HTMLNode *)node;
+- (NSString *)serializeWithScope:(HTMLSerializationScope)scope;
+@end
+
+@implementation HTMLSerializer
+
+ (NSString *)serializeNode:(HTMLNode *)node scope:(HTMLSerializationScope)scope
+{
+	HTMLSerializer *serializer = [[HTMLSerializer alloc] initWithNode:node];
+	return [serializer serializeWithScope:scope];
+}
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithNode:(HTMLNode *)node
+{
+	self = [super init];
+	if (self) {
+		_root = node;
+		_treeVisitor = [[HTMLTreeVisitor alloc] initWithNode:node];
+		_result = [NSMutableString new];
+		_ignore = 0;
+	}
+	return self;
+}
+
+#pragma mark - Serialization
+
+- (NSString *)serializeWithScope:(HTMLSerializationScope)scope
+{
+	[_result setString:@""];
+
+	HTMLNodeVisitorBlock *nodeVisitor = [HTMLNodeVisitorBlock visitorWithEnterBlock:^(HTMLNode * node) {
+		if (scope == HTMLSerializationScopeChildrenOnly && node == _root) {
+			return;
+		}
+
+		if (_ignore > 0) {
+			return;
+		}
+
+		switch (node.nodeType) {
+			case HTMLNodeElement:
+				[self openElement:node.asElement];
+				break;
+			case HTMLNodeComment:
+				[self serializeComment:node.asComment];
+				break;
+			case HTMLNodeText:
+				[self serializeText:node.asText];
+				break;
+			case HTMLNodeDocumentFragment:
+				[self serializeDocumentType:node.asDocumentType];
+				break;
+			default:
+				break;
+		}
+	} leaveBlock:^(HTMLNode * _Nonnull node) {
+		if (scope == HTMLSerializationScopeChildrenOnly && node == _root) {
+			return;
+		}
+
+		switch (node.nodeType) {
+			case HTMLNodeElement:
+				if ([node.asElement.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+					 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
+					 @"track", @"wbr", nil]) {
+					_ignore--;
+					break;
+				}
+				[self closeElement:node.asElement];
+			default:
+				break;
+		}
+	}];
+
+	[_treeVisitor walkWithNodeVisitor:nodeVisitor];
+	return [_result copy];
+}
+
+- (void)openElement:(HTMLElement *)element
+{
+	[_result appendFormat:@"<%@", element.tagName];
+	[element.attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+		NSMutableString *escaped = [value mutableCopy];
+		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"0x00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:0 range:NSMakeRange(0, escaped.length)];
+
+		[_result appendFormat:@" %@=\"%@\"", key, escaped];
+	}];
+
+	[_result appendString:@">"];
+
+	if ([element.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+		 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
+		 @"track", @"wbr", nil]) {
+		_ignore++;
+	}
+}
+
+- (void)closeElement:(HTMLElement *)element
+{
+	[_result appendFormat:@"</%@>", element.tagName];
+}
+
+- (void)serializeText:(HTMLText *)text
+{
+	if ([text.parentElement.tagName isEqualToAny:@"style", @"script", @"xmp", @"iframe", @"noembed", @"noframes",
+		 @"plaintext", @"noscript", nil]) {
+		[_result appendString:text.data];
+	} else {
+		NSMutableString *escaped = [text.data mutableCopy];
+		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"<" withString:@"&lt;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@">" withString:@"&gt;" options:0 range:NSMakeRange(0, escaped.length)];
+		[_result appendString:escaped];
+	}
+}
+
+- (void)serializeComment:(HTMLComment *)comment
+{
+	[_result appendFormat:@"<!--%@-->", comment.data];
+}
+
+- (void)serializeDocumentType:(HTMLDocumentType *)doctype
+{
+	[_result appendFormat:@"<!DOCTYPE %@>", doctype.name];
+}
+
+@end
@@ -8,7 +8,7 @@

 #import "HTMLText.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLCharacterData+Private.h"
 #import "HTMLKitDOMExceptions.h"
 #import "HTMLDocument+Private.h"
@@ -66,23 +66,6 @@ NS_INLINE void CheckValidOffset(HTMLNode *node, NSUInteger offset, NSString *cmd
 	return newNode;
 }

-#pragma mark - Serialization
-
- (NSString *)outerHTML
-{
-	if ([self.parentElement.tagName isEqualToAny:@"style", @"script", @"xmp", @"iframe", @"noembed", @"noframes",
-		 @"plaintext", @"noscript", nil]) {
-		return self.data;
-	} else {
-		NSMutableString *escaped = [self.data mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
-		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
-		[escaped replaceOccurrencesOfString:@"<" withString:@"&lt;" options:0 range:NSMakeRange(0, escaped.length)];
-		[escaped replaceOccurrencesOfString:@">" withString:@"&gt;" options:0 range:NSMakeRange(0, escaped.length)];
-		return escaped;
-	}
-}
-
 #pragma mark - Description

 - (NSString *)description
@@ -0,0 +1,63 @@
+//
+//  HTMLTreeVisitor.m
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLTreeVisitor.h"
+#import "HTMLNode.h"
+#import "HTMLTreeWalker.h"
+
+@interface HTMLTreeVisitor()
+{
+	HTMLNode *_root;
+	HTMLTreeWalker *_treeWalker;
+}
+@end
+
+@implementation HTMLTreeVisitor
+
+- (instancetype)initWithNode:(HTMLNode *)node
+{
+	self = [super init];
+	if (self) {
+		_root = node;
+		_treeWalker = [[HTMLTreeWalker alloc] initWithNode:node];
+	}
+	return self;
+}
+
+- (void)walkWithNodeVisitor:(id<HTMLNodeVisitor>)visitor
+{
+	HTMLNode *currentNode = _treeWalker.currentNode;
+	while (currentNode) {
+		[visitor enter:currentNode];
+		if (currentNode.hasChildNodes) {
+			currentNode = [_treeWalker firstChild];
+			continue;
+		}
+
+		HTMLNode *next = [_treeWalker nextSibling];
+		if (next) {
+			[visitor leave:currentNode];
+			currentNode = next;
+			continue;
+		}
+
+		while (!next && _treeWalker.currentNode != _root) {
+			[visitor leave:_treeWalker.currentNode];
+			currentNode = [_treeWalker parentNode];
+			next = [_treeWalker nextSibling];
+		}
+		[visitor leave:currentNode];
+		currentNode = _treeWalker.currentNode;
+
+		if (currentNode == _root) {
+			break;
+		}
+	}
+}
+
+@end
@@ -10,7 +10,7 @@

@implementation NSCharacterSet (HTMLKit)

-+ (instancetype)HTMLWhitespaceCharacterSet
+ (instancetype)htmlkit_HTMLWhitespaceCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;
@@ -20,7 +20,7 @@
 	return set;
 }

-+ (instancetype)HTMLHexNumberCharacterSet
+ (instancetype)htmlkit_HTMLHexNumberCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;
@@ -30,7 +30,7 @@
 	return set;
 }

-+ (instancetype)CSSNthExpressionCharacterSet
+ (instancetype)htmlkit_CSSNthExpressionCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;
@@ -15,37 +15,12 @@ NS_INLINE BOOL isHtmlWhitespaceChar(unichar c)

@implementation NSString (HTMLKit)

- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString
+- (BOOL)htmlkit_isHTMLWhitespaceString
 {
-	return [self caseInsensitiveCompare:aString] == NSOrderedSame;
+	return self.htmlkit_leadingHTMLWhitespaceLength == self.length;
 }

- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION
-{
-	va_list list;
-	va_start(list, first);
-	for (NSString *next = first; next != nil; next = va_arg(list, NSString *)) {
-		if ([self isEqualToString:next]) {
-			return YES;
-		}
-	}
-	va_end(list);
-	return NO;
-}
-
- (BOOL)hasPrefixIgnoringCase:(NSString *)aString
-{
-	NSRange reange = [self rangeOfString:aString
-								 options:NSAnchoredSearch|NSCaseInsensitiveSearch];
-	return reange.location != NSNotFound;
-}
-
- (BOOL)isHTMLWhitespaceString
-{
-	return self.leadingHTMLWhitespaceLength == self.length;
-}
-
- (NSUInteger)leadingHTMLWhitespaceLength
+- (NSUInteger)htmlkit_leadingHTMLWhitespaceLength
 {
 	size_t idx = 0;
 	NSUInteger length = self.length;
@@ -0,0 +1,38 @@
+//
+//  NSString+Private.m
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "NSString+Private.h"
+
+@implementation NSString (Private)
+
+- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString
+{
+	return [self caseInsensitiveCompare:aString] == NSOrderedSame;
+}
+
+- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION
+{
+	va_list list;
+	va_start(list, first);
+	for (NSString *next = first; next != nil; next = va_arg(list, NSString *)) {
+		if ([self isEqualToString:next]) {
+			return YES;
+		}
+	}
+	va_end(list);
+	return NO;
+}
+
+- (BOOL)hasPrefixIgnoringCase:(NSString *)aString
+{
+	NSRange reange = [self rangeOfString:aString
+								 options:NSAnchoredSearch|NSCaseInsensitiveSearch];
+	return reange.location != NSNotFound;
+}
+
+@end
@@ -18,9 +18,12 @@
 #import "HTMLRange.h"
 #import "HTMLDOMTokenList.h"
 #import "HTMLNodeIterator.h"
+#import "HTMLTreeVisitor.h"
 #import "HTMLTreeWalker.h"
 #import "HTMLNodeFilter.h"

 #import "HTMLKitDOMExceptions.h"
 #import "HTMLNamespaces.h"
 #import "HTMLQuirksMode.h"
+
+#import "HTMLOrderedDictionary.h"
@@ -140,31 +140,3 @@ NS_INLINE void AdjustSVGNameCase(HTMLTagToken *token)
 	NSString *replacement = replacements[token.tagName] ?: token.tagName;
 	token.tagName = replacement;
 }
-
-NS_INLINE void AdjustForeignAttributes(HTMLTagToken *token)
-{
-	if (token.attributes == nil) {
-		return;
-	}
-
-	NSDictionary *replacements = @{ @"xlink:actuate": @"xlink actuate",
-									@"xlink:arcrole": @"xlink arcrole",
-									@"xlink:href": @"xlink href",
-									@"xlink:role": @"xlink role",
-									@"xlink:show": @"xlink show",
-									@"xlink:title": @"xlink title",
-									@"xlink:type": @"xlink type",
-									@"xml:base": @"xml base",
-									@"xml:lang": @"xml lang",
-									@"xml:space": @"xml space",
-									@"xmlns": @"xmlns",
-									@"xmlns:xlink": @"xmlns xlink"};
-
-	HTMLOrderedDictionary *adjusted = [HTMLOrderedDictionary new];
-	for (id key in token.attributes) {
-		NSString *replacement = replacements[key] ?: key;
-		adjusted[replacement] = token.attributes[key];
-	}
-	token.attributes = adjusted;
-}
-
@@ -10,9 +10,10 @@
 /// HTMLKit private header
 ///------------------------------------------------------

+#import "HTMLNode+Private.h"
 #import	"HTMLElement.h"
 #import "HTMLNamespaces.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"

 NS_INLINE BOOL IsNodeMathMLTextIntegrationPoint(HTMLElement *node)
 {
@@ -52,3 +53,14 @@ NS_INLINE BOOL IsSpecialElement(HTMLElement *element)
 	}
 	return NO;
 }
+
+NS_INLINE BOOL DoesNodeSerializeAsVoid(HTMLNode *node)
+{
+	if (node.nodeType != HTMLNodeElement) {
+		return false;
+	}
+
+	return [node.asElement.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+			@"frame", @"hr", @"img", @"input", @"keygen", @"link", @"meta", @"param", @"source", @"track", @"wbr", nil];
+}
+
@@ -16,6 +16,7 @@ extern const unsigned char HTMLKitVersionString[];

 #import "HTMLDOM.h"
 #import "HTMLParser.h"
+#import "HTMLSerializer.h"
 #import "HTMLKitErrorDomain.h"
 #import "HTMLOrderedDictionary.h"

@@ -12,6 +12,10 @@

 #import "HTMLNode.h"

+@class HTMLText;
+@class HTMLComment;
+@class HTMLDocumentType;
+
 /**
 Private HTML Node methods which are not intended for public API.
 */
@@ -44,6 +48,21 @@
 */
 - (HTMLElement *)asElement;

+/**
+ Casts this node to a HTML Text. This cast should only be performed after the appropriate check.
+ */
+- (HTMLText *)asText;
+
+/**
+ Casts this node to a HTML Comment. This cast should only be performed after the appropriate check.
+ */
+- (HTMLComment *)asComment;
+
+/**
+ Casts this node to a HTML Document Type. This cast should only be performed after the appropriate check.
+ */
+- (HTMLDocumentType *)asDocumentType;
+
 /**
 Returns the same string representation of the DOM tree rooted at this node that is used by html5lib-tests.
 
@@ -8,6 +8,7 @@

 #import <Foundation/Foundation.h>
 #import "HTMLNodeIterator.h"
+#import "HTMLTreeVisitor.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -0,0 +1,59 @@
+//
+//  HTMLNodeVisitor.h
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+#pragma mark - Node Visitor
+
+/**
+ A HTML Node Visitor which can be used with a tree visitor.
+
+ @see HTMLTreeVisitor
+ */
+@protocol HTMLNodeVisitor <NSObject>
+@required
+
+/**
+ Called when visiting the node for the first time
+
+ @param node The node that is beaing visited for the first time.
+ */
+- (void)enter:(HTMLNode *)node;
+
+/**
+ Called when leaving a previously entered node, i.e. when all its child nodes are visited.
+
+ @param node The node that beaing leaved.
+ */
+- (void)leave:(HTMLNode *)node;
+
+@end
+
+#pragma mark - Block Node Visitor
+
+/**
+ A concrete block-based HTML Node Visitor implementation.
+ */
+@interface HTMLNodeVisitorBlock : NSObject <HTMLNodeVisitor>
+
+/**
+ Initializes and returns a new instance of this visitor.
+
+ @param enterBlock The block to apply on entering a visited node.
+ @param leaveBlock The block to apply on leaving a visited node.
+ */
+ (instancetype)visitorWithEnterBlock:(void (^)(HTMLNode *node))enterBlock
+						   leaveBlock:(void (^)(HTMLNode *node))leaveBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -6,8 +6,6 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //

-#import "NSString+HTMLKit.h"
-
 /**
 HTML quirks modes
 https://html.spec.whatwg.org/multipage/infrastructure.html#quirks-mode
@@ -82,12 +80,4 @@ static NSString * HTMLQuirksModePrefixes[] = {
 #undef QUIRKS_ENTRY
 };

-NS_INLINE BOOL QuirksModePrefixMatch(NSString *publicIdentifier)
-{
-	for (int i = 0; i < sizeof(HTMLQuirksModePrefixes) / sizeof(HTMLQuirksModePrefixes[0]); i++) {
-		if ([publicIdentifier hasPrefixIgnoringCase:HTMLQuirksModePrefixes[i]]) {
-			return YES;
-		}
-	}
-	return NO;
-}
+extern BOOL QuirksModePrefixMatch(NSString *publicIdentifier);
@@ -0,0 +1,45 @@
+//
+//  HTMLSerializer.h
+//  HTMLKit
+//
+//  Created by Iska on 28.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+/**
+ The scope for HTML Serialization.
+ */
+typedef NS_ENUM(unsigned short, HTMLSerializationScope)
+{
+	HTMLSerializationScopeIncludeRoot = 1,
+	HTMLSerializationScopeChildrenOnly = 2
+};
+
+/**
+ A HTML DOM Serializer. Used to serialize HTML Tree rooted at a given node with the desired scope:
+
+ - IncludeRoot scope includes the given node into the serialized result, e.g. HTML Node's `outerHTML`
+ - ChildrenOnly scope serializes only the child nodes of the given node, e.g. HTML Node's `innerHTML`
+
+ https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments
+ */
+@interface HTMLSerializer : NSObject
+
+/**
+ Serializes the given node with the given scope.
+
+ @param node The root node of the tree to serialize
+ @param scope The scope for serialization
+ */
+ (NSString *)serializeNode:(HTMLNode *)node scope:(HTMLSerializationScope)scope;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
@@ -0,0 +1,44 @@
+//
+//  HTMLTreeVisitor.h
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HTMLNodeVisitor.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+/**
+ A HTML Tree Visitor that walks the DOM in tree order. Nodes are visited exacly once
+
+ The provided node visitor is called for each node twice, once when entering the node,
+ and once again when leaving the node.
+
+ @see HTMLNodeVisitor
+ */
+@interface HTMLTreeVisitor : NSObject
+
+/**
+ Initializes a new tree visitor with.
+
+ @param node The root node.
+
+ @return A new instance of a tree visitor.
+ */
+- (instancetype)initWithNode:(HTMLNode *)node;
+
+/**
+ Walks the DOM tree rooted at the provided node with the given node visitor.
+
+ @param visitor A HTMLNodeVisitor implementation.
+ */
+- (void)walkWithNodeVisitor:(id<HTMLNodeVisitor>)visitor;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -19,17 +19,18 @@ NS_ASSUME_NONNULL_BEGIN
 A character set for HTML whitespace characters: CHARACTER TABULATION U+0009, LINE FEED U+000A, FORM FEED U+000C,
 CARRIAGE RETURN U+000D, and SPACE U+0020.
 */
-+ (instancetype)HTMLWhitespaceCharacterSet;
+
+ (instancetype)htmlkit_HTMLWhitespaceCharacterSet;

 /**
 A character set for HTML HEX-Number characters: The digits 0-9, latin small letters a-f, and latin capital letters A-F.
 */
-+ (instancetype)HTMLHexNumberCharacterSet;
+ (instancetype)htmlkit_HTMLHexNumberCharacterSet;

 /**
 A character set for CSS Nth-Expression: The digits 0-9, space, latin small n, latin capital N, plus sing and minus sign.
 */
-+ (instancetype)CSSNthExpressionCharacterSet;
+ (instancetype)htmlkit_CSSNthExpressionCharacterSet;

@end

@@ -15,38 +15,17 @@ NS_ASSUME_NONNULL_BEGIN
 */
@interface NSString (HTMLKit)

-/**
- Checks whether this string is equal to another ignoring the case.
-
- @return `YES` if the two string are equal ignroing the case, `NO` otherwise.
- */
- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString;
-
-/**
- Checks whether this string is equal to any of the given strings.
-
- @return `YES` if there is an equal string, `NO` otherwise.
- */
- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION;
-
-/**
- Checks whether this string has a prefix ignoring the case.
-
- @return `YES` if this string has a given prefix ignroing the case, `NO` otherwise.
- */
- (BOOL)hasPrefixIgnoringCase:(NSString *)aString;
-
 /**
 Checks whether this string is a HTML whitespace string.

 @return `YES` if this string is a HTML whitespace string, `NO` otherwise.
 */
- (BOOL)isHTMLWhitespaceString;
+- (BOOL)htmlkit_isHTMLWhitespaceString;

 /**
 @return The length of the leading HTML whitespace characters in this string.
 */
- (NSUInteger)leadingHTMLWhitespaceLength;
+- (NSUInteger)htmlkit_leadingHTMLWhitespaceLength;

@end

@@ -0,0 +1,41 @@
+//
+//  NSString+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+///------------------------------------------------------
+/// HTMLKit private header
+///------------------------------------------------------
+
+#import <Foundation/Foundation.h>
+
+/**
+ NSStirng category for common helper methods.
+ */
+@interface NSString (Private)
+
+/**
+ Checks whether this string is equal to another ignoring the case.
+
+ @return `YES` if the two string are equal ignroing the case, `NO` otherwise.
+ */
+- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString;
+
+/**
+ Checks whether this string is equal to any of the given strings.
+
+ @return `YES` if there is an equal string, `NO` otherwise.
+ */
+- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION;
+
+/**
+ Checks whether this string has a prefix ignoring the case.
+
+ @return `YES` if this string has a given prefix ignroing the case, `NO` otherwise.
+ */
+- (BOOL)hasPrefixIgnoringCase:(NSString *)aString;
+
+@end
@@ -34,5 +34,6 @@ module HTMLKit {
 		header "HTMLParser+Private.h"
 		header "HTMLNodeTraversal.h"
 		header "HTMLDOMUtils.h"
+		header "NSString+Private.h"
 	}
 }
@@ -0,0 +1,41 @@
+//
+//  CSSStructuralPseudoSelectors.m
+//  HTMLKit
+//
+//  Created by Iska on 18.04.18.
+//  Copyright © 2018 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "CSSSelectors.h"
+#import "HTMLParser.h"
+#import "HTMLDOM.h"
+
+@interface CSSStructuralPseudoSelectors : XCTestCase
+
+@end
+
+@implementation CSSStructuralPseudoSelectors
+
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_25
+{
+	NSString *html = @"<table><tr><td>TD #0</td><td>TD #1</td><td>TD #2</td><td>TD #3</td></tr></table>";
+	HTMLDocument *doc = [HTMLDocument documentWithString:html];
+	NSArray<HTMLElement *> *elements = [doc querySelectorAll:@"td:gt(0)"];
+
+	XCTAssertEqual(elements.count, 3);
+	XCTAssertEqualObjects(elements[0].textContent, @"TD #1");
+	XCTAssertEqualObjects(elements[1].textContent, @"TD #2");
+	XCTAssertEqualObjects(elements[2].textContent, @"TD #3");
+
+	elements = [doc querySelectorAll:@"td:lt(0)"];
+	XCTAssertEqual(elements.count, 0);
+
+	elements = [doc querySelectorAll:@"td:eq(0)"];
+	XCTAssertEqual(elements.count, 1);
+	XCTAssertEqualObjects(elements[0].textContent, @"TD #0");
+}
+
+@end
@@ -9,6 +9,7 @@
 #import "HTML5LibTreeConstructionTest.h"
 #import <XCTest/XCTest.h>

+#import "HTMLDOM.h"
 #import "HTMLDocumentType.h"
 #import "HTMLElement.h"
 #import "HTMLText.h"
@@ -289,6 +290,8 @@ NS_INLINE NSArray * parseAttribute(NSString *str)
 	NSRange range = [str rangeOfString:@"=" options:0];

 	NSString *key = [str substringToIndex:range.location];
+	key = [key stringByReplacingOccurrencesOfString:@" " withString:@":"];
+
 	NSString *value = [str substringFromIndex:range.location + 2];
 	value = [value substringToIndex:value.length - 1];

@@ -0,0 +1,43 @@
+//
+//  HTMLKitParserTests.m
+//  HTMLKit
+//
+//  Created by Iska on 16.07.18.
+//  Copyright © 2018 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "HTMLDOM.h"
+
+@interface HTMLKitParserIssuesTests : XCTestCase
+
+@end
+
+@implementation HTMLKitParserIssuesTests
+
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_30 {
+	NSString *html =
+	@"<body>"
+	"  <svg id='draw_area' width='600' height='800' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1'>"
+	"    <image id='overlay_img' xlink:href='foo.png' width='600' height='800'/>"
+	"  </svg>"
+	"</body>";
+
+	HTMLDocument* document = [HTMLDocument documentWithString:html];
+	HTMLElement *svg = [document querySelector:@"#draw_area"];
+
+	XCTAssertNil(svg.attributes[@"xlink"]);
+	XCTAssertEqualObjects(svg.attributes[@"xmlns"], @"http://www.w3.org/2000/svg");
+	XCTAssertEqualObjects(svg.attributes[@"xmlns:xlink"], @"http://www.w3.org/1999/xlink");
+
+	HTMLElement *image = [document querySelector:@"#overlay_img"];
+
+	XCTAssertNil(image.attributes[@"xlink"]);
+	XCTAssertNil(image.attributes[@"href"]);
+	XCTAssertEqualObjects(image.attributes[@"xlink:href"], @"foo.png");
+	XCTAssertEqualObjects(image.outerHTML, @"<image id=\"overlay_img\" xlink:href=\"foo.png\" width=\"600\" height=\"800\"></image>");
+}
+
+@end
@@ -580,16 +580,49 @@ static HTMLNode * (^ LastDescendant)(HTMLNode *) = ^ HTMLNode * (HTMLNode *node)
 	XCTAssertNotNil(body);

 	// iterator should be deallocated and detached at this point
-	XCTAssertEqual(0, nodeIterators.count);
+	XCTAssertEqual(0, nodeIterators.allObjects.count);

 	// iterator should be autoreleased, deallocated and detached after autoreleasepool
 	@autoreleasepool {
 		HTMLNodeIterator *iterator = [[HTMLNodeIterator alloc] initWithNode:body];
 		[iterator nextNode];
-		XCTAssertEqual(1, nodeIterators.count);
+		XCTAssertEqual(1, nodeIterators.allObjects.count);
 	}

-	XCTAssertEqual(0, nodeIterators.count);
+	XCTAssertEqual(0, nodeIterators.allObjects.count);
+}
+
+- (void)testBugFix_Issue_22
+{
+    // The issue is applicable only for devices. On simulator the test is passed.
+    HTMLDocument *document = [HTMLDocument documentWithString:@"<div id=\"id\"></div>"];
+    
+    NSString *divId = @"id";
+    HTMLNodeFilterBlock *filter = [HTMLNodeFilterBlock filterWithBlock:^HTMLNodeFilterValue(HTMLNode * _Nonnull node) {
+        HTMLElement *element = (HTMLElement *)node;
+        return [element.elementId isEqualToString:divId] ? HTMLNodeFilterAccept : HTMLNodeFilterSkip;
+    }];
+    
+    HTMLNodeIterator *iterator = [document nodeIteratorWithShowOptions:HTMLNodeFilterShowElement filter:filter];
+    
+    HTMLElement *element = (HTMLElement*)iterator.nextObject;
+    XCTAssertTrue([element.elementId isEqualToString:divId]);
+}
+
+- (void)testBugFix_Issue_28
+{
+    HTMLDocument *document = self.document;
+    HTMLNodeIterator *iterator = document.body.nodeIterator;
+    
+    [iterator nextNode]; // Reference node: <body>
+    
+    HTMLElement *span = (HTMLElement*)iterator.nextNode; // <span>
+    NSString *spanTag = @"span";
+    XCTAssertTrue([span.tagName isEqualToString:spanTag]);
+    
+    HTMLElement *paragraph = span.nextSiblingElement; // <p>
+    NSString *paragraphTag = @"p";
+    XCTAssertTrue([paragraph.tagName isEqualToString:paragraphTag]);
 }

@end
@@ -512,4 +512,60 @@
 	XCTAssertTrue([image compareDocumentPositionWithNode:outerDiv] == (HTMLDocumentPositionContainedBy | HTMLDocumentPositionFollowing));
 }

+- (void)testDeepCloneElement {
+	HTMLElement *outer = [[HTMLElement alloc] initWithTagName:@"div"
+													 attributes:@{@"id": @"outer",
+																  @"class": @"green"}];
+
+	HTMLElement *innerLevel1 = [[HTMLElement alloc] initWithTagName:@"div"
+												 attributes:@{@"id": @"inner1",
+															  @"class": @"red"}];
+
+	HTMLElement *innerLevel2 = [[HTMLElement alloc] initWithTagName:@"div"
+														 attributes:@{@"id": @"inner2",
+																	  @"class": @"red"}];
+
+	[outer appendNode:innerLevel1];
+	[innerLevel1 appendNode:innerLevel2];
+
+    HTMLElement *clone = [outer cloneNodeDeep:YES];
+
+	XCTAssertNotEqual(clone, outer);
+	XCTAssertEqualObjects(clone.elementId, outer.elementId);
+	XCTAssertEqualObjects(clone.attributes, outer.attributes);
+
+	XCTAssertNotEqual(clone.firstChild, innerLevel1);
+	XCTAssertEqualObjects(clone.firstChild.asElement.elementId, innerLevel1.elementId);
+	XCTAssertEqualObjects(clone.firstChild.asElement.attributes, innerLevel1.attributes);
+
+	XCTAssertNotEqual(clone.firstChild, innerLevel2);
+	XCTAssertEqualObjects(clone.firstChild.firstChild.asElement.elementId, innerLevel2.elementId);
+	XCTAssertEqualObjects(clone.firstChild.firstChild.asElement.attributes, innerLevel2.attributes);
+}
+
+- (void)testDeepCloneElementAttributes {
+	HTMLElement *div = [[HTMLElement alloc] initWithTagName:@"div"
+												   attributes:@{@"id": @"outer",
+																@"class": @"green",
+																@"data": @"test"}];
+
+	HTMLElement *clone = [div cloneNodeDeep:YES];
+
+	XCTAssertEqualObjects(clone.attributes, div.attributes);
+	XCTAssertTrue([clone.attributes isKindOfClass:[HTMLOrderedDictionary class]]);
+}
+
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_20 {
+	HTMLElement *element = [HTMLElement new];
+	element.elementId = @"originalId";
+
+	HTMLElement *clone = [element cloneNodeDeep:YES];
+	NSString *cloneId = @"cloneId";
+	clone.elementId = cloneId;
+
+	XCTAssertTrue([clone.elementId isEqualToString:cloneId]);
+}
+
@end
@@ -2112,10 +2112,10 @@
 	@autoreleasepool {
 		HTMLRange *range = [[HTMLRange alloc] initWithDocument:document];
 		[range cloneContents];
-		XCTAssertEqual(1, ranges.count);
+		XCTAssertEqual(1, ranges.allObjects.count);
 	}

-	XCTAssertEqual(0, ranges.count);
+	XCTAssertEqual(0, ranges.allObjects.count);
 }

@end
@@ -8,6 +8,19 @@

 #import <XCTest/XCTest.h>
 #import "HTMLDOM.h"
+#import "HTMLKitTestUtil.h"
+
+#define Assert(input, expected) \
+	do { \
+		HTMLDocument *document = [HTMLDocument documentWithString:input]; \
+		XCTAssertEqualObjects(document.body.innerHTML, expected); \
+	} while(0)
+
+#define AssertH(input, expected) \
+	do { \
+		HTMLDocument *document = [HTMLDocument documentWithString:input]; \
+		XCTAssertEqualObjects(document.head.innerHTML, expected); \
+	} while(0)

@interface HTMLSerializationTests : XCTestCase

@@ -15,12 +28,47 @@

@implementation HTMLSerializationTests

- (void)setUp {
-    [super setUp];
-}
-
- (void)tearDown {
-    [super tearDown];
+- (void)testSerializer
+{
+	Assert(@"", @"");
+	Assert(@"<a a=\r\n", @"");
+	Assert(@"<p><i>Hello!</p>, World!</i>", @"<p><i>Hello!</i></p><i>, World!</i>");
+	Assert(@"<p><i>Hello</i>, World!</p>", @"<p><i>Hello</i>, World!</p>");
+	AssertH(@"<base foo=\"<'>\">", @"<base foo=\"<'>\">");
+	AssertH(@"<base foo=\"&amp;\">", @"<base foo=\"&amp;\">");
+	AssertH(@"<base foo=&amp>", @"<base foo=\"&amp;\">");
+	AssertH(@"<base foo=x0x00A0y>", @"<base foo=\"x&nbsp;y\">");
+	AssertH(@"<base foo='\"'>", @"<base foo=\"&quot;\">");
+	Assert(@"<span foo=3 title='test \"with\" &amp;quot;'>", @"<span foo=\"3\" title=\"test &quot;with&quot; &amp;quot;\"></span>");
+	Assert(@"<p>\"'\"</p>", @"<p>\"'\"</p>");
+	Assert(@"<p>&amp;</p>", @"<p>&amp;</p>");
+	Assert(@"<p>&amp</p>", @"<p>&amp;</p>");
+	Assert(@"<p>&lt;</p>", @"<p>&lt;</p>");
+	Assert(@"<p>&gt;</p>", @"<p>&gt;</p>");
+	Assert(@"<p>></p>", @"<p>&gt;</p>");
+	AssertH(@"<script>(x & 1) < 2; y > \"foo\" + 'bar'</script>", @"<script>(x & 1) < 2; y > \"foo\" + 'bar'</script>");
+	AssertH(@"<style>(x & 1) < 2; y > \"foo\" + 'bar'</style>", @"<style>(x & 1) < 2; y > \"foo\" + 'bar'</style>");
+	Assert(@"<xmp>(x & 1) < 2; y > \"foo\" + 'bar'</xmp>", @"<xmp>(x & 1) < 2; y > \"foo\" + 'bar'</xmp>");
+	Assert(@"<iframe>(x & 1) < 2; y > \"foo\" + 'bar'</iframe>", @"<iframe>(x & 1) < 2; y > \"foo\" + 'bar'</iframe>");
+	Assert(@"<noembed>(x & 1) < 2; y > \"foo\" + 'bar'</noembed>", @"<noembed>(x & 1) < 2; y > \"foo\" + 'bar'</noembed>");
+	AssertH(@"<noframes>(x & 1) < 2; y > \"foo\" + 'bar'</noframes>", @"<noframes>(x & 1) < 2; y > \"foo\" + 'bar'</noframes>");
+	Assert(@"<pre>foo bar</pre>", @"<pre>foo bar</pre>");
+	Assert(@"<pre>\nfoo bar</pre>", @"<pre>foo bar</pre>");
+	Assert(@"<pre>\n\nfoo bar</pre>", @"<pre>\nfoo bar</pre>");
+	Assert(@"<textarea>foo bar</textarea>", @"<textarea>foo bar</textarea>");
+	Assert(@"<textarea>\nfoo bar</textarea>", @"<textarea>foo bar</textarea>");
+	Assert(@"<textarea>\n\nfoo bar</textarea>", @"<textarea>\nfoo bar</textarea>");
+	Assert(@"<listing>foo bar</listing>", @"<listing>foo bar</listing>");
+	Assert(@"<listing>\nfoo bar</listing>", @"<listing>foo bar</listing>");
+	Assert(@"<listing>\n\nfoo bar</listing>", @"<listing>\nfoo bar</listing>");
+	Assert(@"<p>hi <!--world--></p>", @"<p>hi <!--world--></p>");
+	Assert(@"<p>hi <!-- world--></p>", @"<p>hi <!-- world--></p>");
+	Assert(@"<p>hi <!--world --></p>", @"<p>hi <!--world --></p>");
+	Assert(@"<p>hi <!-- world --></p>", @"<p>hi <!-- world --></p>");
+	Assert(@"<svg xmlns=\"bleh\"></svg>", @"<svg xmlns=\"bleh\"></svg>");
+	Assert(@"<svg xmlns:foo=\"bleh\"></svg>", @"<svg xmlns:foo=\"bleh\"></svg>");
+	Assert(@"<svg xmlns:xlink=\"bleh\"></svg>", @"<svg xmlns:xlink=\"bleh\"></svg>");
+	Assert(@"<svg xlink:href=\"bleh\"></svg>", @"<svg xlink:href=\"bleh\"></svg>");
 }

 #pragma mark - Bug Fixes
@@ -41,4 +89,19 @@
 	XCTAssertEqualObjects(document.body.outerHTML, @"<body key=\"&amp; testing &nbsp;\"></body>");
 }

+- (void)testBugFix_Issue_33
+{
+	NSString *path = [HTMLKitTestUtil pathForFixture:@"bug33" ofType:@"html" inDirectory:@"Fixtures"];
+	NSString *html = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
+	HTMLDocument *document = [HTMLDocument documentWithString:html];
+
+	XCTestExpectation *expectation = [self expectationWithDescription:@"HTML serializes despite limited recursion depth"];
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+		[document.rootElement outerHTML];
+		[expectation fulfill];
+	});
+
+	[self waitForExpectationsWithTimeout:500 handler:nil];
+}
+
@end
@@ -7,6 +7,7 @@
 //

 #import <XCTest/XCTest.h>
+#import "NSString+Private.h"
 #import "NSString+HTMLKit.h"

@interface HTMLKitStringCategoryTests : XCTestCase
@@ -50,33 +51,33 @@

 - (void)testIsHTMLWhitespaceString
 {
-	XCTAssertTrue([@" " isHTMLWhitespaceString]);
-	XCTAssertTrue([@"\t" isHTMLWhitespaceString]);
-	XCTAssertTrue([@"\n" isHTMLWhitespaceString]);
-	XCTAssertTrue([@"\f" isHTMLWhitespaceString]);
-	XCTAssertTrue([@"\r" isHTMLWhitespaceString]);
-	XCTAssertTrue([@" \t\n\f\r" isHTMLWhitespaceString]);
-	XCTAssertTrue([@"\t\n\f\r " isHTMLWhitespaceString]);
-	XCTAssertTrue([@" \t \n \f \r" isHTMLWhitespaceString]);
-	XCTAssertFalse([@"html kit" isHTMLWhitespaceString]);
+	XCTAssertTrue([@" " htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@"\t" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@"\n" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@"\f" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@"\r" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@" \t\n\f\r" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@"\t\n\f\r " htmlkit_isHTMLWhitespaceString]);
+	XCTAssertTrue([@" \t \n \f \r" htmlkit_isHTMLWhitespaceString]);
+	XCTAssertFalse([@"html kit" htmlkit_isHTMLWhitespaceString]);
 }

 - (void)testLeadingWhitespaceLength
 {
-	XCTAssertEqual([@"" leadingHTMLWhitespaceLength], 0);
-	XCTAssertEqual([@"\0" leadingHTMLWhitespaceLength], 0);
+	XCTAssertEqual([@"" htmlkit_leadingHTMLWhitespaceLength], 0);
+	XCTAssertEqual([@"\0" htmlkit_leadingHTMLWhitespaceLength], 0);

-	XCTAssertEqual([@" " leadingHTMLWhitespaceLength], 1);
-	XCTAssertEqual([@"\0 " leadingHTMLWhitespaceLength], 0);
+	XCTAssertEqual([@" " htmlkit_leadingHTMLWhitespaceLength], 1);
+	XCTAssertEqual([@"\0 " htmlkit_leadingHTMLWhitespaceLength], 0);

-	XCTAssertEqual([@"  " leadingHTMLWhitespaceLength], 2);
-	XCTAssertEqual([@" \0 " leadingHTMLWhitespaceLength], 1);
+	XCTAssertEqual([@"  " htmlkit_leadingHTMLWhitespaceLength], 2);
+	XCTAssertEqual([@" \0 " htmlkit_leadingHTMLWhitespaceLength], 1);

-	XCTAssertEqual([@"\t\r\n\f" leadingHTMLWhitespaceLength], 4);
-	XCTAssertEqual([@"\t\r\n\0\f" leadingHTMLWhitespaceLength], 3);
+	XCTAssertEqual([@"\t\r\n\f" htmlkit_leadingHTMLWhitespaceLength], 4);
+	XCTAssertEqual([@"\t\r\n\0\f" htmlkit_leadingHTMLWhitespaceLength], 3);

-	XCTAssertEqual([@"\t\r\n\f " leadingHTMLWhitespaceLength], 5);
-	XCTAssertEqual([@"\t\r\n\f\0 " leadingHTMLWhitespaceLength], 4);
+	XCTAssertEqual([@"\t\r\n\f " htmlkit_leadingHTMLWhitespaceLength], 5);
+	XCTAssertEqual([@"\t\r\n\f\0 " htmlkit_leadingHTMLWhitespaceLength], 4);
 }

@end
@@ -0,0 +1,108 @@
+//
+//  HTMLTreeVisitorTests.m
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "HTMLDOM.h"
+#import "HTMLElement.h"
+#import "HTMLNode+Private.h"
+
+@interface HTMLTreeVisitorTests : XCTestCase
+
+@end
+
+@implementation HTMLTreeVisitorTests
+
+#pragma mark - Asserts
+
+#define AssertElementWithId(input, id) \
+do { \
+	HTMLNode *node = input;\
+	XCTAssertEqual(node.nodeType, HTMLNodeElement);\
+	XCTAssertEqualObjects(node.asElement[@"id"], id);\
+} while(0)
+
+#define AssertTextWithValue(input, value) \
+do { \
+	HTMLNode *node = input;\
+	XCTAssertEqual(node.nodeType, HTMLNodeText);\
+	XCTAssertEqualObjects(node.textContent, value);\
+} while(0)
+
+#define AssertCommentWithValue(input, value) \
+do { \
+	HTMLNode *node = input;\
+	XCTAssertEqual(node.nodeType, HTMLNodeComment);\
+	XCTAssertEqualObjects(node.textContent, value);\
+} while(0)
+
+#pragma mark - Basic Walking
+
+- (HTMLNode *)testDOM
+{
+		// Tree structure:
+		//             #a
+		//             |
+		//        +----+----+
+		//        |         |
+		//       #b        #c
+		//                  |
+		//             +----+----+
+		//             |         |
+		//            #d        #j
+		//             |
+		//        +----+----+
+		//        |    |    |
+		//       #e   #f   #i
+		//             |
+		//          +--+--+
+		//          |     |
+		//         #g    #h
+
+	HTMLElement *div = [[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"a"}];
+
+	[div appendNode:[[HTMLElement alloc] initWithTagName:@"div"  attributes:@{@"id": @"b"}]];
+
+	HTMLElement *c = [[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"c"}];
+	[div appendNode:c];
+
+	HTMLElement *d = [[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"d"}];
+	[c appendNode:d];
+	[c appendNode:[[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"j"}]];
+
+	[d appendNode:[[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"e"}]];
+
+	HTMLElement *f = [[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"f"}];
+	[d appendNode:f];
+	[d appendNode:[[HTMLElement alloc] initWithTagName:@"div" attributes:@{@"id": @"i"}]];
+
+	[f appendNode:[[HTMLElement alloc] initWithTagName:@"g" attributes:@{@"id": @"g"}]];
+	[f appendNode:[[HTMLElement alloc] initWithTagName:@"h" attributes:@{@"id": @"h"}]];
+
+	return div;
+}
+
+- (void)testTreeVisitor
+{
+	HTMLNode *root = self.testDOM;
+	HTMLTreeVisitor *visitor = [[HTMLTreeVisitor alloc] initWithNode:root];
+
+	NSMutableArray *visited = [NSMutableArray array];
+
+	[visitor walkWithNodeVisitor:[HTMLNodeVisitorBlock visitorWithEnterBlock:^(HTMLNode *node) {
+		[visited addObject:[NSString stringWithFormat:@"E %@", node.asElement.elementId]];
+	} leaveBlock:^(HTMLNode *node) {
+		[visited addObject:[NSString stringWithFormat:@"L %@", node.asElement.elementId]];
+	}]];
+
+	NSArray *expected = @[@"E a", @"E b", @"L b", @"E c", @"E d", @"E e", @"L e", @"E f", @"E g", @"L g", @"E h", @"L h",
+						  @"L f", @"E i", @"L i", @"L d", @"E j", @"L j", @"L c", @"L a"];
+
+	XCTAssertEqualObjects(visited, expected);
+}
+
+@end
@@ -7,7 +7,6 @@
 	//

 #import <XCTest/XCTest.h>
-#import "HTMLTreeWalker.h"
 #import "HTMLDOM.h"
 #import "HTMLNode+Private.h"
Author	SHA1	Message	Date
iska	b3b9ab7f93	Merge branch 'release/3.1.0'	2019-08-20 18:20:03 +02:00
iska	fa0201f2fc	Bump HTMLKit version to 3.1.0	2019-08-20 18:19:31 +02:00
iska	9d0977d0dd	Update podspec for 3.0.0	2019-08-20 18:19:08 +02:00
iska	0a8e3a0e3b	Update jazzy.yaml for 3.1.0	2019-08-20 18:18:58 +02:00
iska	3a294796d8	Add Changelog entry for HTMLKit 3.0.0	2019-08-20 18:18:49 +02:00
iska	a1ca351912	Update Readme	2019-08-20 18:18:06 +02:00
iska	153d48c19c	Set iterator and range detach operations to noop Leave the housekeeping to the NSHashTable itself, which should purge null-references automatically (not necessarily right away) Also update tests accordingly: Use `allObjects.count` instead of simply `count` on the NSHashTable, since `allObjects.count` returns non-null references. This should fix #36	2019-08-06 21:26:21 +02:00
iska	1dda2921fe	Update html5lib-tests to latest commit as of 2019.08.06	2019-08-06 20:40:25 +02:00
iska	23f4e40d08	Add tests for HTML Serialization Fixes #33	2019-08-06 20:39:40 +02:00
iska	f4f7f48845	Move test class into correct folder	2019-08-03 19:47:29 +02:00
iska	98f7c8304f	Implement a HTML Serializer This implements the HTML Fragments Serialization according to: https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments	2019-08-02 00:11:02 +02:00
iska	12276e91b3	Implement a HTML Tree Visitor The tree visitor walks the DOM in tree order and calls the provided node visitor upon entring and leaving a node.	2019-07-31 21:58:07 +02:00
iska	ad2790b653	Update example for new github html structure/css	2019-07-25 21:46:28 +02:00
iska	70eeecbf67	Merge branch 'release/3.0.0'	2019-03-28 22:20:12 +01:00
iska	228e3ea2a7	Merge tag '3.0.0' into develop no message	2019-03-28 22:20:12 +01:00
iska	918c59e5ff	Bump HTMLKit version to 3.0.0	2019-03-28 22:19:58 +01:00
iska	2a641ddacd	Update podspec for 3.0.0	2019-03-28 22:19:44 +01:00
iska	91d1f85c1b	Update jazzy.yaml for 3.0.0	2019-03-28 22:19:32 +01:00
iska	85bd39963f	Add Changelog entry for HTMLKit 3.0.0	2019-03-28 22:19:19 +01:00
iska	7cbfdb9c78	Introduce prefix for category methods to prevent collisions See: https://github.com/iabudiab/HTMLKit/issues/35	2019-03-26 23:23:08 +01:00
iska	d756fc4298	Merge branch 'release/2.1.5'	2018-07-16 22:13:29 +02:00
iska	0fe6b7c42d	Merge tag '2.1.5' into develop no message	2018-07-16 22:13:29 +02:00
iska	7c2335184e	Bump HTMLKit version to 2.1.5	2018-07-16 22:13:21 +02:00
iska	0c6084ba73	Update podspec for 2.1.4	2018-07-16 22:12:54 +02:00
iska	5201860073	Add Changelog entry for HTMLKit 2.1.5	2018-07-16 22:12:39 +02:00
iska	cf21b88eb1	Add Changelog entry for HTMLKit 2.1.5	2018-07-16 22:12:30 +02:00
iska	7617fceff1	Add test for bug fix issue #30	2018-07-16 22:09:35 +02:00
iska	9dd3c70fc3	Remove foreign attributes adjustment Fixes #30 Foreign attributes were handled incorrectly because attribute names were implemented as pure strings without namespace prefix. This change keeps the attributes as strings and eliminates any handling in regards to namespaces. Spec note about attributes: "If designed today they would just have a name and value." https://dom.spec.whatwg.org/#attr	2018-05-10 18:41:54 +02:00
Iskandar Abudiab	fe2a441171	Merge pull request #29 from CRivlaldo/develop Fix the issue 28	2018-05-03 20:11:33 +02:00
Vladimir Vlasov	7c32b5f219	Fix the issue 28	2018-05-03 19:00:29 +03:00
iska	bf0d8560b0	Merge branch 'release/2.1.4'	2018-05-01 20:08:30 +02:00
iska	ebc6f7a097	Merge branch 'release/2.1.4' into develop	2018-05-01 20:08:30 +02:00
iska	d29a70dfec	Bump HTMLKit version to 2.1.4	2018-05-01 20:08:00 +02:00
iska	b8f56ca97d	Update podspec for 2.1.4	2018-05-01 20:07:44 +02:00
iska	0f954d5d56	Update jazzy.yaml for 2.1.4	2018-05-01 20:07:35 +02:00
iska	ac5089d69b	Add Changelog entry for HTMLKit 2.1.4	2018-05-01 20:07:23 +02:00
iska	c9c36397e0	Update CocoaPods block in Readme	2018-05-01 20:02:36 +02:00
iska	923e271429	Fix eq, lt & gt selectors for the zero-index case Fixes #25	2018-04-18 23:51:39 +02:00
iska	8546168324	Merge branch 'release/2.1.3'	2018-03-21 22:52:09 +01:00
iska	da765169fa	Merge branch 'release/2.1.3' into develop	2018-03-21 22:51:46 +01:00
iska	ec6d03ee57	Bump HTMLKit version to 2.1.3	2018-03-21 22:43:01 +01:00
iska	7944549bd7	Update podspec for 2.1.3	2018-03-21 22:42:41 +01:00
iska	bb6a97984b	Update jazzy.yaml for 2.1.3	2018-03-21 22:42:32 +01:00
iska	0aff9cf787	Add Changelog entry for HTMLKit 2.1.3	2018-03-21 22:42:00 +01:00
iska	b7bf9d2b04	Use HTMLOrderedDictionary when cloning element's attributes	2018-03-21 22:19:24 +01:00
iska	12af838fa2	Update html5lib-tests to latest commit as of 2018.03.18	2018-03-18 21:45:44 +01:00
iska	14b8b5390f	Add test case for node deep-clone	2018-03-18 21:45:04 +01:00
Iskandar Abudiab	a5599c4163	Merge pull request #23 from CRivlaldo/iterator Fix the issue #22	2018-03-18 21:26:27 +01:00
Iskandar Abudiab	c0ac25645d	Merge pull request #24 from CRivlaldo/deepclone Fix the issue #20	2018-03-18 21:19:42 +01:00
Vladimir	fa431550d7	Fix the issue 22 (fix a test name)	2018-03-17 11:34:22 +03:00
Vladimir	70c6aee814	Fix the issue 22	2018-03-17 11:33:30 +03:00
Vladimir	7309b97b92	Fix the HTMLElement attributes copying	2018-03-17 10:40:00 +03:00
iska	7ffb8e5ca0	Merge branch 'release/2.1.2' into develop	2017-11-06 22:05:08 +01:00