Parcourir la source

test "common-ligatures"

Gildas il y a 7 ans
Parent
commit
1251fbeeeb
1 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 4 2
      lib/single-file/css-fonts-minifier.js

+ 4 - 2
lib/single-file/css-fonts-minifier.js

@@ -294,17 +294,19 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 						const fontFamily = removeQuotes(rule.style.getPropertyValue("font-family"));
 						if (fontFamily && !unusedFonts.includes(fontFamily)) {
 							let optionalTest;
+
 							const optionalUsedFonts = filteredUsedFonts && filteredUsedFonts.get(fontFamily);
 							if (optionalUsedFonts && optionalUsedFonts.length) {
 								const fontStyle = rule.style.getPropertyValue("font-style") || "normal";
 								optionalTest = optionalUsedFonts.find(fontInfo => fontInfo.fontStyle == fontStyle);
 								if (optionalTest) {
-									const fontVariant = rule.style.getPropertyValue("font-variant") || "normal";
-									optionalTest = optionalUsedFonts.find(fontInfo => fontInfo.fontVariant == fontVariant);
+									const fontVariant = rule.style.getPropertyValue("font-variant");
+									optionalTest = optionalUsedFonts.find(fontInfo => fontInfo.fontVariant == fontVariant || "normal" || fontInfo.fontVariant == fontVariant || "common-ligatures");
 								}
 							} else {
 								optionalTest = true;
 							}
+
 							if (testUnicodeRange(docContent, rule.style.getPropertyValue("unicode-range")) && optionalTest) {
 								stylesheetContent += rule.cssText;
 							}