From 677acce81efa63d6523954c31e6997ec858cedbf Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Tue, 4 Sep 2018 15:43:08 -0400
Subject: [PATCH] fix #168 patch by WebFreak001

---
 dom.d | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dom.d b/dom.d
index 0253b66..298946a 100644
--- a/dom.d
+++ b/dom.d
@@ -408,7 +408,7 @@ class Document : FileResource {
 
 		bool eatWhitespace() {
 			bool ateAny = false;
-			while(pos < data.length && (data[pos] == ' ' || data[pos] == '\n' || data[pos] == '\t' || data[pos] == '\r')) {
+			while(pos < data.length && data[pos].isSimpleWhite) {
 				pos++;
 				ateAny = true;
 			}
@@ -419,8 +419,7 @@ class Document : FileResource {
 			// remember to include : for namespaces
 			// basically just keep going until >, /, or whitespace
 			auto start = pos;
-			while(  data[pos] != '>' && data[pos] != '/' &&
-				data[pos] != ' ' && data[pos] != '\n' && data[pos] != '\t' && data[pos] != '\r')
+			while(data[pos] != '>' && data[pos] != '/' && !data[pos].isSimpleWhite)
 			{
 				pos++;
 				if(pos == data.length) {
@@ -441,8 +440,7 @@ class Document : FileResource {
 			// remember to include : for namespaces
 			// basically just keep going until >, /, or whitespace
 			auto start = pos;
-			while(  data[pos] != '>' && data[pos] != '/'  && data[pos] != '=' &&
-				data[pos] != ' ' && data[pos] != '\n' && data[pos] != '\t' && data[pos] != '\r')
+			while(data[pos] != '>' && data[pos] != '/'  && data[pos] != '=' && !data[pos].isSimpleWhite)
 			{
 				if(data[pos] == '<') {
 					if(strict)
@@ -489,15 +487,15 @@ class Document : FileResource {
 				default:
 					if(strict)
 						parseError("Attributes must be quoted");
-					// read until whitespace or terminator (/ or >)
+					// read until whitespace or terminator (/> or >)
 					auto start = pos;
 					while(
 						pos < data.length &&
 						data[pos] != '>' &&
 						// unquoted attributes might be urls, so gotta be careful with them and self-closed elements
 						!(data[pos] == '/' && pos + 1 < data.length && data[pos+1] == '>') &&
-						data[pos] != ' ' && data[pos] != '\n' && data[pos] != '\t')
-					      	pos++;
+						!data[pos].isSimpleWhite)
+							pos++;
 
 					string v = htmlEntitiesDecode(data[start..pos], strict);
 					// don't skip the end - we'll need it later
@@ -4371,7 +4369,7 @@ class TextNode : Element {
 			string n = "";
 			bool lastWasWhitespace = indentationLevel > 0;
 			foreach(char c; contents) {
-				if(c == ' ' || c == '\n' || c == '\r' || c == '\t') {
+				if(c.isSimpleWhite) {
 					if(!lastWasWhitespace)
 						n ~= ' ';
 					lastWasWhitespace = true;
@@ -7092,6 +7090,10 @@ bool allAreInlineHtml(const(Element)[] children) {
 	return true;
 }
 
+private bool isSimpleWhite(dchar c) {
+	return c == ' ' || c == '\r' || c == '\n' || c == '\t';
+}
+
 /*
 Copyright: Adam D. Ruppe, 2010 - 2017
 License:   <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.