Recognize two-word weights with space

openlayers · Jan 18, 2022 · ccfc67c · ccfc67c
1 parent 0c02827
commit ccfc67c
Show file tree

Hide file tree

Showing 4 changed files with 11,907 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -52,9 +52,13 @@ module.exports = function(fonts, size, lineHeight) {
         style = haveStyle ? style : parts[parts.length - 1].replace(maybeWeight, '');
       }
       for (var w in fontWeights) {
-        if (maybeWeight == w || maybeWeight == w.replace('-', '') || maybeWeight == w.replace('-', sp)) {
+        var previousPart = parts.length > 1 ? parts[parts.length - 2].toLowerCase() : '';
+        if (maybeWeight == w || maybeWeight == w.replace('-', '') || previousPart + '-' + maybeWeight == w) {
           weight = haveWeight ? weight : fontWeights[w];
           parts.pop();
+          if (previousPart && w.startsWith(previousPart)) {
+            parts.pop();
+          }
           break;
         }
       }