memecode
diff --git a/‎CMakeLists.txt
Copy file name to clipboardExpand all lines: CMakeLists.txt
+1Lines changed: 1 addition & 0 deletions b/‎CMakeLists.txt
Copy file name to clipboardExpand all lines: CMakeLists.txt
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎containers/test/Bitmap.cpp
Copy file name to clipboardExpand all lines: containers/test/Bitmap.cpp
+5-5Lines changed: 5 additions & 5 deletions b/‎containers/test/Bitmap.cpp
Copy file name to clipboardExpand all lines: containers/test/Bitmap.cpp
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎doc/document_createFromString.txt
Copy file name to clipboardExpand all lines: doc/document_createFromString.txt
+5-2Lines changed: 5 additions & 2 deletions b/‎doc/document_createFromString.txt
Copy file name to clipboardExpand all lines: doc/document_createFromString.txt
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎include/litehtml/html.h
Copy file name to clipboardExpand all lines: include/litehtml/html.h
+7-2Lines changed: 7 additions & 2 deletions b/‎include/litehtml/html.h
Copy file name to clipboardExpand all lines: include/litehtml/html.h
+7-2Lines changed: 7 additions & 2 deletions
diff --git a/‎include/litehtml/types.h
Copy file name to clipboardExpand all lines: include/litehtml/types.h
+5-5Lines changed: 5 additions & 5 deletions b/‎include/litehtml/types.h
Copy file name to clipboardExpand all lines: include/litehtml/types.h
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/document_container.cpp
Copy file name to clipboardExpand all lines: src/document_container.cpp
+3-3Lines changed: 3 additions & 3 deletions b/‎src/document_container.cpp
Copy file name to clipboardExpand all lines: src/document_container.cpp
+3-3Lines changed: 3 additions & 3 deletions
@@ -146,6 +146,7 @@ set(HEADER_LITEHTML
 )
 
 set(TEST_LITEHTML
+    test/encodings_test.cpp
     test/cssTest.cpp
     test/mediaQueryTest.cpp
     test/codepoint_test.cpp
 
@@ -36,12 +36,12 @@ void Bitmap::draw_line(int x0, int y0, int x1, int y1, web_color color)
 	}
 }
 
-void Bitmap::draw_rect(int x, int y, int width, int height, web_color color)
+void Bitmap::draw_rect(int x, int y, int _width, int _height, web_color color)
 {
-	draw_line(x, y,              x + width, y,              color); // top
-	draw_line(x, y + height - 1, x + width, y + height - 1, color); // bottom
-	draw_line(x,             y, x,             y + height, color); // left
-	draw_line(x + width - 1, y, x + width - 1, y + height, color); // right
+	draw_line(x, y,               x + _width, y,               color); // top
+	draw_line(x, y + _height - 1, x + _width, y + _height - 1, color); // bottom
+	draw_line(x,              y, x,              y + _height, color); // left
+	draw_line(x + _width - 1, y, x + _width - 1, y + _height, color); // right
 }
 
 void Bitmap::fill_rect(position rect, web_color color)
 
@@ -54,8 +54,11 @@ by current user locale or smth else. Any such encoding should be passed with con
 The precedence of these guesses is specified in the encoding sniffing algorithm, see litehtml::encoding_sniffing_algorithm
 and https://html.spec.whatwg.org/multipage/parsing.html#encoding-sniffing-algorithm
 
-litehtml implements only the first and the last step of this algorithm:
-it sets encoding to BOM encoding if BOM is present and it tentatively sets encoding to UTF-8 if encoding is unknown.
+litehtml implements only the 3 steps of this algorithm:
+1. set encoding to BOM encoding if BOM is present
+5. prescan the input to determine its encoding - this only called if no BOM found and user didn't specify encoding or specified tentative encoding
+9. return an implementation-defined default character encoding (UTF-8) - this only called if there is no BOM, user didn't specify an encoding and
+   prescan failed.
 
 If your program is displaying html files from the web it is recommended to detect HTTP encoding, because
 it is not very unusual for web pages to have encoding specified only in HTTP header or meta encoding be different
 
@@ -40,7 +40,7 @@ namespace litehtml
 	bool is_number(const string& string, const bool allow_dot = 1);
 
 	// https://infra.spec.whatwg.org/#ascii-whitespace
-	inline bool is_whitespace(char c)
+	inline bool is_whitespace(int c)
 	{
 		return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f';
 	}
@@ -59,7 +59,12 @@ namespace litehtml
 	{
 		return (c >= 'A' && c <= 'Z' ? c + 'a' - 'A' : c);
 	}
-	
+	// https://infra.spec.whatwg.org/#ascii-lowercase
+	inline int lowcase(int c)
+	{
+		return t_tolower(c);
+	}
+
 	inline int round_f(float val)
 	{
 		int int_val = (int) val;
 
@@ -108,10 +108,10 @@ namespace litehtml
 			height	= sz.height;
 		}
 
-		void move_to(int x, int y)
+		void move_to(int _x, int _y)
 		{
-			this->x = x;
-			this->y = y;
+			x = _x;
+			y = _y;
 		}
 
 		bool does_intersect(const position* val) const
@@ -139,9 +139,9 @@ namespace litehtml
 			return false;
 		}
 
-		bool is_point_inside(int x, int y) const
+		bool is_point_inside(int _x, int _y) const
 		{
-			if(x >= left() && x <= right() && y >= top() && y <= bottom())
+			if(_x >= left() && _x <= right() && _y >= top() && _y <= bottom())
 			{
 				return true;
 			}
 
@@ -16,7 +16,7 @@ void litehtml::document_container::split_text(const char* text, const std::funct
 				on_word(wchar_to_utf8(str.c_str()));
 				str.clear();
 			}
-			str += c;
+			str += (wchar_t)c;
 			on_space(wchar_to_utf8(str.c_str()));
 			str.clear();
 		}
@@ -28,13 +28,13 @@ void litehtml::document_container::split_text(const char* text, const std::funct
 				on_word(wchar_to_utf8(str.c_str()));
 				str.clear();
 			}
-			str += c;
+			str += (wchar_t)c;
 			on_word(wchar_to_utf8(str.c_str()));
 			str.clear();
 		}
 		else
 		{
-			str += c;
+			str += (wchar_t)c;
 		}
 	}
 	if (!str.empty())
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ set(HEADER_LITEHTML`
`146`	`146`	`)`
`147`	`147`
`148`	`148`	`set(TEST_LITEHTML`
	`149`	`+ test/encodings_test.cpp`
`149`	`150`	`test/cssTest.cpp`
`150`	`151`	`test/mediaQueryTest.cpp`
`151`	`152`	`test/codepoint_test.cpp`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ void Bitmap::draw_line(int x0, int y0, int x1, int y1, web_color color)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-void Bitmap::draw_rect(int x, int y, int width, int height, web_color color)`
	`39`	`+void Bitmap::draw_rect(int x, int y, int _width, int _height, web_color color)`
`40`	`40`	`{`
`41`		`- draw_line(x, y, x + width, y, color); // top`
`42`		`- draw_line(x, y + height - 1, x + width, y + height - 1, color); // bottom`
`43`		`- draw_line(x, y, x, y + height, color); // left`
`44`		`- draw_line(x + width - 1, y, x + width - 1, y + height, color); // right`
	`41`	`+ draw_line(x, y, x + _width, y, color); // top`
	`42`	`+ draw_line(x, y + _height - 1, x + _width, y + _height - 1, color); // bottom`
	`43`	`+ draw_line(x, y, x, y + _height, color); // left`
	`44`	`+ draw_line(x + _width - 1, y, x + _width - 1, y + _height, color); // right`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void Bitmap::fill_rect(position rect, web_color color)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace litehtml`
`40`	`40`	`bool is_number(const string& string, const bool allow_dot = 1);`
`41`	`41`
`42`	`42`	`// https://infra.spec.whatwg.org/#ascii-whitespace`
`43`		`- inline bool is_whitespace(char c)`
	`43`	`+ inline bool is_whitespace(int c)`
`44`	`44`	`{`
`45`	`45`	`return c == ' ' \|\| c == '\t' \|\| c == '\n' \|\| c == '\r' \|\| c == '\f';`
`46`	`46`	`}`
`@@ -59,7 +59,12 @@ namespace litehtml`
`59`	`59`	`{`
`60`	`60`	`return (c >= 'A' && c <= 'Z' ? c + 'a' - 'A' : c);`
`61`	`61`	`}`
`62`		`-`
	`62`	`+ // https://infra.spec.whatwg.org/#ascii-lowercase`
	`63`	`+ inline int lowcase(int c)`
	`64`	`+ {`
	`65`	`+ return t_tolower(c);`
	`66`	`+ }`
	`67`	`+`
`63`	`68`	`inline int round_f(float val)`
`64`	`69`	`{`
`65`	`70`	`int int_val = (int) val;`
Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,10 @@ namespace litehtml`
`108`	`108`	`height = sz.height;`
`109`	`109`	`}`
`110`	`110`
`111`		`- void move_to(int x, int y)`
	`111`	`+ void move_to(int _x, int _y)`
`112`	`112`	`{`
`113`		`- this->x = x;`
`114`		`- this->y = y;`
	`113`	`+ x = _x;`
	`114`	`+ y = _y;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`bool does_intersect(const position* val) const`
`@@ -139,9 +139,9 @@ namespace litehtml`
`139`	`139`	`return false;`
`140`	`140`	`}`
`141`	`141`
`142`		`- bool is_point_inside(int x, int y) const`
	`142`	`+ bool is_point_inside(int _x, int _y) const`
`143`	`143`	`{`
`144`		`- if(x >= left() && x <= right() && y >= top() && y <= bottom())`
	`144`	`+ if(_x >= left() && _x <= right() && _y >= top() && _y <= bottom())`
`145`	`145`	`{`
`146`	`146`	`return true;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ void litehtml::document_container::split_text(const char* text, const std::funct`
`16`	`16`	`on_word(wchar_to_utf8(str.c_str()));`
`17`	`17`	`str.clear();`
`18`	`18`	`}`
`19`		`- str += c;`
	`19`	`+ str += (wchar_t)c;`
`20`	`20`	`on_space(wchar_to_utf8(str.c_str()));`
`21`	`21`	`str.clear();`
`22`	`22`	`}`
`@@ -28,13 +28,13 @@ void litehtml::document_container::split_text(const char* text, const std::funct`
`28`	`28`	`on_word(wchar_to_utf8(str.c_str()));`
`29`	`29`	`str.clear();`
`30`	`30`	`}`
`31`		`- str += c;`
	`31`	`+ str += (wchar_t)c;`
`32`	`32`	`on_word(wchar_to_utf8(str.c_str()));`
`33`	`33`	`str.clear();`
`34`	`34`	`}`
`35`	`35`	`else`
`36`	`36`	`{`
`37`		`- str += c;`
	`37`	`+ str += (wchar_t)c;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`if (!str.empty())`