improve converting tag style values

This commit is contained in:
Kiryl
2022-09-21 20:09:55 +03:00
parent 7e02fe117d
commit b7f7dd772a

View File

@@ -74,22 +74,20 @@ class StyleReader:
def convert_size_number(size_number: str, unit_to_replace: str, multiplier: float) -> str: def convert_size_number(size_number: str, unit_to_replace: str, multiplier: float) -> str:
size_number = float(size_number.replace(unit_to_replace, "")) * multiplier size_number = float(size_number.replace(unit_to_replace, "")) * multiplier
return str(size_number) + "px" return str(size_number) + "px"
has_size = re.search(r"(\d+)([\w%]+)", size_value)
values: List = size_value.split(" ") values: List = size_value.split(" ")
size_number: Union[str, float] = values[0] if has_size:
size_regexp = re.compile( size_number_idx = [i for i, value in enumerate(values) if re.search("(\d+)([\w%]+)", value)][0]
r"(^-*(\d*\.*\d+)%$)|(^-*(\d*\.*\d+)em$)|(^-*(\d*\.*\d+)pt$)|(^-*(\d*\.*\d+)in$)") if has_size.group(2) == "%":
has_style_attrs = re.search(size_regexp, size_number)
if has_style_attrs:
if has_style_attrs.group(1):
multiplier = 5.76 if is_indent else 0.16 multiplier = 5.76 if is_indent else 0.16
values[0] = convert_size_number(size_number, "%", multiplier) values[size_number_idx] = convert_size_number(values[size_number_idx], "%", multiplier)
elif has_style_attrs.group(3): elif has_size.group(2) == "em":
multiplier = 18 if is_indent else 16 multiplier = 18 if is_indent else 16
values[0] = convert_size_number(size_number, "em", multiplier) values[size_number_idx] = convert_size_number(values[size_number_idx], "em", multiplier)
elif has_style_attrs.group(5): elif has_size.group(2) == "pt":
values[0] = convert_size_number(size_number, "pt", 4 / 3) values[size_number_idx] = convert_size_number(values[size_number_idx], "pt", 4 / 3)
elif has_style_attrs.group(7): elif has_size.group(2) == "in":
values[0] = convert_size_number(size_number, "in", 96) values[size_number_idx] = convert_size_number(values[size_number_idx], "in", 96)
size_value = " ".join(values) size_value = " ".join(values)
return size_value return size_value