Merge 84c49f5 into afc282c

Munter · Jul 15, 2020 · 0bc3d75 · 0bc3d75
2 parents afc282c + 84c49f5
commit 0bc3d75
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,10 @@ services:
   - docker
 language: node_js
 cache:
-  directories:
-    - node_modules
+  npm: true
+  apt: true
+  pip: true
+
 node_js:
   - 10
   - 12
@@ -14,10 +16,18 @@ addons:
     packages:
       - gcc-4.8
       - g++-4.8
+
 env: CXX="g++-4.8" CC="gcc-4.8"
 
-before_script:
-  - sudo pip install fonttools brotli zopfli
+before_install:
+  - sudo pip install -r requirements.txt
 
-script: 'npm install && npm run-script travis'
+script: 'npm run-script travis'
 after_success: '<coverage/lcov.info ./node_modules/coveralls/bin/coveralls.js'
+
+jobs:
+  include:
+    - os: osx
+      node_js: 14
+      before_cache:
+        - brew cleanup
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "lint": "eslint . && prettier --check '**/*.js'",
     "test": "mocha && npm run lint",
     "travis": "npm run coverage && npm run lint",
-    "coverage": "nyc --reporter=lcov --reporter=text -- mocha --reporter dot",
+    "coverage": "nyc --reporter=lcov --reporter=text -- mocha",
     "preversion": "offline-github-changelog --next=${npm_package_version} > CHANGELOG.md && git add CHANGELOG.md"
   },
   "bin": {

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+fonttools
+brotli
+zopfli
diff --git a/testdata/referenceImages/missingGlyphs/IBMPlexSans-Italic.woff b/testdata/referenceImages/missingGlyphs/IBMPlexSans-Italic.woff
diff --git a/testdata/referenceImages/missingGlyphs/IBMPlexSans-Regular.woff b/testdata/referenceImages/missingGlyphs/IBMPlexSans-Regular.woff
diff --git a/testdata/referenceImages/missingGlyphs/InputMono-Medium.woff2 b/testdata/referenceImages/missingGlyphs/InputMono-Medium.woff2
diff --git a/testdata/referenceImages/missingGlyphs/InputMono-Regular.woff2 b/testdata/referenceImages/missingGlyphs/InputMono-Regular.woff2
diff --git a/testdata/referenceImages/missingGlyphs/JimNightshade-400.woff2 b/testdata/referenceImages/missingGlyphs/JimNightshade-400.woff2
diff --git a/testdata/referenceImages/missingGlyphs/OutputSans-Bold.woff2 b/testdata/referenceImages/missingGlyphs/OutputSans-Bold.woff2
diff --git a/testdata/referenceImages/missingGlyphs/OutputSans-Regular.woff2 b/testdata/referenceImages/missingGlyphs/OutputSans-Regular.woff2
diff --git a/testdata/referenceImages/missingGlyphs/index.html b/testdata/referenceImages/missingGlyphs/index.html
@@ -4,35 +4,30 @@
     <meta charset="utf-8">
     <style>
       @font-face {
-        font-family: Output Sans;
-        src: url(OutputSans-Regular.woff2) format("woff2");
+        font-family: Jim Nightshade;
+        src: url(JimNightshade-400.woff2) format("woff2");
       }
 
       @font-face {
-        font-family: Output Sans;
-        src: url(OutputSans-Bold.woff2) format("woff2");
-        font-weight: 700;
+        font-family: IBMPlexSans;
+        src: url(IBMPlexSans-Regular.woff) format("woff");
       }
 
       @font-face {
-        font-family: Input Mono;
-        src: url(InputMono-Regular.woff2) format("woff2");
-      }
-
-      @font-face {
-        font-family: Input Mono;
-        src: url(InputMono-Medium.woff2) format("woff2");
-        font-weight: 700;
+        font-family: IBMPlexSans;
+        src: url(IBMPlexSans-Italic.woff) format("woff");
+        font-style: italic;
       }
 
       code {
-        font-family: Input Mono, monospace;
+        font-family: IBMPlexSans, monospace;
+        font-size: 400%;
       }
     </style>
   </head>
   <body>
-    <pre><code>load('中国').then(<strong>function</strong></code></pre>
+    <pre><code>load('中国').then(<em>function</em></code></pre>
 
-    <div style="font-family: Output Sans">Hello!</div>
+    <div style="font-family: Jim Nightshade; font-size: 400%;">Hello!</div>
   </body>
 </html>
diff --git a/testdata/referenceImages/unusedVariants/IBMPlexSans-Italic.woff b/testdata/referenceImages/unusedVariants/IBMPlexSans-Italic.woff
diff --git a/testdata/referenceImages/unusedVariants/IBMPlexSans-Regular.woff b/testdata/referenceImages/unusedVariants/IBMPlexSans-Regular.woff
diff --git a/testdata/referenceImages/unusedVariants/InputMono-Medium.woff2 b/testdata/referenceImages/unusedVariants/InputMono-Medium.woff2
diff --git a/testdata/referenceImages/unusedVariants/InputMono-Regular.woff2 b/testdata/referenceImages/unusedVariants/InputMono-Regular.woff2
diff --git a/testdata/referenceImages/unusedVariants/index.html b/testdata/referenceImages/unusedVariants/index.html
@@ -3,18 +3,19 @@
   <head>
     <style>
       @font-face {
-        font-family: Input Mono;
-        src: url(InputMono-Regular.woff2) format("woff2");
+        font-family: IBMPlexSans;
+        src: url(IBMPlexSans-Regular.woff) format("woff");
       }
 
       @font-face {
-        font-family: Input Mono;
-        src: url(InputMono-Medium.woff2) format("woff2");
-        font-weight: 700;
+        font-family: IBMPlexSans;
+        src: url(IBMPlexSans-Italic.woff) format("woff");
+        font-style: italic;
       }
 
       code {
-        font-family: Input Mono, monospace;
+        font-family: IBMPlexSans, monospace;
+        font-size: 400%;
       }
     </style>
   </head>