Improve font settings [take 2]

src/stylesheets/core/_font-face.scss

@@ -1,16 +1,11 @@
 /* stylelint-disable */
 
-@if $theme-font-mono {
-  @include render-font-face($theme-font-mono);
-}
-@if $theme-font-sans {
-  @include render-font-face($theme-font-sans);
-}
-@if $theme-font-serif {
-  @include render-font-face($theme-font-serif);
-}
-@if $theme-font-cond {
-  @include render-font-face($theme-font-cond);
+@each $font-type-token, $metadata in $project-font-type-tokens {
+  @if map-get($metadata, 'typeface-token') {
+    $this-typeface-token: map-get($metadata, 'typeface-token');
+    $this-src: map-get($metadata, 'src');
+    @include render-font-face($this-typeface-token, $this-src);
+  }
 }
 
 /* stylelint-enable */

src/stylesheets/core/_functions.scss

@@ -414,24 +414,41 @@ queries
   @return $rem-to-user-em;
 }
 
+/*
+----------------------------------------
+validate-typeface-token()
+----------------------------------------
+Check to see if a typeface-token exists.
+Throw an error if a passed token does
+not exist in the typeface-token map.
+----------------------------------------
+*/
+
+@function validate-typeface-token($typeface-token) {
+  @if not map-has-key($all-typeface-tokens, $typeface-token) {
+    @error '`#{$typeface-token}` is not a valid typeface token. '
+      + 'Valid tokens: #{map-keys($all-typeface-tokens)} ';
+  }
+
+  @return $typeface-token;
+}
+
 /*
 ----------------------------------------
 cap-height()
 ----------------------------------------
-Get the cap height of a defined font
+Get the cap height of a valid typeface
 ----------------------------------------
 */
 
-@function cap-height($font) {
-  @if not $font {
+@function cap-height($typeface-token) {
+  @if not $typeface-token {
     @return false;
   }
 
-  @return map-deep-get(
-    $all-font-definitions,
-    $font,
-    'cap-height'
-  );
+  $typeface-token: validate-typeface-token($typeface-token);
+  $token-data: map-get($all-typeface-tokens, $typeface-token);
+  @return map-get($token-data, 'cap-height');
 }
 
 /*
@@ -553,6 +570,76 @@ a family and a line-height scale unit
   @return lh($props...);
 }
 
+/*
+----------------------------------------
+convert-to-font-type()
+----------------------------------------
+Converts a font-role token into a
+font-type token. Leaves font-type tokens
+unchanged.
+----------------------------------------
+*/
+
+@function convert-to-font-type($token) {
+  @if map-has-key($project-font-role-tokens, $token) {
+    @return map-get($project-font-role-tokens, $token);
+  }
+
+  @return $token;
+}
+
+/*
+----------------------------------------
+get-font-stack()
+----------------------------------------
+Get a font stack from a style- or
+role-based font token.
+----------------------------------------
+*/
+
+@function get-font-stack($token) {
+  $type-token: convert-to-font-type($token);
+  $this-stack: null;
+  $this-font-map: map-get($project-font-type-tokens, $type-token);
+  @if map-get($this-font-map, 'typeface-token') {
+    $this-font-token: map-get($this-font-map, 'typeface-token');
+    $this-name: map-deep-get(
+      $all-typeface-tokens,
+      $this-font-token,
+      'display-name'
+    );
+    @if map-get($this-font-map, 'custom-stack') {
+      $this-stack: map-get($this-font-map, 'custom-stack');
+    }
+    @else {
+      $this-stack: map-deep-get(
+        $all-typeface-tokens,
+        $this-font-token,
+        'stack'
+      );
+    }
+    @return #{$this-name}, #{$this-stack};
+  }
+  @return false;
+}
+
+/*
+----------------------------------------
+get-typeface-token()
+----------------------------------------
+Get a typeface token from a font-type or
+font-role token.
+----------------------------------------
+*/
+
+@function get-typeface-token($font-token) {
+  $this-token: $font-token;
+  @if map-has-key($project-font-role-tokens, $font-token) {
+    $this-token: map-get($project-font-role-tokens, $font-token);
+  }
+  @return map-deep-get($project-font-type-tokens, $this-token, 'typeface-token');
+}
+
 /*
 ----------------------------------------
 get-system-color()