minor changes to distribution file structure

3 files changed, 31 insertions, 37 deletions

diff --git a/misc/dist/extras-readme.txt b/misc/dist/extras-readme.txt
deleted file mode 100644
index 6bb68c9c5..000000000
--- a/misc/dist/extras-readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Inter extras
-
-This directory contains some additional "bonus" content:
-
-  otf/                 Individual static font files in CFF ("type-1") format
-  ttf/                 Individual static font files with TrueType hints
-  woff with TT hints/  Web fonts with TrueType hints
-
diff --git a/misc/dist/help.txt b/misc/dist/help.txt
index 3d1e9b278..fdec8d9c6 100644
--- a/misc/dist/help.txt
+++ b/misc/dist/help.txt
@@ -12,15 +12,16 @@ Contents:
 
 File index:
   Inter.ttc            Complete font family "Inter"
-  Inter Variable*.ttf  Complete font family "Inter Variable"
-  Web/*                Web fonts and CSS
+  Inter-Variable*.ttf  Complete font family "Inter Variable"
+  web/*                Web fonts and CSS
+  extras/              Alternative formats (see "Extras")
 
 ---------------------------------------------------------------------
 
 1. Installing font files
 
   Inter fonts comes in two flavors:
-  Variable (Inter Variable*.ttf) and Static (Inter.ttc)
+  Variable (Inter-Variable*.ttf) and Static (Inter.ttc)
 
   Variable fonts allow you to choose any weight and optical size in
   supported software. Variable fonts is a relatively recent new
@@ -40,8 +41,8 @@ File index:
 
   1. Open the "Font Book" application.
   2. In the main menu, select "File" → "Add Fonts..."
-  3. Select "Inter.ttc", "Inter Variable.ttf" and
-     "Inter Variable Italic.ttf"
+  3. Select "Inter.ttc", "Inter-Variable.ttf" and
+     "Inter-Variable-Italic.ttf"
   4. Press the "Open" button
 
   Alternatively, if you prefer not to use Font Book, you can move or
@@ -51,8 +52,8 @@ File index:
 1.2. Installing on Microsoft Windows
 
   1. Open the zip file you downloaded
-  2. Select "Inter.ttc", "Inter Variable.ttf" and
-     "Inter Variable Italic.ttf"
+  2. Select "Inter.ttc", "Inter-Variable.ttf" and
+     "Inter-Variable-Italic.ttf"
   3. Right-click the selected files, choose "Install for all users"
 
   If you have a previous installation of Inter, you should make sure
@@ -64,8 +65,8 @@ File index:
 1.3. Installing on Ubuntu Linux
 
   1. Create a ".fonts" directory in your home. (mkdir -p ~/.fonts)
-  2. Copy "Inter.ttc", "Inter Variable.ttf" and
-     "Inter Variable Italic.ttf" into your .fonts directory
+  2. Copy "Inter.ttc", "Inter-Variable.ttf" and
+     "Inter-Variable-Italic.ttf" into your .fonts directory
      (cp Inter.ttc *.ttf ~/.fonts/)
 
   You may have to restart apps and/or your window server session.
@@ -130,16 +131,18 @@ File index:
   change in a future release.
 
   Note that the web fonts does not contain hints to minimize file
-  size. You can get hinted web fonts from the "extras" distribution.
+  size. You can get hinted web fonts from the "extras/woff-hinted"
+  directory.
 
 ---------------------------------------------------------------------
 
 4. Extras
 
-  There's a separate zip file, available from the URL below, which
-  contains some additional content, like individual otf & ttf files.
+  The "extras" directory contains some additional "bonus" content:
 
-  Get a copy at:  https://github.com/rsms/inter/releases/latest
+  otf/          Static font files in CFF format
+  ttf/          Static font files with TrueType hints
+  woff-hinted/  Web fonts with TrueType hints
 
 ---------------------------------------------------------------------
 
diff --git a/misc/makezip2.sh b/misc/makezip2.sh
index e11eef011..b34e72195 100644
--- a/misc/makezip2.sh
+++ b/misc/makezip2.sh
@@ -49,31 +49,30 @@ mkdir -p "$(dirname "$OUTFILE_ABS")" "$ZIPDIR"
 cp LICENSE.txt "$ZIPDIR/LICENSE.txt"
 
 
-mkdir -p "$ZIPDIR/Web"
+mkdir -p "$ZIPDIR/web"
 
-cp misc/dist/help.txt                     "$ZIPDIR/Help.txt"
+cp misc/dist/help.txt                     "$ZIPDIR/help.txt"
 
 cp build/fonts/static-hinted/Inter.ttc    "$ZIPDIR/Inter.ttc"
 
-cp build/fonts/var/InterV.var.ttf         "$ZIPDIR/Inter Variable.ttf"
-cp build/fonts/var/InterV-Italic.var.ttf  "$ZIPDIR/Inter Variable Italic.ttf"
+cp build/fonts/var/InterV.var.ttf         "$ZIPDIR/Inter-Variable.ttf"
+cp build/fonts/var/InterV-Italic.var.ttf  "$ZIPDIR/Inter-Variable-Italic.ttf"
 
-cp build/fonts/static/Inter-*.woff2       "$ZIPDIR/Web/" &
-cp build/fonts/var/Inter.var.woff2        "$ZIPDIR/Web/InterVariable.woff2"
-cp build/fonts/var/Inter-Italic.var.woff2 "$ZIPDIR/Web/InterVariable-Italic.woff2"
-cp misc/dist/inter.css                    "$ZIPDIR/Web/"
+cp build/fonts/static/Inter-*.woff2       "$ZIPDIR/web/" &
+cp build/fonts/var/Inter.var.woff2        "$ZIPDIR/web/InterVariable.woff2"
+cp build/fonts/var/Inter-Italic.var.woff2 "$ZIPDIR/web/InterVariable-Italic.woff2"
+cp misc/dist/inter.css                    "$ZIPDIR/web/"
 
 . build/venv/bin/activate
-python misc/tools/patch-version.py "$ZIPDIR/Web/inter.css"
+python misc/tools/patch-version.py "$ZIPDIR/web/inter.css"
 
-mkdir -p "$ZIPDIR/Extras/otf" \
-         "$ZIPDIR/Extras/ttf" \
-         "$ZIPDIR/Extras/woff with TT hints"
+mkdir -p "$ZIPDIR/extras/otf" \
+         "$ZIPDIR/extras/ttf" \
+         "$ZIPDIR/extras/woff-hinted"
 
-cp misc/dist/extras-readme.txt             "$ZIPDIR/Extras/README.txt"
-cp build/fonts/static/Inter-*.otf          "$ZIPDIR/Extras/otf/" &
-cp build/fonts/static-hinted/Inter-*.ttf   "$ZIPDIR/Extras/ttf/" &
-cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/Extras/woff with TT hints/" &
+cp build/fonts/static/Inter-*.otf          "$ZIPDIR/extras/otf/" &
+cp build/fonts/static-hinted/Inter-*.ttf   "$ZIPDIR/extras/ttf/" &
+cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/extras/woff-hinted/" &