Merge branch 'release/2.1.2'

Bump HTMLKit version to 2.1.2
Update podspec for 2.1.2
2017-11-06 22:05:07 +01:00 · 2017-11-06 22:04:57 +01:00 · 2017-11-06 22:04:38 +01:00 · 2017-11-06 22:04:29 +01:00 · 2017-11-06 22:04:18 +01:00 · 2017-11-06 21:58:08 +01:00
46 changed files with 3464 additions and 82105 deletions
@@ -0,0 +1,5 @@
+codecov:
+  branch: develop
+
+ignore:
+  - "Tests/"
@@ -1,5 +1,5 @@
 module: HTMLKit
-module_version: 2.0.6
+module_version: 2.1.2
 author: Iskandar Abudiab 
 author_url: https://twitter.com/iabudiab
 github_url: https://github.com/iabudiab/HTMLKit
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9

 branches:
  except:
@@ -17,27 +17,29 @@ env:
    - MACOS_FRAMEWORK_SCHEME=HTMLKit-macOS
    - WATCHOS_FRAMEWORK_SCHEME="HTMLKit-watchOS"
    - TVOS_FRAMEWORK_SCHEME="HTMLKit-tvOS"
-    - IOS_SDK=iphonesimulator10.3
-    - MACOS_SDK=macosx10.12
-    - WATCHOS_SDK=watchsimulator3.2
-    - TVOS_SDK=appletvsimulator10.2
+    - IOS_SDK=iphonesimulator11.0
+    - MACOS_SDK=macosx10.13
+    - WATCHOS_SDK=watchsimulator4.0
+    - TVOS_SDK=appletvsimulator11.0
  matrix:
-    - DESTINATION="arch=x86_64"                              SIMULATOR=""                                   SCHEME="$MACOS_FRAMEWORK_SCHEME"    SDK="$MACOS_SDK"
-    - DESTINATION="OS=8.4,name=iPhone 6 Plus"                SIMULATOR="iPhone 6 Plus (8.4)"                SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.3,name=iPhone 6S Plus"               SIMULATOR="iPhone 6S Plus (9.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=10.3,name=iPhone 7 Plus"               SIMULATOR="iPhone 7 Plus (10.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"           SIMULATOR="Apple Watch - 42mm (2.2)"           SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm"  SIMULATOR="Apple Watch Series 2 - 42mm (3.2)"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"               SIMULATOR="Apple TV 1080p (9.2)"               SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"              SIMULATOR="Apple TV 1080p (10.2)"              SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
+    - DESTINATION="arch=x86_64"                                SCHEME="$MACOS_FRAMEWORK_SCHEME"      SDK="$MACOS_SDK"
+    - DESTINATION="OS=9.3,name=iPhone 6s Plus"                 SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
+    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"               SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
+    - DESTINATION="OS=11.0,name=iPhone X"                      SCHEME="$IOS_FRAMEWORK_SCHEME"        SDK="$IOS_SDK"
+    - DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm"    SCHEME="$WATCHOS_FRAMEWORK_SCHEME"    SDK="$WATCHOS_SDK"
+    - DESTINATION="OS=4.0,name=Apple Watch Series 3 - 42mm"    SCHEME="$WATCHOS_FRAMEWORK_SCHEME"    SDK="$WATCHOS_SDK"
+    - DESTINATION="OS=10.2,name=Apple TV 1080p"                SCHEME="$TVOS_FRAMEWORK_SCHEME"       SDK="$TVOS_SDK"
+    - DESTINATION="OS=11.0,name=Apple TV 4K"                   SCHEME="$TVOS_FRAMEWORK_SCHEME"       SDK="$TVOS_SDK"

 script:
  - set -o pipefail
  - xcodebuild -version
  - xcodebuild -showsdks
-  - SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
-  - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
  - if [ "$SDK" != "$WATCHOS_SDK" ]; then
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test | xcpretty -c;
    fi
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
@@ -1,5 +1,41 @@
 # Change Log

+## [2.1.2](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.2) 
+
+Released on 2017.11.6
+
+### Fixes
+
+- `HTMLText` serialization (issue #16)
+- `HTMLElement` attribute value serialization (issue #17)
+
+
+## [2.1.1](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.1) 
+
+Released on 2017.10.13
+
+### Hotfix
+
+- Fixed documentation comments
+	- Should fix CocoaDocs generation and percentage
+
+
+## [2.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.0) 
+
+Released on 2017.10.12
+
+### Added
+
+- Standarized tokenizer error codes:
+	- [whatwg/html#2701](https://github.com/whatwg/html/pull/2701)
+	- [html5lib/html5lib-tests#92](https://github.com/html5lib/html5lib-tests/pull/92)
+
+### Updated
+
+- Project for Xcode 9
+- Travis config for iOS 11.0, macOS 10.13, tvOS 11.0 and watchOS 4.0
+- Updated HTML5Lib-Tests submodule (cbafeba)
+
 ## [2.0.6](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.6) 

 Released on 2017.05.02
@@ -89,7 +89,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = iabudiab;
 				TargetAttributes = {
 					629A63C81D9AFE0E0089679F = {
@@ -136,7 +136,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -144,7 +146,12 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -184,7 +191,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -192,7 +201,12 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -212,6 +226,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -250,6 +265,7 @@
 				629A63D21D9AFE0E0089679F /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -45,6 +46,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name               = "HTMLKit"
-  s.version            = "2.0.6"
+  s.version            = "2.1.2"
  s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
  s.license            = "MIT"
  s.homepage           = "https://github.com/iabudiab/HTMLKit"
@@ -306,6 +306,9 @@
 		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 */; };
+		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 */; };
 		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, ); }; };
@@ -703,6 +706,7 @@
 		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>"; };
+		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>"; };
 		62AE593319F97D880043F069 /* HTMLParseErrorToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParseErrorToken.h; path = include/HTMLParseErrorToken.h; sourceTree = "<group>"; };
@@ -885,6 +889,7 @@
 				62EC7AE51AEEAC6F0015D3BE /* HTMLMutationAlgorithmsTests.m */,
 				62EC0A841E158BD80007786B /* HTMLRangeTests.m */,
 				62E0BA961E25456700E4D193 /* HTMLCharacterDataTests.m */,
+				62A95A4C1FB0FBFC0009FF26 /* HTMLSerializationTests.m */,
 			);
 			name = DOM;
 			sourceTree = "<group>";
@@ -1573,7 +1578,7 @@
 		625A14A319C7829400AD0C32 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = BrainCookie;
 				TargetAttributes = {
 					625A14C219C7829400AD0C32 = {
@@ -1761,6 +1766,7 @@
 				62567F561C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */,
 				624AC90219FBF9ED00BD3C4A /* HTMLKitTokenizerTests.m in Sources */,
 				624B9FB31AE0313300646C4C /* HTMLStringCategoryTests.m in Sources */,
+				62A95A4D1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */,
 				623916C81AC7209E0066B4FE /* HTMLNodeIteratorTests.m in Sources */,
 				62D8345A19FB1AC4009205A9 /* HTML5LibTokenizerTest.m in Sources */,
 				6239755F1AC364BB007E26F1 /* HTML5LibTreeConstructionTest.m in Sources */,
@@ -1903,6 +1909,7 @@
 				62857D401D39A345008DC254 /* CSSAttributeSelectorTests.m in Sources */,
 				62857D311D39A33C008DC254 /* HTML5LibTreeConstructionTest.m in Sources */,
 				62857D391D39A342008DC254 /* HTMLOrderedDictionaryTests.m in Sources */,
+				62A95A4F1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */,
 				62857D411D39A345008DC254 /* CSSNThExpressionSelectorTests.m in Sources */,
 				62857D381D39A342008DC254 /* HTMLStringCategoryTests.m in Sources */,
 				62857D331D39A33C008DC254 /* HTMLKitParserPerformance.m in Sources */,
@@ -1990,6 +1997,7 @@
 				62567F571C0CC3AE0025D458 /* HTMLDOMTokenListTests.m in Sources */,
 				62ECBFD41C0B6E2E00AF847B /* HTMLStringCategoryTests.m in Sources */,
 				62ECBFD51C0B6E2E00AF847B /* HTMLOrderedDictionaryTests.m in Sources */,
+				62A95A4E1FB0FBFC0009FF26 /* HTMLSerializationTests.m in Sources */,
 				62ECBFD61C0B6E2E00AF847B /* CSSSelectorTest.m in Sources */,
 				62ECBFD71C0B6E2E00AF847B /* CSSSelectorParserTests.m in Sources */,
 				62ECBFD81C0B6E2E00AF847B /* CSSNthExpressionsParserTests.m in Sources */,
@@ -2030,14 +2038,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2074,14 +2088,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2106,6 +2126,7 @@
 		625A14D519C7829400AD0C32 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2115,8 +2136,10 @@
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2131,6 +2154,7 @@
 		625A14D619C7829400AD0C32 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2140,8 +2164,10 @@
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2206,6 +2232,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
@@ -2217,7 +2244,9 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2241,6 +2270,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
@@ -2252,7 +2282,9 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2276,6 +2308,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
@@ -2289,7 +2322,9 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2311,6 +2346,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
@@ -2324,7 +2360,9 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2387,6 +2425,7 @@
 		62ECBF5F1C0B6C7600AF847B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -2399,8 +2438,10 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_PEDANTIC = NO;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
@@ -2423,6 +2464,7 @@
 		62ECBF601C0B6C7600AF847B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -2435,8 +2477,10 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "";
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_PEDANTIC = NO;
 				INFOPLIST_FILE = "Sources/HTMLKit-Info.plist";
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
      <Testables>
@@ -70,6 +71,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
      <Testables>
@@ -70,6 +71,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
      <Testables>
@@ -64,6 +65,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
      <Testables>
@@ -37,6 +38,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -4,7 +4,8 @@

 An Objective-C framework for your everyday HTML needs.

-[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/master.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/develop.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![codecov](https://codecov.io/gh/iabudiab/HTMLKit/branch/develop/graph/badge.svg)](https://codecov.io/gh/iabudiab/HTMLKit)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/HTMLKit.svg?style=flat)](https://cocoapods.org/pods/HTMLKit)
 [![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/HTMLKit.svg?style=flat)](http://cocoadocs.org/docsets/HTMLKit)
@@ -38,7 +38,7 @@ NSString * _Nonnull NSStringFromNthExpression(CSSNthExpression expression)

 #pragma mark - Implementation

-NSInteger computeIndex(NSEnumerator *enumerator, HTMLElement *element)
+NS_INLINE NSInteger computeIndex(NSEnumerator *enumerator, HTMLElement *element)
 {
 	NSInteger index = 0;
 	for (HTMLNode *node in enumerator) {
@@ -157,11 +157,10 @@

 	[result appendFormat:@"<%@", self.tagName];
 	[self.attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-		NSRange range = NSMakeRange(0, value.length);
 		NSMutableString *escaped = [value mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:0 range:range];
+		[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];
 	}];
@@ -48,10 +48,10 @@

 #pragma mark - Errors

- (void)emitParseError:(NSString *)reason
+- (void)emitParseError:(NSString *)code details:(NSString *)details
 {
 	if (self.errorCallback) {
-		self.errorCallback(reason);
+		self.errorCallback(code, details);
 	}
 }

@@ -82,16 +82,16 @@
 		return LINE_FEED;
 	}
 	if (CFStringIsSurrogateLowCharacter(nextInputCharacter)) {
-		NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: 0x%X)", (unsigned int)nextInputCharacter];
-		[self emitParseError:reason];
+		NSString *details = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: 0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"surrogate-in-input-stream" details:details];
 		return nextInputCharacter;
 	}

 	if (CFStringIsSurrogateHighCharacter(nextInputCharacter)) {
 		UniChar surrogateLow = CFStringGetCharacterFromInlineBuffer(&_buffer, _location + 1);
 		if (CFStringIsSurrogateLowCharacter(surrogateLow) == NO) {
-			NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: 0x%X)", (unsigned int)nextInputCharacter];
-			[self emitParseError:reason];
+			NSString *details = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: 0x%X)", (unsigned int)nextInputCharacter];
+			[self emitParseError:@"surrogate-in-input-stream" details:details];
 			return nextInputCharacter;
 		}

@@ -99,9 +99,14 @@
 		nextInputCharacter = CFStringGetLongCharacterForSurrogatePair(nextInputCharacter, surrogateLow);
 	}

-	if (isControlOrUndefinedCharacter(nextInputCharacter)) {
-		NSString *reason = [NSString stringWithFormat:@"A control/undefined character found: (0x%X)", (unsigned int)nextInputCharacter];
-		[self emitParseError:reason];
+	if (isControlCharacter(nextInputCharacter)) {
+		NSString *details = [NSString stringWithFormat:@"A control character found: (0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"control-character-in-input-stream" details:details];
+	}
+
+	if (isNoncharacter(nextInputCharacter)) {
+		NSString *details = [NSString stringWithFormat:@"A noncharacter found: (0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"noncharacter-in-input-stream" details:details];
 	}

 	return nextInputCharacter;
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.6</string>
+	<string>2.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -589,7 +589,7 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin

 	CheckInvalidCombination(self, node, ValidationNodePreInsertion);

-	void (^ hierarchyError)() = ^{
+	void (^ hierarchyError)(void) = ^{
 		[NSException raise:HTMLKitHierarchyRequestError
 					format:@"%@: Hierarchy Request Error, inserting (%@) into (%@). The operation would yield an incorrect node tree.",
 		 ValidationNodePreInsertion, self, node];
@@ -639,7 +639,7 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin

 	CheckInvalidCombination(self, node, ValidationNodeReplacement);

-	void (^ hierarchyError)() = ^{
+	void (^ hierarchyError)(void) = ^{
 		[NSException raise:HTMLKitHierarchyRequestError
 					format:@"%@: Hierarchy Request Error. The operation would yield an incorrect node tree.",
 		 ValidationNodeReplacement];
@@ -10,29 +10,46 @@

@interface HTMLParseErrorToken ()
 {
-	NSString *_reason;
+	NSString *_code;
+	NSString *_details;
 	NSUInteger _location;
 }
@end

@implementation HTMLParseErrorToken
-@synthesize reason = _reason;
+@synthesize code = _code;
+@synthesize details = _details;
@synthesize location = _location;

- (instancetype)initWithReasonMessage:(NSString *)reason andStreamLocation:(NSUInteger)location
+- (instancetype)initWithCode:(NSString *)code details:(NSString *)details location:(NSUInteger)location
 {
 	self = [super init];
 	if (self) {
 		self.type = HTMLTokenTypeParseError;
-		_reason = [reason copy];
+		_code = [code copy];
+		_details = [details copy];
 		_location = location;
 	}
 	return self;
 }

+- (BOOL)isEqual:(id)other
+{
+	if ([other isKindOfClass:[self class]]) {
+		HTMLParseErrorToken *token = (HTMLParseErrorToken *)other;
+		return bothNilOrEqual(self.code, token.code);
+	}
+	return NO;
+}
+
+- (NSUInteger)hash
+{
+	return self.code.hash + self.code.hash;
+}
+
 - (NSString *)description
 {
-	return [NSString stringWithFormat:@"<%@: %p Reason='%@' Location='%lu'>", self.class, self, _reason, (unsigned long)_location];
+	return [NSString stringWithFormat:@"<%@: %p Code='%@' Details='%@' Location='%lu'>", self.class, self, _code, _details, (unsigned long)_location];
 }

@end
@@ -73,6 +73,10 @@

 		_tokenizer = [[HTMLTokenizer alloc] initWithString:string ?: @""];
 		_tokenizer.parser = self;
+		__weak HTMLParser *weakSelf = self;
+		_tokenizer.parseErrorCallback = ^(HTMLParseErrorToken *token) {
+			[weakSelf emitParseError:@"Tokenization error: %@", token.asParseError];
+		};

 		_pendingTableCharacterTokens = [[HTMLCharacterToken alloc] initWithString:@""];

@@ -130,6 +134,10 @@
 	[self initializeDocument];
 	_tokenizer = [[HTMLTokenizer alloc] initWithString:_tokenizer.string];
 	_tokenizer.parser = self;
+	__weak HTMLParser *weakSelf = self;
+	_tokenizer.parseErrorCallback = ^(HTMLParseErrorToken *token) {
+		[weakSelf emitParseError:@"Tokenization error: %@", token.asParseError];
+	};

 	_contextElement = contextElement;
 	_fragmentParsingAlgorithm = YES;
@@ -226,11 +234,6 @@
 		return NO;
 	};

-	if (token.isParseError) {
-		[self emitParseError:@"Tokenizer Parser Error: %@", token.asParseError];
-		return;
-	}
-
 	if (_ignoreNextLineFeedCharacterToken) {
 		_ignoreNextLineFeedCharacterToken = NO;
 		if (token.isCharacterToken) {
@@ -2530,7 +2533,7 @@
 			return;
 		case HTMLTokenTypeStartTag:
 		{
-			void (^ anythingElse)() = ^ {
+			void (^ anythingElse)(void) = ^ {
 				if (self.adjustedCurrentNode.htmlNamespace == HTMLNamespaceMathML) {
 					AdjustMathMLAttributes(token.asTagToken);
 				}
@@ -2545,7 +2548,7 @@
 				}
 			};

-			void (^ matchedCase)() = ^ {
+			void (^ matchedCase)(void) = ^ {
 				[self emitParseError:@"Unexpected start tag <%@> in foreign content", token.asTagToken.tagName];
 				if (_fragmentParsingAlgorithm) {
 					anythingElse();
@@ -74,12 +74,11 @@ NS_INLINE void CheckValidOffset(HTMLNode *node, NSUInteger offset, NSString *cmd
 		 @"plaintext", @"noscript", nil]) {
 		return self.data;
 	} else {
-		NSRange range = NSMakeRange(0, self.data.length);
 		NSMutableString *escaped = [self.data mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"<" withString:@"&lt;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@">" withString:@"&gt;" options:0 range:range];
+		[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;
 	}
 }
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 Initializes and returns a CSS has-descendant selector, e.g. 'div:has(p)'

- @discussion 'div:has(p)' matches all <div> elements which have a descendant <p> element.
+ @discussion 'div:has(p)' matches all &lt;div&gt; elements which have a descendant &lt;p&gt; element.

 @param selector The selector matching a descendant element.
 @return A new instance of the has-descendant selector.
@@ -76,7 +76,7 @@ extern NSString * _Nonnull NSStringFromNthExpression(CSSNthExpression expression
 @param string The selector string which will be parsed.
 @return A new instance of a parsed CSS Selector, `nil` if the string is not a valid selector string.
 */
-+ (nullable instancetype)selectorWithString:(NSString *)stirng;
+ (nullable instancetype)selectorWithString:(NSString *)string;

 /**
 Implementations should override this method to provide the selector-sprecific logic for matching elements.
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN

 @return The universal CSS selector.
 */
-extern CSSSelector * universalSelector();
+extern CSSSelector * universalSelector(void);

 /**
 CSS type selector, e.g. 'div', 'p', ...etc.
@@ -125,7 +125,7 @@ extern CSSSelector * nthLastOfTypeSelector(CSSNthExpression expression);

 @return Odd-Child selector.
 */
-extern CSSSelector * oddSelector();
+extern CSSSelector * oddSelector(void);

 /**
 CSS even-child selector: ':nth-child(even)'
@@ -134,49 +134,49 @@ extern CSSSelector * oddSelector();

 @return Even-Child selector.
 */
-extern CSSSelector * evenSlector();
+extern CSSSelector * evenSlector(void);

 /**
 CSS first-child selector: ':nth-child(1)'

 @return First-Child selector.
 */
-extern CSSSelector * firstChildSelector();
+extern CSSSelector * firstChildSelector(void);

 /**
 CSS first-child selector: ':nth-last-child(1)'

 @return First-Child selector.
 */
-extern CSSSelector * lastChildSelector();
+extern CSSSelector * lastChildSelector(void);

 /**
 CSS first-of-type selector: ':nth-first-of-type(1)'

 @return First-Of-Type selector.
 */
-extern CSSSelector * firstOfTypeSelector();
+extern CSSSelector * firstOfTypeSelector(void);

 /**
 CSS last-of-type selector: ':nth-last-of-type(1)'

 @return Last-Of-Type selector.
 */
-extern CSSSelector * lastOfTypeSelector();
+extern CSSSelector * lastOfTypeSelector(void);

 /**
 CSS only-child selector: ':first-child:last-child'

 @return Only-Child selector.
 */
-extern CSSSelector * onlyChildSelector();
+extern CSSSelector * onlyChildSelector(void);

 /**
 CSS only-of-type selector: ':first-of-type:last-of-type'

 @return Only-Of-Type selector.
 */
-extern CSSSelector * onlyOfTypeSelector();
+extern CSSSelector * onlyOfTypeSelector(void);

 #pragma mark - Combinators

@@ -225,7 +225,7 @@ extern CSSSelector * not(CSSSelector *selector);
 /**
 CSS has-descendant selector, e.g. 'div:has(p)'

- @discussion 'div:has(p)' matches all <div> elements which have a descendant <p> element.
+ @discussion 'div:has(p)' matches all &lt;div&gt; elements which have a descendant &lt;p&gt; element.

 @param selector The selector matching a descendant element.
 @return A has-descendant selector.
@@ -15,102 +15,102 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 @return Root element selector: ':root'
 */
-extern CSSSelector * rootSelector();
+extern CSSSelector * rootSelector(void);

 /**
 @return Empy element selector: ':empty'
 */
-extern CSSSelector * emptySelector();
+extern CSSSelector * emptySelector(void);

 /**
 @return A parent element selector: ':parent'
 */
-extern CSSSelector * parentSelector();
+extern CSSSelector * parentSelector(void);

 /**
 @return A button element selector: ':button'
 */
-extern CSSSelector * buttonSelector();
+extern CSSSelector * buttonSelector(void);

 /**
 @return A checkbox element selector: ':checkbox'
 */
-extern CSSSelector * checkboxSelector();
+extern CSSSelector * checkboxSelector(void);

 /**
 @return A file element selector: ':file'
 */
-extern CSSSelector * fileSelector();
+extern CSSSelector * fileSelector(void);

 /**
 @return A header element selector: ':header'
 */
-extern CSSSelector * headerSelector();
+extern CSSSelector * headerSelector(void);

 /**
 @return An image element selector: ':image'
 */
-extern CSSSelector * imageSelector();
+extern CSSSelector * imageSelector(void);

 /**
 @return A parent element selector: ':parent'
 */
-extern CSSSelector * inputSelector();
+extern CSSSelector * inputSelector(void);

 /**
 @return A link element selector: ':link'
 */
-extern CSSSelector * linkSelector();
+extern CSSSelector * linkSelector(void);

 /**
 @return A password element selector: ':password'
 */
-extern CSSSelector * passwordSelector();
+extern CSSSelector * passwordSelector(void);

 /**
 @return A radio element selector: ':radio'
 */
-extern CSSSelector * radioSelector();
+extern CSSSelector * radioSelector(void);

 /**
 @return A reset element selector: ':reset'
 */
-extern CSSSelector * resetSelector();
+extern CSSSelector * resetSelector(void);

 /**
 @return A submit element selector: ':submit'
 */
-extern CSSSelector * submitSelector();
+extern CSSSelector * submitSelector(void);

 /**
 @return A text element selector: ':text'
 */
-extern CSSSelector * textSelector();
+extern CSSSelector * textSelector(void);

 /**
 @return An enabled element selector: ':enabled'
 */
-extern CSSSelector * enabledSelector();
+extern CSSSelector * enabledSelector(void);

 /**
 @return A disabled element selector: ':disabled'
 */
-extern CSSSelector * disabledSelector();
+extern CSSSelector * disabledSelector(void);

 /**
 @return A checked element selector: ':checked'
 */
-extern CSSSelector * checkedSelector();
+extern CSSSelector * checkedSelector(void);

 /**
 @return An optional element selector: ':optional'
 */
-extern CSSSelector * optionalSelector();
+extern CSSSelector * optionalSelector(void);

 /**
 @return A required element selector: ':required'
 */
-extern CSSSelector * requiredSelector();
+extern CSSSelector * requiredSelector(void);

 /**
 Less-than selector, e.g. 'lt(2)'
@@ -24,7 +24,7 @@
 /**
 Initializes a new comment token.

- @param string The string with which to initialize the token.
+ @param data The string with which to initialize the token.
 @return A new instance of a comment token.
 */
 - (instancetype)initWithData:(NSString *)data;
@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 Initializes a new HTML element with the given tag name.
 
- @param tagname The tag name.
+ @param tagName The tag name.
 @return A new HTML element.
 */
 - (instancetype)initWithTagName:(NSString *)tagName;
@@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 Initializes a new HTML element with the given tag name and attributes.

- @param tagname The tag name.
+ @param tagName The tag name.
 @param attributes The attributes.
 @return A new HTML element.
 */
@@ -80,8 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 Initializes a new HTML element with the given tag name, namespace, and attributes.

- @param tagname The tag name.
- @param namespace The namespace.
+ @param tagName The tag name.
+ @param htmlNamespace The HTML namespace.
 @param attributes The attributes.
 @return A new HTML element.
 */
@@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
 Set the value of the attribute with the given name.

 @param value The value to set.
- @param name The attribute's name.
+ @param attribute The attribute's name.
 */
 - (void)setObject:(NSString *)value forKeyedSubscript:(NSString *)attribute;

@@ -15,9 +15,10 @@
 /** 
 Typedef for the error callback block.

- @param reason The string describing the reason of the reported error.
+ @param code The standarized error-code
+ @param details The string describing the reason of the reported error.
 */
-typedef void (^ HTMLStreamReaderErrorCallback)(NSString *reason);
+typedef void (^ HTMLStreamReaderErrorCallback)(NSString *code, NSString *details);

 /**
 * HTML Input Stream Reader processor conforming to the HTML standard
@@ -232,7 +232,7 @@ typedef NS_OPTIONS(unsigned short, HTMLDocumentPosition)
 /**
 Returns the index of the given child element in the set of child nodes.

- @param node The element.
+ @param element The element.
 @return The index of the given element in the children set.
 */
 - (NSUInteger)indexOfChildElement:(HTMLElement *)element;
@@ -248,7 +248,7 @@ typedef NS_OPTIONS(unsigned short, HTMLDocumentPosition)
 /**
 Prepends the given array of nodes to the set of child nodes.

- @param node The nodes to prepend.
+ @param nodes The nodes to prepend.
 */
 - (void)prependNodes:(NSArray<HTMLNode *> *)nodes;

@@ -18,19 +18,22 @@
 */
@interface HTMLParseErrorToken : HTMLToken

-/** @brief The error's reason message. */
-@property (nonatomic, copy) NSString *reason;
+/** @brief The parse error's code as specified at https://html.spec.whatwg.org/multipage/parsing.html#parse-errors. */
+@property (nonatomic, strong, readonly) NSString *code;
+
+/** @brief Additional detailed error information. */
+@property (nonatomic, strong, readonly) NSString *details;

 /** @brief The error's location in the stream. */
-@property (nonatomic, assign) NSUInteger location;
+@property (nonatomic, assign, readonly) NSUInteger location;

 /**
 Initializes a new Parse Error token.

- @param reason The error's reason message.
+ @param code The parse error's as specified at https://html.spec.whatwg.org/multipage/parsing.html#parse-errors.
 @param location The error's location in the stream.
 @return A new instance of a parse error token.
 */
- (instancetype)initWithReasonMessage:(NSString *)reason andStreamLocation:(NSUInteger)location;
+- (instancetype)initWithCode:(NSString *)code details:(NSString *)details location:(NSUInteger)location;

@end
@@ -113,16 +113,16 @@ typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
 /**
 Sets the start boundary.

- @param startNode The new node of the start boundary.
- @param startOffset The new offset of the start boundary.
+ @param node The new node of the start boundary.
+ @param offset The new offset of the start boundary.
 */
 - (void)setStartNode:(HTMLNode *)node startOffset:(NSUInteger)offset;

 /**
 Sets the end boundary.

- @param startNode The new node of the end boundary.
- @param startOffset The new offset of the end boundary.
+ @param node The new node of the end boundary.
+ @param offset The new offset of the end boundary.
 */
 - (void)setEndNode:(HTMLNode *)node endOffset:(NSUInteger)offset;

@@ -79,7 +79,7 @@
 /**
 Checks whether an element with the given tag name is in the stack.

- @param tagname The element's tag name.
+ @param tagName The element's tag name.
 @return `YES` if such an element is in the stack, `NO` otherwise.
 */
 - (BOOL)containsElementWithTagName:(NSString *)tagName;
@@ -16,6 +16,13 @@

@class HTMLParser;

+/**
+ Typedef for the parse error callback block.
+
+ @param token The parse error token.
+ */
+typedef void (^ HTMLTokenizerParseErrorCallback)(HTMLParseErrorToken *token);
+
 /**
 * HTML Tokenizer
 * https://html.spec.whatwg.org/multipage/syntax.html#tokenization
@@ -39,6 +46,13 @@
 */
@property (nonatomic, weak) HTMLParser *parser;

+/**
+ An error callback block, which gets called when encountering parse errors while tokenizing the stream
+ 
+ Parse error tokens are dropped if the callback is `nil`.
+ */
+@property (nonatomic, copy) HTMLTokenizerParseErrorCallback parseErrorCallback;
+
 /**
 Initializes a new Tokenizer with the given string.

@@ -23,11 +23,16 @@
 	CHAR( DIGIT_NINE, 0x0039 ) \
 	CHAR( LATIN_CAPITAL_LETTER_A, 0x0041 ) \
 	CHAR( LATIN_CAPITAL_LETTER_F, 0x0046 ) \
+	CHAR( LATIN_CAPITAL_LETTER_P, 0x0050 ) \
+	CHAR( LATIN_CAPITAL_LETTER_S, 0x0053 ) \
 	CHAR( LATIN_CAPITAL_LETTER_X, 0x0058 ) \
 	CHAR( LATIN_CAPITAL_LETTER_Z, 0x005A ) \
+	CHAR( RIGHT_SQUARE_BRACKET, 0x005D ) \
 	CHAR( GRAVE_ACCENT, 0x0060 ) \
 	CHAR( LATIN_SMALL_LETTER_A, 0x0061 ) \
 	CHAR( LATIN_SMALL_LETTER_F, 0x0066 ) \
+	CHAR( LATIN_SMALL_LETTER_P, 0x0070 ) \
+	CHAR( LATIN_SMALL_LETTER_S, 0x0073 ) \
 	CHAR( LATIN_SMALL_LETTER_X, 0x0078 ) \
 	CHAR( LATIN_SMALL_LETTER_Z, 0x007A ) \
 	CHAR( HYPHEN_MINUS, 0x002D ) \
@@ -82,13 +87,17 @@ NUMERIC_REPLACEMENT_CHARACTERS
 #undef CHAR
 };

-NS_INLINE BOOL isControlOrUndefinedCharacter(UTF32Char character)
+NS_INLINE BOOL isControlCharacter(unsigned long long character)
 {
 	return ((character >= 0x0001 && character <= 0x0008) ||
-			(character >= 0x000D && character <= 0x001F) ||
-			(character >= 0x007F && character <= 0x009F) ||
-			(character >= 0xFDD0 && character <= 0xFDEF) ||
 			character == 0x000B ||
+			(character >= 0x000E && character <= 0x001F) ||
+			(character >= 0x007F && character <= 0x009F));
+}
+
+NS_INLINE BOOL isNoncharacter(unsigned long long character)
+{
+	return ((character >= 0xFDD0 && character <= 0xFDEF) ||
 			character == 0xFFFE ||
 			character == 0xFFFF ||
 			character == 0x1FFFE ||
@@ -137,6 +146,18 @@ NS_INLINE BOOL isHexDigit(UTF32Char character)
 			(character >= LATIN_SMALL_LETTER_A && character <= LATIN_SMALL_LETTER_F));
 }

+NS_INLINE BOOL isUpperHexDigit(UTF32Char character)
+{
+	return ((character >= LATIN_CAPITAL_LETTER_A && character <= LATIN_CAPITAL_LETTER_F) ||
+			(character >= DIGIT_ZERO && character <= DIGIT_NINE));
+}
+
+NS_INLINE BOOL isLowerHexDigit(UTF32Char character)
+{
+	return ((character >= LATIN_SMALL_LETTER_A && character <= LATIN_SMALL_LETTER_F) ||
+			(character >= DIGIT_ZERO && character <= DIGIT_NINE));
+}
+
 NS_INLINE BOOL isAlphanumeric(UTF32Char character)
 {
 	return ((character >= DIGIT_ZERO && character <= DIGIT_NINE) ||
@@ -151,17 +172,14 @@ NS_INLINE BOOL isStringAlphanumeric(NSString *string)
 	return ([string rangeOfCharacterFromSet:set].location == NSNotFound);
 }

-NS_INLINE BOOL isInvalidNumericRange(unsigned long long numeric)
+NS_INLINE BOOL isSurrogate(unsigned long long character)
 {
-	return ((numeric >= 0xD800 && numeric <= 0xDFFF) ||
-			numeric > 0x10FFFF);
+	return (character >= 0xD800 && character <= 0xDFFF);
 }

 NS_INLINE unichar NumericReplacementCharacter(UTF32Char character)
 {
-	if (character == NULL_CHAR) {
-		return REPLACEMENT_CHAR;
-	} else if (character >= 0x0080 && character <= 0x009F) {
+	if (character >= 0x0080 && character <= 0x009F) {
 		return NumericReplacementTable[character - 0x0080];
 	} else {
 		return NULL_CHAR;
@@ -12,9 +12,7 @@

 #define TOKENIZER_STATES \
 	STATE_ENTRY( HTMLTokenizerStateData, = 0) \
-	STATE_ENTRY( HTMLTokenizerStateCharacterReferenceInData, ) \
 	STATE_ENTRY( HTMLTokenizerStateRCDATA, ) \
-	STATE_ENTRY( HTMLTokenizerStateCharacterReferenceInRCDATA, ) \
 	STATE_ENTRY( HTMLTokenizerStateRAWTEXT, ) \
 	STATE_ENTRY( HTMLTokenizerStateScriptData, ) \
 	STATE_ENTRY( HTMLTokenizerStatePLAINTEXT, ) \
@@ -59,6 +57,10 @@
 	STATE_ENTRY( HTMLTokenizerStateCommentStart, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentStartDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateComment, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSign, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBang, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBangDash, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBangDashDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEndDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEnd, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEndBang, ) \
@@ -78,7 +80,18 @@
 	STATE_ENTRY( HTMLTokenizerStateDOCTYPESystemIdentifierSingleQuoted, ) \
 	STATE_ENTRY( HTMLTokenizerStateAfterDOCTYPESystemIdentifier, ) \
 	STATE_ENTRY( HTMLTokenizerStateBogusDOCTYPE, ) \
-	STATE_ENTRY( HTMLTokenizerStateCDATASection, )
+	STATE_ENTRY( HTMLTokenizerStateCDATASection, ) \
+	STATE_ENTRY( HTMLTokenizerStateCDATASectionBracket, ) \
+	STATE_ENTRY( HTMLTokenizerStateCDATASectionEnd, ) \
+	STATE_ENTRY( HTMLTokenizerStateCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateNamedCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateAmbiguousAmpersand, ) \
+	STATE_ENTRY( HTMLTokenizerStateNumericCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateHexadecimalCharacterReferenceStart, ) \
+	STATE_ENTRY( HTMLTokenizerStateDecimalCharacterReferenceStart, ) \
+	STATE_ENTRY( HTMLTokenizerStateHexadecimalCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateDecimalCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateNumericCharacterReferenceEnd, )

 typedef NS_ENUM(NSUInteger, HTMLTokenizerState)
 {
@@ -49,7 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
 Initializes a new tree walker with no filter and HTMLNodeFilterShowAll show options.

 @param node The root node.
- @param filter The node filter to use.
 @return A new instance of a tree walker.
 */
 - (instancetype)initWithNode:(HTMLNode *)node;
@@ -14,9 +14,9 @@
@property (nonatomic, copy) NSString *title;
@property (nonatomic, copy) NSString *input;
@property (nonatomic, strong) NSArray *output;
+@property (nonatomic, strong) NSArray *errors;
@property (nonatomic, strong) NSArray *initialStates;
@property (nonatomic, copy) NSString *lastStartTag;
-@property (nonatomic, assign) BOOL ignoreErrorOrder;

 + (NSDictionary *)loadHTML5LibTokenizerTests;

@@ -70,16 +70,16 @@ static NSString * const Tokenizer = @"tokenizer";
 {
 	BOOL doubleEscaped = [test[@"doubleEscaped"] boolValue];

-		// Test Title
+	// Test Title
 	self.title = test[@"description"];

-		// Test Input
+	// Test Input
 	self.input = test[@"input"];
 	if (doubleEscaped) {
 		self.input = [self processDoubleEscaped:self.input];
 	}

-		// Test Output
+	// Test Output
 	NSMutableArray *tokens = [NSMutableArray array];
 	NSArray *outputs = test[@"output"];
 	for (NSArray *output in outputs) {
@@ -89,7 +89,7 @@ static NSString * const Tokenizer = @"tokenizer";
 	[tokens addObject:[HTMLEOFToken token]];
 	self.output = tokens;

-		// Test Initial States
+	// Test Initial States
 	NSMutableArray *initialStates = [NSMutableArray array];

 	NSArray *states = test[@"initialStates"];
@@ -101,6 +101,10 @@ static NSString * const Tokenizer = @"tokenizer";
 			state = HTMLTokenizerStateRCDATA;
 		} else if ([name isEqualToString:@"RAWTEXT state"]) {
 			state = HTMLTokenizerStateRAWTEXT;
+		} else if ([name isEqualToString:@"Script data state"]) {
+			state = HTMLTokenizerStateScriptData;
+		} else if ([name isEqualToString:@"CDATA section state"]) {
+			state = HTMLTokenizerStateCDATASection;
 		}
 		[initialStates addObject:@(state)];
 	}
@@ -110,19 +114,21 @@ static NSString * const Tokenizer = @"tokenizer";

 	self.initialStates = initialStates;

-		// Test Last Start Tag
+	// Test Last Start Tag
 	self.lastStartTag = test[@"lastStartTag"];

-		// Ignore Error Order
-	self.ignoreErrorOrder = [test[@"ignoreErrorOrder"] boolValue];
+	// Test errors
+	NSArray *errors = test[@"errors"];
+	NSMutableArray *errorTokens = [NSMutableArray new];
+	for (NSDictionary *error in errors) {
+		HTMLParseErrorToken *token = [[HTMLParseErrorToken alloc] initWithCode:error[@"code"] details:nil location:0];
+		[errorTokens addObject:token];
+	}
+	self.errors = errorTokens;
 }

 - (HTMLToken *)processOutputToken:(id)output doubleEscaped:(BOOL)doubleEscaped
 {
-	if ([output isKindOfClass:[NSString class]] && [output isEqualToString:@"ParseError"]) {
-		return [HTMLParseErrorToken new];
-	}
-
 	NSString *type = [output firstObject];

 	NSString *data = nil;
@@ -146,8 +152,6 @@ static NSString * const Tokenizer = @"tokenizer";
 		return token;
 	} else if ([type isEqualToString:@"EndTag"]) {
 		return [[HTMLEndTagToken alloc] initWithTagName:data];
-	} else if ([type isEqualToString:@"ParseError"]) {
-		return [HTMLParseErrorToken new];
 	} else if ([type isEqualToString:@"StartTag"]) {
 		HTMLStartTagToken *token = [[HTMLStartTagToken alloc] initWithTagName:data];
 		NSDictionary *attributes = output[2];
@@ -46,7 +46,7 @@ static NSString * const TreeConstruction = @"tree-construction";
 	NSMutableArray *tests = [NSMutableArray array];

 	NSScanner *scanner = [NSScanner scannerWithString:contents];
-	NSString * (^ nextTest)() = ^ NSString * () {
+	NSString * (^ nextTest)(void) = ^ NSString * () {
 		NSString *str;
 		[scanner scanUpToString:@"\n\n#data" intoString:&str];
 		return str;
@@ -81,20 +81,31 @@

 		for (NSNumber *state in test.initialStates) {
 			HTMLTokenizer *tokenizer = [[HTMLTokenizer alloc] initWithString:test.input];
-			[tokenizer setValue:test.lastStartTag forKey:@"_lastStartTagName"];

+			[tokenizer setValue:test.lastStartTag forKey:@"_lastStartTagName"];
 			tokenizer.state = [state integerValue];

-			NSArray *expectedTokens = test.output;
-			NSArray *tokens = tokenizer.allObjects;
+			NSArray *expectedErrors = test.errors;
+			NSMutableArray *actualErrors = [NSMutableArray new];
+			tokenizer.parseErrorCallback = ^(HTMLParseErrorToken *token) {
+				[actualErrors addObject:token];
+			};

-			NSString *message = [NSString stringWithFormat:@"HTML5Lib test in file: \'%@\' Title: '%@'\nInput: '%@'\nExpected:\n%@\nActual:\n%@\n",
+			NSArray *expectedTokens = test.output;
+			NSArray *actualTokens = tokenizer.allObjects;
+
+			NSString *message = [NSString stringWithFormat:@"\nTest file: \'%@\'\nTitle: '%@'\nInput: '%@'\n",
 								 test.testFile,
 								 test.title,
-								 test.input,
-								 expectedTokens,
-								 tokens];
-			XCTAssertEqualObjects(tokens, expectedTokens, @"%@", message);
+								 test.input];
+			XCTAssertEqualObjects(actualTokens, expectedTokens, @"%@", message);
+
+
+			message = [NSString stringWithFormat:@"\nTest file: \'%@\'\nTitle: '%@'\nInput: '%@'\n",
+								 test.testFile,
+								 test.title,
+								 test.input];
+			XCTAssertEqualObjects(actualErrors, expectedErrors, @"%@", message);
 		}
 	}
 }
@@ -157,7 +157,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLDocument *document = [HTMLDocument new];
 	HTMLDocumentFragment *fragment = [[HTMLDocumentFragment alloc] initWithDocument:document];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[fragment removeAllChildNodes];
 		[document removeAllChildNodes];
 	};
@@ -213,7 +213,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLDocument *document = [HTMLDocument new];
 	HTMLElement *element = [HTMLElement new];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[element removeAllChildNodes];
 		[document removeAllChildNodes];
 	};
@@ -247,7 +247,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLDocument *document = [HTMLDocument new];
 	HTMLDocumentType *doctype = [HTMLDocumentType new];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[document removeAllChildNodes];
 	};

@@ -280,7 +280,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLComment *child = [HTMLComment new];
 	HTMLDocumentFragment *replacement = [[HTMLDocumentFragment alloc] initWithDocument:document];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[replacement removeAllChildNodes];
 		[document removeAllChildNodes];
 		[document appendNode:child];
@@ -326,7 +326,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLComment *child = [HTMLComment new];
 	HTMLElement *replacement = [HTMLElement new];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[replacement removeAllChildNodes];
 		[document removeAllChildNodes];
 		[document appendNode:child];
@@ -353,7 +353,7 @@ extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
 	HTMLComment *child = [HTMLComment new];
 	HTMLDocumentType *replacement = [HTMLDocumentType new];

-	void (^ reset)() = ^ {
+	void (^ reset)(void) = ^ {
 		[replacement removeAllChildNodes];
 		[document removeAllChildNodes];
 		[document appendNode:child];
@@ -0,0 +1,44 @@
+//
+//  HTMLSerializationTests.m
+//  HTMLKit
+//
+//  Created by Iska on 06.11.17.
+//  Copyright © 2017 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "HTMLDOM.h"
+
+@interface HTMLSerializationTests : XCTestCase
+
+@end
+
+@implementation HTMLSerializationTests
+
+- (void)setUp {
+    [super setUp];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_16
+{
+	NSString *html = @"<body><div>&lt;test&gt;</div></body>";
+	HTMLDocument *document = [HTMLDocument documentWithString:html];
+
+	XCTAssertEqualObjects(document.body.outerHTML, html);
+}
+
+- (void)testBugFix_Issue_17
+{
+	NSString *html = @"<body key='& testing 0x00A0'></body>";
+	HTMLDocument *document = [HTMLDocument documentWithString:html];
+
+	XCTAssertEqualObjects(document.body.outerHTML, @"<body key=\"&amp; testing &nbsp;\"></body>");
+}
+
+@end
Author	SHA1	Message	Date
iska	682b19c242	Merge branch 'release/2.1.2'	2017-11-06 22:05:07 +01:00
iska	16ed846e65	Bump HTMLKit version to 2.1.2	2017-11-06 22:04:57 +01:00
iska	820b3ef091	Update podspec for 2.1.2	2017-11-06 22:04:38 +01:00
iska	fb7ea25b1f	Update jazzy.yaml for 2.1.2	2017-11-06 22:04:29 +01:00
iska	5302c16600	Add Changelog entry for HTMLKit 2.1.2	2017-11-06 22:04:18 +01:00
iska	2dfdeb22ca	Fix HTMLElement attribute value serialization Fixes #17	2017-11-06 21:58:08 +01:00
iska	135715b606	Fix HTMLText serialization Fixes #16	2017-11-06 21:55:41 +01:00
iska	f8e6a39171	Merge branch 'hotfix/2.1.1' into develop	2017-10-13 23:05:31 +02:00
iska	20cf2dc4d0	Merge branch 'hotfix/2.1.1'	2017-10-13 23:05:02 +02:00
iska	0921ebad8a	Bump HTMLKit version to 2.1.1	2017-10-13 23:04:33 +02:00
iska	c63e2cb8fd	Update podspec for 2.1.1	2017-10-13 23:03:49 +02:00
iska	3deeb0138f	Update jazzy.yaml for 2.1.1	2017-10-13 23:03:38 +02:00
iska	b358a08f30	Add Changelog entry for HTMLKit 2.1.1	2017-10-13 23:03:19 +02:00
iska	84960e71ee	Enable warnings for missing function prototypes and fix present error	2017-10-13 22:54:30 +02:00
iska	7b028a2819	Enable warnings for documentation comments and fix present errors	2017-10-13 22:48:16 +02:00
iska	5aa77eac9b	Merge branch 'release/2.1.0' into develop	2017-10-12 22:44:50 +02:00
iska	c1cd1c0831	Merge branch 'release/2.1.0'	2017-10-12 22:44:49 +02:00
iska	1101556cfe	Bump HTMLKit version to 2.1.0	2017-10-12 22:44:39 +02:00
iska	839a724432	Update podspec for 2.1.0	2017-10-12 22:44:39 +02:00
iska	300705cb63	Update jazzy.yaml for 2.1.0	2017-10-12 22:44:39 +02:00
iska	1963c010f9	Add Changelog entry for HTMLKit 2.1.0	2017-10-12 22:44:39 +02:00
iska	89ef6bc101	Update README for master branch	2017-10-12 22:44:39 +02:00
iska	9069923e82	Update handling for ParseErrorTokens in the HTML Parser	2017-10-12 22:25:46 +02:00
iska	c16c647394	Add codecove.yml and update badges in README	2017-09-28 00:00:23 +02:00
iska	27b8eaac67	Add codecov after-script to upload coverage reports	2017-09-27 18:58:22 +02:00
iska	956c46ec45	Fix travis destinations for iOS 9.3 and 10.3	2017-09-27 00:11:56 +02:00
iska	cb7e5d519d	Update travis.yml for Xcode 9 and iOS 11	2017-09-26 22:38:09 +02:00
iska	4e1959bd81	Fix strict-prototypes blocks declarations throughout codebase	2017-09-23 02:31:48 +02:00
iska	f0d9817c68	Restore default modulemap file name Closes #13	2017-09-23 02:27:35 +02:00
iska	fee2d14ffc	Update project for Xcode 9	2017-09-23 02:26:46 +02:00
iska	4291840a53	Update .travis.yml	2017-09-10 15:56:36 +02:00
iska	4b7c260738	Update HTML Spec fixture to source as of 2017.09.09	2017-09-10 02:26:39 +02:00
iska	4a41b89ecf	Update tokenizer implementation as per spec as of 2017.09.09 - Use new initial states in tests according to: https://github.com/html5lib/html5lib-tests/pull/101 - Implement tokenization errors introduced in: https://github.com/whatwg/html/pull/2701 https://github.com/html5lib/html5lib-tests/pull/92	2017-09-10 02:23:31 +02:00
iska	d4ff2e3869	Add error-code property for ParseError token In addition to the detailed reason message parse errors have an error-code property that is specified in the WHATWG HTML spec.	2017-09-07 22:08:28 +02:00
iska	6dee6c1e74	Update input stream reader error handling Use newly specified parse errors: https://html.spec.whatwg.org/multipage/parsing.html#parse-errors	2017-09-07 22:05:02 +02:00
iska	20ebd8c603	Update html5lib-tests to latest commit as of 2017.09.06	2017-09-06 22:14:34 +02:00
iska	c002299247	Merge branch 'release/2.0.6' into develop	2017-05-02 15:49:16 +02:00