@fontsource/maven-pro 4.5.13 → 5.0.1

package/latin-ext-500.css

@@ -1,9 +1,8 @@
-/* maven-pro-latin-ext-500-normal*/
+/* maven-pro-latin-ext-500-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 500;
-  src: url('./files/maven-pro-latin-ext-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-500-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-500-normal.woff) format('woff');
+}

package/latin-ext-600.css

@@ -1,9 +1,8 @@
-/* maven-pro-latin-ext-600-normal*/
+/* maven-pro-latin-ext-600-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 600;
-  src: url('./files/maven-pro-latin-ext-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-600-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-600-normal.woff) format('woff');
+}

package/latin-ext-700.css

@@ -1,9 +1,8 @@
-/* maven-pro-latin-ext-700-normal*/
+/* maven-pro-latin-ext-700-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 700;
-  src: url('./files/maven-pro-latin-ext-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-700-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-700-normal.woff) format('woff');
+}

package/latin-ext-800.css

@@ -1,9 +1,8 @@
-/* maven-pro-latin-ext-800-normal*/
+/* maven-pro-latin-ext-800-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 800;
-  src: url('./files/maven-pro-latin-ext-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-800-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-800-normal.woff) format('woff');
+}

package/latin-ext-900.css

@@ -1,9 +1,8 @@
-/* maven-pro-latin-ext-900-normal*/
+/* maven-pro-latin-ext-900-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 900;
-  src: url('./files/maven-pro-latin-ext-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-900-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-900-normal.woff) format('woff');
+}

package/latin-ext.css

@@ -1,54 +1,53 @@
-/* maven-pro-latin-ext-400-normal*/
+/* maven-pro-latin-ext-400-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 400;
-  src: url('./files/maven-pro-latin-ext-400-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-400-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-ext-400-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-400-normal.woff) format('woff');
 }
-/* maven-pro-latin-ext-500-normal*/
+
+/* maven-pro-latin-ext-500-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 500;
-  src: url('./files/maven-pro-latin-ext-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-500-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-ext-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-500-normal.woff) format('woff');
 }
-/* maven-pro-latin-ext-600-normal*/
+
+/* maven-pro-latin-ext-600-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 600;
-  src: url('./files/maven-pro-latin-ext-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-600-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-ext-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-600-normal.woff) format('woff');
 }
-/* maven-pro-latin-ext-700-normal*/
+
+/* maven-pro-latin-ext-700-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 700;
-  src: url('./files/maven-pro-latin-ext-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-700-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-ext-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-700-normal.woff) format('woff');
 }
-/* maven-pro-latin-ext-800-normal*/
+
+/* maven-pro-latin-ext-800-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 800;
-  src: url('./files/maven-pro-latin-ext-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-800-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-ext-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-800-normal.woff) format('woff');
 }
-/* maven-pro-latin-ext-900-normal*/
+
+/* maven-pro-latin-ext-900-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 900;
-  src: url('./files/maven-pro-latin-ext-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-900-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-ext-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-900-normal.woff) format('woff');
+}

package/latin.css

@@ -1,54 +1,53 @@
-/* maven-pro-latin-400-normal*/
+/* maven-pro-latin-400-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 400;
-  src: url('./files/maven-pro-latin-400-normal.woff2') format('woff2'), url('./files/maven-pro-latin-400-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-400-normal.woff2) format('woff2'), url(./files/maven-pro-latin-400-normal.woff) format('woff');
 }
-/* maven-pro-latin-500-normal*/
+
+/* maven-pro-latin-500-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 500;
-  src: url('./files/maven-pro-latin-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-500-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-500-normal.woff) format('woff');
 }
-/* maven-pro-latin-600-normal*/
+
+/* maven-pro-latin-600-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 600;
-  src: url('./files/maven-pro-latin-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-600-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-600-normal.woff) format('woff');
 }
-/* maven-pro-latin-700-normal*/
+
+/* maven-pro-latin-700-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 700;
-  src: url('./files/maven-pro-latin-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-700-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-700-normal.woff) format('woff');
 }
-/* maven-pro-latin-800-normal*/
+
+/* maven-pro-latin-800-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 800;
-  src: url('./files/maven-pro-latin-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-800-normal.woff') format('woff');
-  
+  src: url(./files/maven-pro-latin-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-800-normal.woff) format('woff');
 }
-/* maven-pro-latin-900-normal*/
+
+/* maven-pro-latin-900-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 900;
-  src: url('./files/maven-pro-latin-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-900-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-latin-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-900-normal.woff) format('woff');
+}

package/metadata.json

@@ -1 +1,21 @@
-{"fontId":"maven-pro","fontName":"Maven Pro","subsets":["latin","latin-ext","vietnamese"],"weights":[400,500,600,700,800,900],"styles":["normal"],"defSubset":"latin","variable":{"wght":{"default":"400","min":"400","max":"900","step":"1"}},"lastModified":"2022-09-22","version":"v32","category":"sans-serif","source":"https://fonts.google.com/","license":"https://fonts.google.com/attribution","type":"google"}
+{
+  "id": "maven-pro",
+  "family": "Maven Pro",
+  "subsets": ["latin", "latin-ext", "vietnamese"],
+  "weights": [400, 500, 600, 700, 800, 900],
+  "styles": ["normal"],
+  "defSubset": "latin",
+  "variable": {
+    "wght": {"default": "400", "min": "400", "max": "900", "step": "1"}
+  },
+  "lastModified": "2022-09-22",
+  "version": "v32",
+  "category": "sans-serif",
+  "license": {
+    "type": "OFL-1.1",
+    "url": "http://scripts.sil.org/OFL",
+    "attribution": "Copyright 2011 The Maven Pro Project Authors (http://www.vissol.co.uk/mavenpro/), with Reserved Font Name \"Maven Pro\"."
+  },
+  "source": "https://github.com/google/fonts",
+  "type": "google"
+}

package/package.json

@@ -1 +1,30 @@
-{"name":"@fontsource/maven-pro","version":"4.5.13","description":"Self-host the Maven Pro font in a neatly bundled NPM package.","main":"index.css","publishConfig":{"access":"public"},"keywords":["fontsource","font","font family","google fonts","Maven Pro","maven-pro"],"author":"Lotus <declininglotus@gmail.com>","license":"MIT","homepage":"https://github.com/fontsource/fontsource/tree/main/fonts/google/maven-pro#readme","repository":{"type":"git","url":"https://github.com/fontsource/fontsource.git","directory":"fonts/google/maven-pro"}}
+{
+  "name": "@fontsource/maven-pro",
+  "version": "5.0.1",
+  "description": "Self-host the Maven Pro font in a neatly bundled NPM package.",
+  "main": "index.css",
+  "publishConfig": {"access": "public"},
+  "keywords": [
+    "fontsource",
+    "font",
+    "font family",
+    "google fonts",
+    "maven-pro",
+    "Maven Pro",
+    "css",
+    "sass",
+    "front-end",
+    "web",
+    "typeface",
+    "variable"
+  ],
+  "author": "Google Inc.",
+  "license": "OFL-1.1",
+  "homepage": "https://fontsource.org/fonts/maven-pro",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fontsource/font-files.git",
+    "directory": "fonts/google/maven-pro"
+  },
+  "publishHash": "fac9b67d367deb85"
+}

package/scss/metadata.scss

@@ -0,0 +1,18 @@
+$id: 'maven-pro' !default;
+$family: 'Maven Pro' !default;
+$category: sans-serif !default;
+$subsets: (latin, latin-ext, vietnamese) !default;
+$weights: (400, 500, 600, 700, 800, 900) !default;
+$styles: (normal) !default;
+$axes: null !default;
+$defaults: (
+  subset: latin,
+  weight: 400,
+  style: normal,
+  axis: null,
+) !default;
+$unicode: (
+  vietnamese: (U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB),
+  latin-ext: (U+0100-02AF,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF),
+  latin: (U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD),
+) !default;

package/scss/mixins.scss

@@ -1,124 +1,175 @@
-$fontName: "Maven Pro";
-$fontId: "maven-pro";
-$style: normal;
-$display: swap;
-$weight: 400;
-$fontDir: "~@fontsource/#{$fontId}/files";
-$unicodeMap: (vietnamese: (U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+1EA0-1EF9,U+20AB), latin-ext: (U+0100-024F,U+0259,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF), latin: (U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD));
+@use 'sass:list';
+@use 'sass:map';
+@use 'sass:math';
+@use 'sass:meta';
+@use 'sass:string';
 
-@mixin fontFace(
-  $fontName: $fontName,
-  $fontId: $fontId,
-  $style: $style,
-  $display: $display,
-  $weight: $weight,
-  $fontDir: $fontDir,
-  $unicodeMap: $unicodeMap
-) {
-  @each $subset, $unicodeRangeValues in $unicodeMap {
-    @font-face {
-      font-family: "#{$fontName}";
-      font-style: $style;
-      font-display: $display;
-      font-weight: $weight;
-      src: url("#{$fontDir}/#{$fontId}-#{$subset}-#{$weight}-#{$style}.woff2") format("woff2"),
-        url("#{$fontDir}/#{$fontId}-all-#{$weight}-#{$style}.woff") format("woff");
-      unicode-range: $unicodeRangeValues;
-    }
-  }
-}
+@use 'metadata';
 
-$defSubset: "latin";
-$unicodeRange: false;
-$unicodeRangeValues: (U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD);
+$metadata: meta.module-variables(metadata) !default;
+$directory: null !default;
 
-@mixin fontFaceCustom(
-  $fontName: $fontName,
-  $fontId: $fontId,
-  $style: $style,
+$family: null !default;
+$display: null !default;
+$displayVar: null !default;
+$formats: null !default;
+$subsets: null !default;
+$weights: null !default;
+$styles: null !default;
+$axes: null !default;
+
+@mixin generator(
+  $metadata: $metadata,
+  $directory: $directory,
+  $family: $family,
   $display: $display,
-  $weight: $weight,
-  $woff2Path: null,
-  $woffPath: null,
-  $unicodeRange: $unicodeRange,
-  $unicodeRangeValues: $unicodeRangeValues
+  $displayVar: $displayVar,
+  $formats: $formats,
+  $subsets: $subsets,
+  $weights: $weights,
+  $styles: $styles,
+  $axes: $axes
 ) {
-  @if $woffPath == null {
-    $woffPath: "#{$fontDir}/#{$fontId}-#{$defSubset}-#{$weight}-#{$style}.woff";
-  }
-  @if $woff2Path == null {
-    $woff2Path: "#{$fontDir}/#{$fontId}-#{$defSubset}-#{$weight}-#{$style}.woff2";
-  }
+  $isVariable: map.get($metadata, axes) != null;
 
-  @font-face {
-    font-family: "#{$fontName}";
-    font-style: $style;
-    font-display: $display;
-    font-weight: $weight;
-    src: url("#{$woff2Path}") format("woff2"), url("#{$woffPath}") format("woff");
-    @if $unicodeRange {
-      unicode-range: $unicodeRangeValues;
-    }
-  }
-}
+  $directory: if(
+    $directory,
+    $directory,
+    '~@fontsource#{if($isVariable, '-variable', '')}/#{map.get($metadata, id)}/files'
+  );
 
-$fontNameVariable: "Maven ProVariable";
-$weightVariable: 400 900;
-$type: "wghtOnly";
-$stretch: null;
+  $family: if($family, $family, map.get($metadata, family) + if($isVariable, ' Variable', ''));
+  $display: if($display, $display, swap);
+  $displayVar: if($displayVar != null, $displayVar, true);
+  $formats: if(not $formats or $formats == all, if($isVariable, woff2, (woff2, woff)), $formats);
+  $subsets: if(
+    $subsets,
+    if($subsets == all, map.get($metadata, subsets), $subsets),
+    map.get($metadata, defaults, subset)
+  );
+  $weights: if(
+    $weights,
+    if($weights == all, map.get($metadata, weights), $weights),
+    map.get($metadata, defaults, weight)
+  );
+  $styles: if(
+    $styles,
+    if($styles == all, map.get($metadata, styles), $styles),
+    map.get($metadata, defaults, style)
+  );
+  $axes: if(
+    $axes,
+    if($axes == all, full, $axes),
+    if($isVariable, if(map.has-key($metadata, axes, wght), wght, full), null)
+  );
 
-@mixin fontFaceVariable(
-  $fontName: $fontNameVariable,
-  $fontId: $fontId,
-  $style: $style,
-  $display: $display,
-  $weight: $weightVariable,
-  $fontDir: $fontDir,
-  $type: $type,
-  $stretch: $stretch,
-  $unicodeMap: $unicodeMap
-) {
-  @each $subset, $unicodeRangeValues in $unicodeMap {
-    @font-face {
-      font-family: "#{$fontName}";
-      font-style: $style;
-      font-display: $display;
-      font-weight: $weight;
-      @if $type == "full" {
-        font-stretch: $stretch;
+  @each $subset in $subsets {
+    @each $unicodeSubset, $unicodeRange in map.get($metadata, unicode) {
+      @if (
+        ($subset == $unicodeSubset) or
+          (
+            // Is numeric subset
+            ($subset == map.get($metadata, defaults, subset)) and not
+              list.index(map.get($metadata, subsets), $unicodeSubset)
+          )
+      ) {
+        @each $weight in if($axes, null, $weights) {
+          @each $axis in $axes {
+            @each $style in $styles {
+              $variant: '#{map.get($metadata, id)}-#{if($unicodeSubset, $unicodeSubset, $subset)}-#{if($axis, $axis, $weight)}-#{$style}';
+
+              $src: ();
+              @each $format in $formats {
+                $src: append(
+                  $src,
+                  url('#{$directory}/#{$variant}.#{$format}')
+                    format('#{$format}#{if($axis, '-variations', '')}'),
+                  comma
+                );
+              }
+
+              @content ((
+                metadata: $metadata,
+                directory: $directory,
+                family: $family,
+                display: $display,
+                displayVar: $displayVar,
+                formats: $formats,
+                subsets: $subsets,
+                weights: $weights,
+                styles: $styles,
+                axes: $axes,
+
+                variant: $variant,
+                subset: $subset,
+                unicodeSubset: $unicodeSubset,
+                unicodeRange: $unicodeRange,
+                weight: $weight,
+                axis: $axis,
+                style: $style,
+
+                font-family: string.quote($family),
+                font-style: if(
+                  (($axis == full) or ($axis == slnt)) and map.has-key($metadata, axes, slnt),
+                  oblique map.get($metadata, axes, slnt, min) + deg map.get($metadata, axes, slnt, max) + deg,
+                  $style
+                ),
+                font-display: if($displayVar, var(--fontsource-display, $display), $display),
+                font-weight: if(
+                  (($axis == full) or ($axis == wght)) and map.has-key($metadata, axes, wght),
+                  map.get($metadata, axes, wght, min) map.get($metadata, axes, wght, max),
+                  $weight
+                ),
+                font-stretch: if(
+                  (($axis == full) or ($axis == wdth)) and map.has-key($metadata, axes, wdth),
+                  '#{map.get($metadata, axes, wdth, min)}% #{map.get($metadata, axes, wdth, max)}%',
+                  null
+                ),
+                src: $src,
+                unicode-range: $unicodeRange,
+              ));
+            }
+          }
+        }
       }
-      src: url("#{$fontDir}/#{$fontId}-#{$subset}-variable-#{$type}-#{$style}.woff2") format("woff2");
-      unicode-range: $unicodeRangeValues;
     }
   }
 }
 
-@mixin fontFaceVariableCustom(
-  $fontName: $fontNameVariable,
-  $fontId: $fontId,
-  $style: $style,
+@mixin faces(
+  $metadata: $metadata,
+  $directory: $directory,
+  $family: $family,
   $display: $display,
-  $weight: $weightVariable,
-  $type: $type,
-  $woff2Path: null,
-  $unicodeRange: $unicodeRange,
-  $unicodeRangeValues: $unicodeRangeValues
+  $displayVar: $displayVar,
+  $formats: $formats,
+  $subsets: $subsets,
+  $weights: $weights,
+  $styles: $styles,
+  $axes: $axes
 ) {
-  @if $woff2Path == null {
-    $woff2Path: "#{$fontDir}/#{$fontId}-#{$defSubset}-variable-#{$type}-#{$style}.woff2";
-  }
-
-  @font-face {
-    font-family: "#{$fontName}";
-    font-style: $style;
-    font-display: $display;
-    font-weight: $weight;
-    @if $type == "full" {
-      font-stretch: $stretch;
-    }
-    src: url("#{$woff2Path}") format("woff2");
-    @if $unicodeRange {
-      unicode-range: $unicodeRangeValues;
+  @include generator(
+      $metadata: $metadata,
+      $directory: $directory,
+      $family: $family,
+      $display: $display,
+      $displayVar: $displayVar,
+      $formats: $formats,
+      $subsets: $subsets,
+      $weights: $weights,
+      $styles: $styles,
+      $axes: $axes
+    )
+    using ($props) {
+    /* #{map.get($props, variant)} */
+    @font-face {
+      font-family: map.get($props, font-family);
+      font-style: map.get($props, font-style);
+      font-display: map.get($props, font-display);
+      font-weight: map.get($props, font-weight);
+      font-stretch: map.get($props, font-stretch);
+      unicode-range: map.get($props, unicode-range);
+      src: map.get($props, src);
     }
   }
 }

package/unicode.json

@@ -1 +1,5 @@
-{"vietnamese":"U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+1EA0-1EF9,U+20AB","latin-ext":"U+0100-024F,U+0259,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF","latin":"U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD"}
+{
+  "vietnamese": "U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB",
+  "latin-ext": "U+0100-02AF,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF",
+  "latin": "U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD"
+}

package/vietnamese-400.css

@@ -1,9 +1,8 @@
-/* maven-pro-vietnamese-400-normal*/
+/* maven-pro-vietnamese-400-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 400;
-  src: url('./files/maven-pro-vietnamese-400-normal.woff2') format('woff2'), url('./files/maven-pro-vietnamese-400-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-vietnamese-400-normal.woff2) format('woff2'), url(./files/maven-pro-vietnamese-400-normal.woff) format('woff');
+}

package/vietnamese-500.css

@@ -1,9 +1,8 @@
-/* maven-pro-vietnamese-500-normal*/
+/* maven-pro-vietnamese-500-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 500;
-  src: url('./files/maven-pro-vietnamese-500-normal.woff2') format('woff2'), url('./files/maven-pro-vietnamese-500-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-vietnamese-500-normal.woff2) format('woff2'), url(./files/maven-pro-vietnamese-500-normal.woff) format('woff');
+}

package/vietnamese-600.css

@@ -1,9 +1,8 @@
-/* maven-pro-vietnamese-600-normal*/
+/* maven-pro-vietnamese-600-normal */
 @font-face {
   font-family: 'Maven Pro';
   font-style: normal;
-  font-display: swap;
+  font-display: var(--fontsource-display, swap);
   font-weight: 600;
-  src: url('./files/maven-pro-vietnamese-600-normal.woff2') format('woff2'), url('./files/maven-pro-vietnamese-600-normal.woff') format('woff');
-  
-}
+  src: url(./files/maven-pro-vietnamese-600-normal.woff2) format('woff2'), url(./files/maven-pro-vietnamese-600-normal.woff) format('woff');
+}