@fontsource/maven-pro 4.5.12 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/400.css +15 -13
  2. package/500.css +15 -13
  3. package/600.css +15 -13
  4. package/700.css +15 -13
  5. package/800.css +15 -13
  6. package/900.css +15 -13
  7. package/CHANGELOG.md +1 -2
  8. package/LICENSE +93 -0
  9. package/README.md +12 -13
  10. package/files/maven-pro-latin-400-normal.woff +0 -0
  11. package/files/maven-pro-latin-500-normal.woff +0 -0
  12. package/files/maven-pro-latin-600-normal.woff +0 -0
  13. package/files/maven-pro-latin-700-normal.woff +0 -0
  14. package/files/maven-pro-latin-800-normal.woff +0 -0
  15. package/files/maven-pro-latin-900-normal.woff +0 -0
  16. package/files/maven-pro-latin-ext-400-normal.woff +0 -0
  17. package/files/maven-pro-latin-ext-500-normal.woff +0 -0
  18. package/files/maven-pro-latin-ext-600-normal.woff +0 -0
  19. package/files/maven-pro-latin-ext-700-normal.woff +0 -0
  20. package/files/maven-pro-latin-ext-800-normal.woff +0 -0
  21. package/files/maven-pro-latin-ext-900-normal.woff +0 -0
  22. package/files/maven-pro-vietnamese-400-normal.woff +0 -0
  23. package/files/maven-pro-vietnamese-500-normal.woff +0 -0
  24. package/files/maven-pro-vietnamese-600-normal.woff +0 -0
  25. package/files/maven-pro-vietnamese-700-normal.woff +0 -0
  26. package/files/maven-pro-vietnamese-800-normal.woff +0 -0
  27. package/files/maven-pro-vietnamese-900-normal.woff +0 -0
  28. package/index.css +15 -13
  29. package/latin-400.css +4 -5
  30. package/latin-500.css +4 -5
  31. package/latin-600.css +4 -5
  32. package/latin-700.css +4 -5
  33. package/latin-800.css +4 -5
  34. package/latin-900.css +4 -5
  35. package/latin-ext-400.css +4 -5
  36. package/latin-ext-500.css +4 -5
  37. package/latin-ext-600.css +4 -5
  38. package/latin-ext-700.css +4 -5
  39. package/latin-ext-800.css +4 -5
  40. package/latin-ext-900.css +4 -5
  41. package/latin-ext.css +24 -25
  42. package/latin.css +24 -25
  43. package/metadata.json +12 -6
  44. package/package.json +29 -1
  45. package/scss/metadata.scss +18 -0
  46. package/scss/mixins.scss +161 -105
  47. package/unicode.json +4 -4
  48. package/vietnamese-400.css +4 -5
  49. package/vietnamese-500.css +4 -5
  50. package/vietnamese-600.css +4 -5
  51. package/vietnamese-700.css +4 -5
  52. package/vietnamese-800.css +4 -5
  53. package/vietnamese-900.css +4 -5
  54. package/vietnamese.css +24 -25
  55. package/files/file-list.json +0 -47
  56. package/files/maven-pro-all-400-normal.woff +0 -0
  57. package/files/maven-pro-all-500-normal.woff +0 -0
  58. package/files/maven-pro-all-600-normal.woff +0 -0
  59. package/files/maven-pro-all-700-normal.woff +0 -0
  60. package/files/maven-pro-all-800-normal.woff +0 -0
  61. package/files/maven-pro-all-900-normal.woff +0 -0
  62. package/files/maven-pro-latin-ext-variable-wghtOnly-normal.woff2 +0 -0
  63. package/files/maven-pro-latin-variable-wghtOnly-normal.woff2 +0 -0
  64. package/files/maven-pro-vietnamese-variable-wghtOnly-normal.woff2 +0 -0
  65. package/variable.css +0 -27
package/latin-ext-500.css CHANGED
@@ -1,9 +1,8 @@
1
- /* maven-pro-latin-ext-500-normal*/
1
+ /* maven-pro-latin-ext-500-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 500;
7
- src: url('./files/maven-pro-latin-ext-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-500-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-latin-ext-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-500-normal.woff) format('woff');
8
+ }
package/latin-ext-600.css CHANGED
@@ -1,9 +1,8 @@
1
- /* maven-pro-latin-ext-600-normal*/
1
+ /* maven-pro-latin-ext-600-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 600;
7
- src: url('./files/maven-pro-latin-ext-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-600-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-latin-ext-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-600-normal.woff) format('woff');
8
+ }
package/latin-ext-700.css CHANGED
@@ -1,9 +1,8 @@
1
- /* maven-pro-latin-ext-700-normal*/
1
+ /* maven-pro-latin-ext-700-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 700;
7
- src: url('./files/maven-pro-latin-ext-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-700-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-latin-ext-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-700-normal.woff) format('woff');
8
+ }
package/latin-ext-800.css CHANGED
@@ -1,9 +1,8 @@
1
- /* maven-pro-latin-ext-800-normal*/
1
+ /* maven-pro-latin-ext-800-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 800;
7
- src: url('./files/maven-pro-latin-ext-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-800-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-latin-ext-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-800-normal.woff) format('woff');
8
+ }
package/latin-ext-900.css CHANGED
@@ -1,9 +1,8 @@
1
- /* maven-pro-latin-ext-900-normal*/
1
+ /* maven-pro-latin-ext-900-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 900;
7
- src: url('./files/maven-pro-latin-ext-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-900-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-latin-ext-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-900-normal.woff) format('woff');
8
+ }
package/latin-ext.css CHANGED
@@ -1,54 +1,53 @@
1
- /* maven-pro-latin-ext-400-normal*/
1
+ /* maven-pro-latin-ext-400-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 400;
7
- src: url('./files/maven-pro-latin-ext-400-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-400-normal.woff') format('woff');
8
-
7
+ src: url(./files/maven-pro-latin-ext-400-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-400-normal.woff) format('woff');
9
8
  }
10
- /* maven-pro-latin-ext-500-normal*/
9
+
10
+ /* maven-pro-latin-ext-500-normal */
11
11
  @font-face {
12
12
  font-family: 'Maven Pro';
13
13
  font-style: normal;
14
- font-display: swap;
14
+ font-display: var(--fontsource-display, swap);
15
15
  font-weight: 500;
16
- src: url('./files/maven-pro-latin-ext-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-500-normal.woff') format('woff');
17
-
16
+ src: url(./files/maven-pro-latin-ext-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-500-normal.woff) format('woff');
18
17
  }
19
- /* maven-pro-latin-ext-600-normal*/
18
+
19
+ /* maven-pro-latin-ext-600-normal */
20
20
  @font-face {
21
21
  font-family: 'Maven Pro';
22
22
  font-style: normal;
23
- font-display: swap;
23
+ font-display: var(--fontsource-display, swap);
24
24
  font-weight: 600;
25
- src: url('./files/maven-pro-latin-ext-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-600-normal.woff') format('woff');
26
-
25
+ src: url(./files/maven-pro-latin-ext-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-600-normal.woff) format('woff');
27
26
  }
28
- /* maven-pro-latin-ext-700-normal*/
27
+
28
+ /* maven-pro-latin-ext-700-normal */
29
29
  @font-face {
30
30
  font-family: 'Maven Pro';
31
31
  font-style: normal;
32
- font-display: swap;
32
+ font-display: var(--fontsource-display, swap);
33
33
  font-weight: 700;
34
- src: url('./files/maven-pro-latin-ext-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-700-normal.woff') format('woff');
35
-
34
+ src: url(./files/maven-pro-latin-ext-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-700-normal.woff) format('woff');
36
35
  }
37
- /* maven-pro-latin-ext-800-normal*/
36
+
37
+ /* maven-pro-latin-ext-800-normal */
38
38
  @font-face {
39
39
  font-family: 'Maven Pro';
40
40
  font-style: normal;
41
- font-display: swap;
41
+ font-display: var(--fontsource-display, swap);
42
42
  font-weight: 800;
43
- src: url('./files/maven-pro-latin-ext-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-800-normal.woff') format('woff');
44
-
43
+ src: url(./files/maven-pro-latin-ext-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-800-normal.woff) format('woff');
45
44
  }
46
- /* maven-pro-latin-ext-900-normal*/
45
+
46
+ /* maven-pro-latin-ext-900-normal */
47
47
  @font-face {
48
48
  font-family: 'Maven Pro';
49
49
  font-style: normal;
50
- font-display: swap;
50
+ font-display: var(--fontsource-display, swap);
51
51
  font-weight: 900;
52
- src: url('./files/maven-pro-latin-ext-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-ext-900-normal.woff') format('woff');
53
-
54
- }
52
+ src: url(./files/maven-pro-latin-ext-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-ext-900-normal.woff) format('woff');
53
+ }
package/latin.css CHANGED
@@ -1,54 +1,53 @@
1
- /* maven-pro-latin-400-normal*/
1
+ /* maven-pro-latin-400-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 400;
7
- src: url('./files/maven-pro-latin-400-normal.woff2') format('woff2'), url('./files/maven-pro-latin-400-normal.woff') format('woff');
8
-
7
+ src: url(./files/maven-pro-latin-400-normal.woff2) format('woff2'), url(./files/maven-pro-latin-400-normal.woff) format('woff');
9
8
  }
10
- /* maven-pro-latin-500-normal*/
9
+
10
+ /* maven-pro-latin-500-normal */
11
11
  @font-face {
12
12
  font-family: 'Maven Pro';
13
13
  font-style: normal;
14
- font-display: swap;
14
+ font-display: var(--fontsource-display, swap);
15
15
  font-weight: 500;
16
- src: url('./files/maven-pro-latin-500-normal.woff2') format('woff2'), url('./files/maven-pro-latin-500-normal.woff') format('woff');
17
-
16
+ src: url(./files/maven-pro-latin-500-normal.woff2) format('woff2'), url(./files/maven-pro-latin-500-normal.woff) format('woff');
18
17
  }
19
- /* maven-pro-latin-600-normal*/
18
+
19
+ /* maven-pro-latin-600-normal */
20
20
  @font-face {
21
21
  font-family: 'Maven Pro';
22
22
  font-style: normal;
23
- font-display: swap;
23
+ font-display: var(--fontsource-display, swap);
24
24
  font-weight: 600;
25
- src: url('./files/maven-pro-latin-600-normal.woff2') format('woff2'), url('./files/maven-pro-latin-600-normal.woff') format('woff');
26
-
25
+ src: url(./files/maven-pro-latin-600-normal.woff2) format('woff2'), url(./files/maven-pro-latin-600-normal.woff) format('woff');
27
26
  }
28
- /* maven-pro-latin-700-normal*/
27
+
28
+ /* maven-pro-latin-700-normal */
29
29
  @font-face {
30
30
  font-family: 'Maven Pro';
31
31
  font-style: normal;
32
- font-display: swap;
32
+ font-display: var(--fontsource-display, swap);
33
33
  font-weight: 700;
34
- src: url('./files/maven-pro-latin-700-normal.woff2') format('woff2'), url('./files/maven-pro-latin-700-normal.woff') format('woff');
35
-
34
+ src: url(./files/maven-pro-latin-700-normal.woff2) format('woff2'), url(./files/maven-pro-latin-700-normal.woff) format('woff');
36
35
  }
37
- /* maven-pro-latin-800-normal*/
36
+
37
+ /* maven-pro-latin-800-normal */
38
38
  @font-face {
39
39
  font-family: 'Maven Pro';
40
40
  font-style: normal;
41
- font-display: swap;
41
+ font-display: var(--fontsource-display, swap);
42
42
  font-weight: 800;
43
- src: url('./files/maven-pro-latin-800-normal.woff2') format('woff2'), url('./files/maven-pro-latin-800-normal.woff') format('woff');
44
-
43
+ src: url(./files/maven-pro-latin-800-normal.woff2) format('woff2'), url(./files/maven-pro-latin-800-normal.woff) format('woff');
45
44
  }
46
- /* maven-pro-latin-900-normal*/
45
+
46
+ /* maven-pro-latin-900-normal */
47
47
  @font-face {
48
48
  font-family: 'Maven Pro';
49
49
  font-style: normal;
50
- font-display: swap;
50
+ font-display: var(--fontsource-display, swap);
51
51
  font-weight: 900;
52
- src: url('./files/maven-pro-latin-900-normal.woff2') format('woff2'), url('./files/maven-pro-latin-900-normal.woff') format('woff');
53
-
54
- }
52
+ src: url(./files/maven-pro-latin-900-normal.woff2) format('woff2'), url(./files/maven-pro-latin-900-normal.woff) format('woff');
53
+ }
package/metadata.json CHANGED
@@ -1,15 +1,21 @@
1
1
  {
2
- "fontId": "maven-pro",
3
- "fontName": "Maven Pro",
2
+ "id": "maven-pro",
3
+ "family": "Maven Pro",
4
4
  "subsets": ["latin", "latin-ext", "vietnamese"],
5
5
  "weights": [400, 500, 600, 700, 800, 900],
6
6
  "styles": ["normal"],
7
7
  "defSubset": "latin",
8
- "variable": { "wght": { "default": "400", "min": "400", "max": "900", "step": "1" } },
8
+ "variable": {
9
+ "wght": {"default": "400", "min": "400", "max": "900", "step": "1"}
10
+ },
9
11
  "lastModified": "2022-09-22",
10
12
  "version": "v32",
11
13
  "category": "sans-serif",
12
- "source": "https://fonts.google.com/",
13
- "license": "https://fonts.google.com/attribution",
14
+ "license": {
15
+ "type": "OFL-1.1",
16
+ "url": "http://scripts.sil.org/OFL",
17
+ "attribution": "Copyright 2011 The Maven Pro Project Authors (http://www.vissol.co.uk/mavenpro/), with Reserved Font Name \"Maven Pro\"."
18
+ },
19
+ "source": "https://github.com/google/fonts",
14
20
  "type": "google"
15
- }
21
+ }
package/package.json CHANGED
@@ -1 +1,29 @@
1
- {"name":"@fontsource/maven-pro","version":"4.5.12","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"}}
1
+ {
2
+ "name": "@fontsource/maven-pro",
3
+ "version": "5.0.0",
4
+ "description": "Self-host the Maven Pro font in a neatly bundled NPM package.",
5
+ "main": "index.css",
6
+ "publishConfig": {"access": "public"},
7
+ "keywords": [
8
+ "fontsource",
9
+ "font",
10
+ "font family",
11
+ "google fonts",
12
+ "maven-pro",
13
+ "Maven Pro",
14
+ "css",
15
+ "sass",
16
+ "front-end",
17
+ "web",
18
+ "typeface",
19
+ "variable"
20
+ ],
21
+ "author": "Google Inc.",
22
+ "license": "OFL-1.1",
23
+ "homepage": "https://fontsource.org/fonts/maven-pro",
24
+ "repository": {
25
+ "type": "git",
26
+ "url": "https://github.com/fontsource/font-files.git",
27
+ "directory": "fonts/google/maven-pro"
28
+ }
29
+ }
@@ -0,0 +1,18 @@
1
+ $id: 'maven-pro' !default;
2
+ $family: 'Maven Pro' !default;
3
+ $category: sans-serif !default;
4
+ $subsets: (latin, latin-ext, vietnamese) !default;
5
+ $weights: (400, 500, 600, 700, 800, 900) !default;
6
+ $styles: (normal) !default;
7
+ $axes: null !default;
8
+ $defaults: (
9
+ subset: latin,
10
+ weight: 400,
11
+ style: normal,
12
+ axis: null,
13
+ ) !default;
14
+ $unicode: (
15
+ 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),
16
+ 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),
17
+ 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),
18
+ ) !default;
package/scss/mixins.scss CHANGED
@@ -1,123 +1,179 @@
1
- $fontName: "Maven Pro";
2
- $fontId: "maven-pro";
3
- $style: normal;
4
- $display: swap;
5
- $weight: 400;
6
- $fontDir: "~@fontsource/#{$fontId}/files";
7
- $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));
1
+ @use 'sass:list';
2
+ @use 'sass:map';
3
+ @use 'sass:math';
4
+ @use 'sass:meta';
5
+ @use 'sass:string';
8
6
 
9
- @mixin fontFace(
10
- $fontName: $fontName,
11
- $fontId: $fontId,
12
- $style: $style,
13
- $display: $display,
14
- $weight: $weight,
15
- $fontDir: $fontDir,
16
- $unicodeMap: $unicodeMap
17
- ) {
18
- @each $subset, $unicodeRangeValues in $unicodeMap {
19
- @font-face {
20
- font-family: "#{$fontName}";
21
- font-style: $style;
22
- font-display: $display;
23
- font-weight: $weight;
24
- src: url("#{$fontDir}/#{$fontId}-#{$subset}-#{$weight}-#{$style}.woff2") format("woff2"),
25
- url("#{$fontDir}/#{$fontId}-all-#{$weight}-#{$style}.woff") format("woff");
26
- unicode-range: $unicodeRangeValues;
27
- }
28
- }
29
- }
7
+ @use 'metadata';
30
8
 
31
- $defSubset: "latin";
32
- $unicodeRange: false;
33
- $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);
9
+ $metadata: meta.module-variables(metadata) !default;
10
+ $directory: null !default;
34
11
 
35
- @mixin fontFaceCustom(
36
- $fontName: $fontName,
37
- $fontId: $fontId,
38
- $style: $style,
12
+ $family: null !default;
13
+ $display: null !default;
14
+ $displayVar: null !default;
15
+ $formats: null !default;
16
+ $subsets: null !default;
17
+ $weights: null !default;
18
+ $styles: null !default;
19
+ $axes: null !default;
20
+
21
+ @mixin generator(
22
+ $metadata: $metadata,
23
+ $directory: $directory,
24
+ $family: $family,
39
25
  $display: $display,
40
- $weight: $weight,
41
- $woff2Path: null,
42
- $woffPath: null,
43
- $unicodeRange: $unicodeRange,
44
- $unicodeRangeValues: $unicodeRangeValues
26
+ $displayVar: $displayVar,
27
+ $formats: $formats,
28
+ $subsets: $subsets,
29
+ $weights: $weights,
30
+ $styles: $styles,
31
+ $axes: $axes
45
32
  ) {
46
- @if $woffPath == null {
47
- $woffPath: "#{$fontDir}/#{$fontId}-#{$defSubset}-#{$weight}-#{$style}.woff";
48
- }
49
- @if $woff2Path == null {
50
- $woff2Path: "#{$fontDir}/#{$fontId}-#{$defSubset}-#{$weight}-#{$style}.woff2";
51
- }
33
+ $directory: if(
34
+ $directory,
35
+ $directory,
36
+ '~@fontsource#{if(map.get($metadata, axes), '-variable', '')}/#{map.get($metadata, id)}/files'
37
+ );
52
38
 
53
- @font-face {
54
- font-family: "#{$fontName}";
55
- font-style: $style;
56
- font-display: $display;
57
- font-weight: $weight;
58
- src: url("#{$woff2Path}") format("woff2"), url("#{$woffPath}") format("woff");
59
- @if $unicodeRange {
60
- unicode-range: $unicodeRangeValues;
61
- }
62
- }
63
- }
39
+ $family: if(
40
+ $family,
41
+ $family,
42
+ map.get($metadata, family) + if(map.get($metadata, axes), ' Variable', '')
43
+ );
44
+ $display: if($display, $display, swap);
45
+ $displayVar: if($displayVar != null, $displayVar, true);
46
+ $formats: if(not $formats or $formats == all, (woff2, woff), $formats);
47
+ $subsets: if(
48
+ $subsets,
49
+ if($subsets == all, map.get($metadata, subsets), $subsets),
50
+ map.get($metadata, defaults, subset)
51
+ );
52
+ $weights: if(
53
+ $weights,
54
+ if($weights == all, map.get($metadata, weights), $weights),
55
+ map.get($metadata, defaults, weight)
56
+ );
57
+ $styles: if(
58
+ $styles,
59
+ if($styles == all, map.get($metadata, styles), $styles),
60
+ map.get($metadata, defaults, style)
61
+ );
62
+ $axes: if(
63
+ $axes,
64
+ if($axes == all, full, $axes),
65
+ if(map.get($metadata, axes), if(map.has-key($metadata, axes, wght), wght, full), null)
66
+ );
64
67
 
65
- $fontNameVariable: "Maven ProVariable";
66
- $weightVariable: 400 900;
67
- $type: "wghtOnly";
68
- $stretch: null;
68
+ @each $subset in $subsets {
69
+ @each $unicodeSubset, $unicodeRange in map.get($metadata, unicode) {
70
+ @if (
71
+ $subset ==
72
+ $unicodeSubset or
73
+ (
74
+ // Is numeric subset
75
+ $subset ==
76
+ map.get($metadata, defaults, subset) and not
77
+ list.index(map.get($metadata, subsets), $unicodeSubset)
78
+ )
79
+ ) {
80
+ @each $weight in if($axes, null, $weights) {
81
+ @each $axis in $axes {
82
+ @each $style in $styles {
83
+ $variant: '#{map.get($metadata, id)}-#{$unicodeSubset}-#{if($axis, $axis, $weight)}-#{$style}';
69
84
 
70
- @mixin fontFaceVariable(
71
- $fontName: $fontNameVariable,
72
- $fontId: $fontId,
73
- $style: $style,
74
- $display: $display,
75
- $weight: $weightVariable,
76
- $fontDir: $fontDir,
77
- $type: $type,
78
- $stretch: $stretch,
79
- $unicodeMap: $unicodeMap
80
- ) {
81
- @each $subset, $unicodeRangeValues in $unicodeMap {
82
- @font-face {
83
- font-family: "#{$fontName}";
84
- font-style: $style;
85
- font-display: $display;
86
- font-weight: $weight;
87
- @if $type == "full" {
88
- font-stretch: $stretch;
85
+ $src: ();
86
+ @each $format in $formats {
87
+ $src: append(
88
+ $src,
89
+ url('#{$directory}/#{$variant}.#{$format}')
90
+ format('#{$format}#{if($axis, '-variations', '')}'),
91
+ comma
92
+ );
93
+ }
94
+
95
+ @content ((
96
+ metadata: $metadata,
97
+ directory: $directory,
98
+ family: $family,
99
+ display: $display,
100
+ displayVar: $displayVar,
101
+ formats: $formats,
102
+ subsets: $subsets,
103
+ weights: $weights,
104
+ styles: $styles,
105
+ axes: $axes,
106
+
107
+ variant: $variant,
108
+ subset: $subset,
109
+ unicodeSubset: $unicodeSubset,
110
+ unicodeRange: $unicodeRange,
111
+ weight: $weight,
112
+ axis: $axis,
113
+ style: $style,
114
+
115
+ font-family: string.quote($family),
116
+ font-style: if(
117
+ ($axis == full or $axis == slnt) and map.has-key($metadata, axes, slnt),
118
+ oblique map.get($metadata, axes, slnt, min) + deg map.get($metadata, axes, slnt, max) + deg,
119
+ $style
120
+ ),
121
+ font-display: if($displayVar, var(--fontsource-display, $display), $display),
122
+ font-weight: if(
123
+ ($axis == full or $axis == wght) and map.has-key($metadata, axes, wght),
124
+ map.get($metadata, axes, wght, min) map.get($metadata, axes, wght, max),
125
+ $weight
126
+ ),
127
+ font-stretch: if(
128
+ ($axis == full or $axis == wdth) and map.has-key($metadata, axes, wdth),
129
+ '#{map.get($metadata, axes, wdth, min)}% #{map.get($metadata, axes, wdth, max)}%',
130
+ null
131
+ ),
132
+ src: $src,
133
+ unicode-range: $unicodeRange,
134
+ ));
135
+ }
136
+ }
137
+ }
89
138
  }
90
- src: url("#{$fontDir}/#{$fontId}-#{$subset}-variable-#{$type}-#{$style}.woff2") format("woff2");
91
- unicode-range: $unicodeRangeValues;
92
139
  }
93
140
  }
94
141
  }
95
142
 
96
- @mixin fontFaceVariableCustom(
97
- $fontName: $fontNameVariable,
98
- $fontId: $fontId,
99
- $style: $style,
143
+ @mixin faces(
144
+ $metadata: $metadata,
145
+ $directory: $directory,
146
+ $family: $family,
100
147
  $display: $display,
101
- $weight: $weightVariable,
102
- $woff2Path: null,
103
- $unicodeRange: $unicodeRange,
104
- $unicodeRangeValues: $unicodeRangeValues
148
+ $displayVar: $displayVar,
149
+ $formats: $formats,
150
+ $subsets: $subsets,
151
+ $weights: $weights,
152
+ $styles: $styles,
153
+ $axes: $axes
105
154
  ) {
106
- @if $woff2Path == null {
107
- $woff2Path: "#{$fontDir}/#{$fontId}-#{$defSubset}-variable-#{$type}-#{$style}.woff2";
108
- }
109
-
110
- @font-face {
111
- font-family: "#{$fontName}";
112
- font-style: $style;
113
- font-display: $display;
114
- font-weight: $weight;
115
- @if $type == "full" {
116
- font-stretch: $stretch;
117
- }
118
- src: url("#{$woff2Path}") format("woff2");
119
- @if $unicodeRange {
120
- unicode-range: $unicodeRangeValues;
155
+ @include generator(
156
+ $metadata: $metadata,
157
+ $directory: $directory,
158
+ $family: $family,
159
+ $display: $display,
160
+ $displayVar: $displayVar,
161
+ $formats: $formats,
162
+ $subsets: $subsets,
163
+ $weights: $weights,
164
+ $styles: $styles,
165
+ $axes: $axes
166
+ )
167
+ using ($props) {
168
+ /* #{map.get($props, variant)} */
169
+ @font-face {
170
+ font-family: map.get($props, font-family);
171
+ font-style: map.get($props, font-style);
172
+ font-display: map.get($props, font-display);
173
+ font-weight: map.get($props, font-weight);
174
+ font-stretch: map.get($props, font-stretch);
175
+ unicode-range: map.get($props, unicode-range);
176
+ src: map.get($props, src);
121
177
  }
122
178
  }
123
179
  }
package/unicode.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "vietnamese": "U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+1EA0-1EF9,U+20AB",
3
- "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",
4
- "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"
5
- }
2
+ "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",
3
+ "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",
4
+ "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"
5
+ }
@@ -1,9 +1,8 @@
1
- /* maven-pro-vietnamese-400-normal*/
1
+ /* maven-pro-vietnamese-400-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 400;
7
- src: url('./files/maven-pro-vietnamese-400-normal.woff2') format('woff2'), url('./files/maven-pro-vietnamese-400-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-vietnamese-400-normal.woff2) format('woff2'), url(./files/maven-pro-vietnamese-400-normal.woff) format('woff');
8
+ }
@@ -1,9 +1,8 @@
1
- /* maven-pro-vietnamese-500-normal*/
1
+ /* maven-pro-vietnamese-500-normal */
2
2
  @font-face {
3
3
  font-family: 'Maven Pro';
4
4
  font-style: normal;
5
- font-display: swap;
5
+ font-display: var(--fontsource-display, swap);
6
6
  font-weight: 500;
7
- src: url('./files/maven-pro-vietnamese-500-normal.woff2') format('woff2'), url('./files/maven-pro-vietnamese-500-normal.woff') format('woff');
8
-
9
- }
7
+ src: url(./files/maven-pro-vietnamese-500-normal.woff2) format('woff2'), url(./files/maven-pro-vietnamese-500-normal.woff) format('woff');
8
+ }