uswds · maya · Mar 20, 2019 · Mar 10, 2019 · Mar 10, 2019 · Mar 10, 2019
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,9 +2,9 @@
 
 ### Files licensed under the SIL Open Font License
 
-The Source Sans Pro font files in `src/fonts/source-sans-pro` are a customized subset of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
 
-The Merriweather font files in `src/fonts/merriweather` are from [Google Web Fonts](https://www.google.com/fonts#UsePlace:use/Collection:Merriweather:400,300,400italic,700,700italic), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
+The Merriweather font files in `src/fonts/merriweather` are v2.001 from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
 
 The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL).
 

diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.eot b/src/fonts/merriweather/Latin-Merriweather-Black.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.ttf b/src/fonts/merriweather/Latin-Merriweather-Black.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.woff b/src/fonts/merriweather/Latin-Merriweather-Black.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-Black.woff2 b/src/fonts/merriweather/Latin-Merriweather-Black.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.eot b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-BlackItalic.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.eot b/src/fonts/merriweather/Latin-Merriweather-Bold.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.ttf b/src/fonts/merriweather/Latin-Merriweather-Bold.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.woff b/src/fonts/merriweather/Latin-Merriweather-Bold.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-Bold.woff2 b/src/fonts/merriweather/Latin-Merriweather-Bold.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.eot b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-BoldItalic.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.eot b/src/fonts/merriweather/Latin-Merriweather-Italic.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.ttf b/src/fonts/merriweather/Latin-Merriweather-Italic.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.woff b/src/fonts/merriweather/Latin-Merriweather-Italic.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-Italic.woff2 b/src/fonts/merriweather/Latin-Merriweather-Italic.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.eot b/src/fonts/merriweather/Latin-Merriweather-Light.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.ttf b/src/fonts/merriweather/Latin-Merriweather-Light.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.woff b/src/fonts/merriweather/Latin-Merriweather-Light.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-Light.woff2 b/src/fonts/merriweather/Latin-Merriweather-Light.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.eot b/src/fonts/merriweather/Latin-Merriweather-LightItalic.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.ttf b/src/fonts/merriweather/Latin-Merriweather-LightItalic.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff2 b/src/fonts/merriweather/Latin-Merriweather-LightItalic.woff2
diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.eot b/src/fonts/merriweather/Latin-Merriweather-Regular.eot
diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.ttf b/src/fonts/merriweather/Latin-Merriweather-Regular.ttf
diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.woff b/src/fonts/merriweather/Latin-Merriweather-Regular.woff
diff --git a/src/fonts/merriweather/Latin-Merriweather-Regular.woff2 b/src/fonts/merriweather/Latin-Merriweather-Regular.woff2
diff --git a/src/fonts/merriweather/merriweather-bold-webfont.eot b/src/fonts/merriweather/merriweather-bold-webfont.eot
diff --git a/src/fonts/merriweather/merriweather-bold-webfont.ttf b/src/fonts/merriweather/merriweather-bold-webfont.ttf
diff --git a/src/fonts/merriweather/merriweather-bold-webfont.woff b/src/fonts/merriweather/merriweather-bold-webfont.woff
diff --git a/src/fonts/merriweather/merriweather-bold-webfont.woff2 b/src/fonts/merriweather/merriweather-bold-webfont.woff2
diff --git a/src/fonts/merriweather/merriweather-italic-webfont.eot b/src/fonts/merriweather/merriweather-italic-webfont.eot
diff --git a/src/fonts/merriweather/merriweather-italic-webfont.ttf b/src/fonts/merriweather/merriweather-italic-webfont.ttf
diff --git a/src/fonts/merriweather/merriweather-italic-webfont.woff b/src/fonts/merriweather/merriweather-italic-webfont.woff
diff --git a/src/fonts/merriweather/merriweather-italic-webfont.woff2 b/src/fonts/merriweather/merriweather-italic-webfont.woff2
diff --git a/src/fonts/merriweather/merriweather-light-webfont.eot b/src/fonts/merriweather/merriweather-light-webfont.eot
diff --git a/src/fonts/merriweather/merriweather-light-webfont.ttf b/src/fonts/merriweather/merriweather-light-webfont.ttf
diff --git a/src/fonts/merriweather/merriweather-light-webfont.woff b/src/fonts/merriweather/merriweather-light-webfont.woff
diff --git a/src/fonts/merriweather/merriweather-light-webfont.woff2 b/src/fonts/merriweather/merriweather-light-webfont.woff2
diff --git a/src/fonts/merriweather/merriweather-regular-webfont.eot b/src/fonts/merriweather/merriweather-regular-webfont.eot
diff --git a/src/fonts/merriweather/merriweather-regular-webfont.ttf b/src/fonts/merriweather/merriweather-regular-webfont.ttf
diff --git a/src/fonts/merriweather/merriweather-regular-webfont.woff b/src/fonts/merriweather/merriweather-regular-webfont.woff
diff --git a/src/fonts/merriweather/merriweather-regular-webfont.woff2 b/src/fonts/merriweather/merriweather-regular-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-black-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-blackitalic-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-bolditalic-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-extralight-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-extralightitalic-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-italic-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-light-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-lightitalic-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-semibold-webfont.woff2
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.eot b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.eot
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.ttf b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.ttf
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff
diff --git a/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff2 b/src/fonts/source-sans-pro/sourcesanspro-semibolditalic-webfont.woff2
diff --git a/src/stylesheets/core/_system-tokens.scss b/src/stylesheets/core/_system-tokens.scss
@@ -208,31 +208,31 @@ $system-typeface-tokens: (
   ),
   'merriweather': (
     display-name: 'Merriweather Web',
-    cap-height: 385px,
+    cap-height: 371px,
     stack: $font-stack-georgia,
     src: (
       dir: 'merriweather',
       roman: (
         100: false,
         200: false,
-        300: 'merriweather-light-webfont',
-        400: 'merriweather-regular-webfont',
+        300: 'Latin-Merriweather-Light',
+        400: 'Latin-Merriweather-Regular',
         500: false,
         600: false,
-        700: 'merriweather-bold-webfont',
+        700: 'Latin-Merriweather-Bold',
         800: false,
-        900: false,
+        900: 'Latin-Merriweather-Black',
       ),
       italic: (
         100: false,
         200: false,
-        300: false,
-        400: 'merriweather-italic-webfont',
+        300: 'Latin-Merriweather-LightItalic',
+        400: 'Latin-Merriweather-Italic',
         500: false,
         600: false,
-        700: false,
+        700: 'Latin-Merriweather-BoldItalic',
         800: false,
-        900: false,
+        900: 'Latin-Merriweather-BlackItalic',
       ),
     ),
   ),
@@ -274,25 +274,25 @@ $system-typeface-tokens: (
       dir: 'source-sans-pro',
       roman: (
         100: false,
-        200: false,
+        200: 'sourcesanspro-extralight-webfont',
         300: 'sourcesanspro-light-webfont',
         400: 'sourcesanspro-regular-webfont',
         500: false,
-        600: false,
+        600: 'sourcesanspro-semibold-webfont',
         700: 'sourcesanspro-bold-webfont',
         800: false,
-        900: false,
+        900: 'sourcesanspro-black-webfont',
       ),
       italic: (
         100: false,
-        200: false,
-        300: false,
-        400: 'sourcesanspro-italic-webfont',
+        200: 'sourcesanspro-extralightitalic-webfont',
+        300: 'sourcesanspro-lightitalic-webfont',
+        400: 'sourcesanspro-regularitalic-webfont',
         500: false,
-        600: false,
-        700: false,
+        600: 'sourcesanspro-semibolditalic-webfont',
+        700: 'sourcesanspro-bolditalic-webfont',
         800: false,
-        900: false,
+        900: 'sourcesanspro-blackitalic-webfont',
       ),
     ),
   ),