Merge branch 'master' of github.com:rsms/interv3.8

2 files changed, 29 insertions, 10 deletions

diff --git a/docs/inter.css b/docs/inter.css
index 95c9c2b18..41190284b 100644
--- a/docs/inter.css
+++ b/docs/inter.css
@@ -6,6 +6,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 100;
+  font-display: swap;
   src: url("font-files/Inter-Thin.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Thin.woff?v={{font_v}}") format("woff");
 }
@@ -13,6 +14,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 100;
+  font-display: swap;
   src: url("font-files/Inter-ThinItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-ThinItalic.woff?v={{font_v}}") format("woff");
 }
@@ -21,6 +23,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 200;
+  font-display: swap;
   src: url("font-files/Inter-ExtraLight.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-ExtraLight.woff?v={{font_v}}") format("woff");
 }
@@ -28,6 +31,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 200;
+  font-display: swap;
   src: url("font-files/Inter-ExtraLightItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-ExtraLightItalic.woff?v={{font_v}}") format("woff");
 }
@@ -36,6 +40,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 300;
+  font-display: swap;
   src: url("font-files/Inter-Light.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Light.woff?v={{font_v}}") format("woff");
 }
@@ -43,6 +48,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 300;
+  font-display: swap;
   src: url("font-files/Inter-LightItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-LightItalic.woff?v={{font_v}}") format("woff");
 }
@@ -51,6 +57,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 400;
+  font-display: swap;
   src: url("font-files/Inter-Regular.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Regular.woff?v={{font_v}}") format("woff");
 }
@@ -58,6 +65,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 400;
+  font-display: swap;
   src: url("font-files/Inter-Italic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Italic.woff?v={{font_v}}") format("woff");
 }
@@ -66,6 +74,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 500;
+  font-display: swap;
   src: url("font-files/Inter-Medium.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Medium.woff?v={{font_v}}") format("woff");
 }
@@ -73,6 +82,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 500;
+  font-display: swap;
   src: url("font-files/Inter-MediumItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-MediumItalic.woff?v={{font_v}}") format("woff");
 }
@@ -81,6 +91,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 600;
+  font-display: swap;
   src: url("font-files/Inter-SemiBold.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-SemiBold.woff?v={{font_v}}") format("woff");
 }
@@ -88,6 +99,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 600;
+  font-display: swap;
   src: url("font-files/Inter-SemiBoldItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-SemiBoldItalic.woff?v={{font_v}}") format("woff");
 }
@@ -96,6 +108,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 700;
+  font-display: swap;
   src: url("font-files/Inter-Bold.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Bold.woff?v={{font_v}}") format("woff");
 }
@@ -103,6 +116,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 700;
+  font-display: swap;
   src: url("font-files/Inter-BoldItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-BoldItalic.woff?v={{font_v}}") format("woff");
 }
@@ -111,6 +125,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 800;
+  font-display: swap;
   src: url("font-files/Inter-ExtraBold.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-ExtraBold.woff?v={{font_v}}") format("woff");
 }
@@ -118,6 +133,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 800;
+  font-display: swap;
   src: url("font-files/Inter-ExtraBoldItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-ExtraBoldItalic.woff?v={{font_v}}") format("woff");
 }
@@ -126,6 +142,7 @@ layout: none
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 900;
+  font-display: swap;
   src: url("font-files/Inter-Black.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-Black.woff?v={{font_v}}") format("woff");
 }
@@ -133,6 +150,7 @@ layout: none
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 900;
+  font-display: swap;
   src: url("font-files/Inter-BlackItalic.woff2?v={{font_v}}") format("woff2"),
        url("font-files/Inter-BlackItalic.woff?v={{font_v}}") format("woff");
 }
@@ -151,6 +169,7 @@ Usage:
   font-weight: 100 900;
   font-style: normal;
   font-named-instance: 'Regular';
+  font-display: swap;
   src: url("font-files/Inter-upright.var.woff2?v={{font_v}}") format("woff2");
 }
 @font-face {
@@ -158,6 +177,7 @@ Usage:
   font-weight: 100 900;
   font-style: italic;
   font-named-instance: 'Italic';
+  font-display: swap;
   src: url("font-files/Inter-italic.var.woff2?v={{font_v}}") format("woff2");
 }
 
@@ -167,6 +187,7 @@ Usage:
   font-weight: 100 900;
   font-style: normal;
   font-named-instance: 'Regular';
+  font-display: swap;
   src: url("font-files/Inter-upright.var.woff2?v={{font_v}}") format("woff2");
 }
 @font-face {
@@ -174,6 +195,7 @@ Usage:
   font-weight: 100 900;
   font-style: italic;
   font-named-instance: 'Italic';
+  font-display: swap;
   src: url("font-files/Inter-italic.var.woff2?v={{font_v}}") format("woff2");
 }
 
@@ -195,5 +217,6 @@ explicitly, e.g.
   font-family: 'Inter var experimental';
   font-weight: 100 900;
   font-style: oblique 0deg 10deg;
+  font-display: swap;
   src: url("font-files/Inter.var.woff2?v={{font_v}}") format("woff2");
 }
diff --git a/misc/dist/install-win.txt b/misc/dist/install-win.txt
index 1a227aa06..fd3c0e286 100644
--- a/misc/dist/install-win.txt
+++ b/misc/dist/install-win.txt
@@ -3,18 +3,14 @@ Installing on Windows 10:
 
 1. Open the "Inter (OTF)" folder
 2. Select all font files
-3. Right-click the selected files and choose "Install"
-
-
-Installing on Windows 10, manually:
-
-1. Double-click the downloaded zip file
-2. Copy the "Inter (OTF)" folder
-3. Press Win-Q on your keyboard, then type "fonts" and hit ENTER
-4. Paste the "Inter (OTF)" folder.
+3. Copy and paste the font files to your Desktop
+4. Select all the font files on your Desktop
+5. Right-click the selected files and choose "Install for all users"
 
 If you have a previous installation of Inter, you should make sure
-to remove those fonts files before installing new ones.
+to remove those fonts files before installing new ones. You need to
+install the font for all users, as some software requires fonts to be
+global.
 
 
 ClearType-hinted fonts