fix font size on wikipedia

stasoid · stasoid · commit 55071070f663 · 2022-03-26T20:47:26.000+06:00
page: https://en.wikipedia.org/wiki/Obama problem: font is too small culprit: font-size:calc(1em * 0.875); This is a partial fix: calc is unsupported, so the above declaration should be ignored completely, but instead it sets font-size to that of a parent, so this code doesn't work as intended: font-size:0.875em;font-size:calc(1em * 0.875);
diff --git a/src/css_length.cpp b/src/css_length.cpp
@@ -7,7 +7,7 @@ void litehtml::css_length::fromString( const tstring& str, const tstring& predef
 	if(str.substr(0, 4) == _t("calc"))
 	{
 		m_is_predefined = true;
-		m_predef		= 0;
+		m_predef		= defValue;
 		return;
 	}
 
diff --git a/src/html_tag.cpp b/src/html_tag.cpp
@@ -1950,7 +1950,7 @@ void litehtml::html_tag::init_font()
 		m_font_size = parent_sz;
 
 		css_length sz;
-		sz.fromString(str, font_size_strings);
+		sz.fromString(str, font_size_strings, -1);
 		if(sz.is_predefined())
 		{
 			int idx_in_table = doc_font_size - 9;
@@ -1961,7 +1961,7 @@ void litehtml::html_tag::init_font()
 					m_font_size = font_size_table[idx_in_table][sz.predef()];
 				} else
 				{
-					m_font_size = doc_font_size;
+					m_font_size = parent_sz;
 				}
 			} else			
 			{
@@ -1986,7 +1986,7 @@ void litehtml::html_tag::init_font()
 					m_font_size = doc_font_size * 2;
 					break;
 				default:
-					m_font_size = doc_font_size;
+					m_font_size = parent_sz;
 					break;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ void litehtml::css_length::fromString( const tstring& str, const tstring& predef`
`7`	`7`	`if(str.substr(0, 4) == _t("calc"))`
`8`	`8`	`{`
`9`	`9`	`m_is_predefined = true;`
`10`		`- m_predef = 0;`
	`10`	`+ m_predef = defValue;`
`11`	`11`	`return;`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1950,7 +1950,7 @@ void litehtml::html_tag::init_font()`
`1950`	`1950`	`m_font_size = parent_sz;`
`1951`	`1951`
`1952`	`1952`	`css_length sz;`
`1953`		`- sz.fromString(str, font_size_strings);`
	`1953`	`+ sz.fromString(str, font_size_strings, -1);`
`1954`	`1954`	`if(sz.is_predefined())`
`1955`	`1955`	`{`
`1956`	`1956`	`int idx_in_table = doc_font_size - 9;`
`@@ -1961,7 +1961,7 @@ void litehtml::html_tag::init_font()`
`1961`	`1961`	`m_font_size = font_size_table[idx_in_table][sz.predef()];`
`1962`	`1962`	`} else`
`1963`	`1963`	`{`
`1964`		`- m_font_size = doc_font_size;`
	`1964`	`+ m_font_size = parent_sz;`
`1965`	`1965`	`}`
`1966`	`1966`	`} else`
`1967`	`1967`	`{`
`@@ -1986,7 +1986,7 @@ void litehtml::html_tag::init_font()`
`1986`	`1986`	`m_font_size = doc_font_size * 2;`
`1987`	`1987`	`break;`
`1988`	`1988`	`default:`
`1989`		`- m_font_size = doc_font_size;`
	`1989`	`+ m_font_size = parent_sz;`
`1990`	`1990`	`break;`
`1991`	`1991`	`}`
`1992`	`1992`	`}`