minor refactoring

lib/single-file/css-fonts-minifier.js

@@ -315,7 +315,7 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 			const fontVariant = rule.style.getPropertyValue("font-variant");
 			test = optionalUsedFonts.find(fontInfo => fontInfo.fontStyle == fontStyle);
 			if (test) {
-				test = optionalUsedFonts.find(fontInfo => fontInfo.fontVariant == fontVariant || "normal" || fontInfo.fontVariant == fontVariant || "common-ligatures");
+				test = optionalUsedFonts.find(fontInfo => testFontVariant(fontInfo, fontVariant));
 			}
 			if (test) {
 				if (isNaN(fontWeight)) {
@@ -323,9 +323,9 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 				} else {
 					const usedFontWeights = optionalUsedFonts.map(fontInfo => fontInfo.fontWeight);
 					const declaredFontsWeights = declaredFonts
-						.filter(fontInfo => fontInfo.familyName == familyName && fontInfo.fontStyle == fontStyle && (fontInfo.fontVariant == fontVariant || "normal" || fontInfo.fontVariant == fontVariant || "common-ligatures"))
+						.filter(fontInfo => fontInfo.familyName == familyName && fontInfo.fontStyle == fontStyle && testFontVariant(fontInfo, fontVariant))
 						.map(fontInfo => fontInfo.fontWeight)
-						.sort((w1, w2) => w1 - w2);
+						.sort((weight1, weight2) => weight1 - weight2);
 					const usedComputedFontWeights = usedFontWeights.map(fontWeight => findFontWeight(fontWeight, declaredFontsWeights));
 					test = usedComputedFontWeights.includes(fontWeight);
 				}
@@ -386,6 +386,10 @@ this.fontsMinifier = this.fontsMinifier || (() => {
 		}
 	}
 
+	function testFontVariant(fontInfo, fontVariant) {
+		return fontInfo.fontVariant == fontVariant || "normal" || fontInfo.fontVariant == fontVariant || "common-ligatures";
+	}
+
 	function testUnicodeRange(docContent, unicodeRange) {
 		if (unicodeRange) {
 			const unicodeRanges = unicodeRange.split(REGEXP_COMMA);