Tidy font directory

* Give the MousePaint font files friendlier names * Move the HRCG conversions from the Applesoft Toolkit into subdir * Other misc tidying
a2stuff · Apr 3, 2024 · 4b11796 · 4b11796
1 parent 7ca9a55
commit 4b11796
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 47 deletions.
diff --git a/bin/manifest b/bin/manifest
@@ -153,12 +153,12 @@ if [[ -z "$no_sample_media" ]]; then
     # MGTK Fonts
     emit add_file $disposition "mgtk/fonts/System.en"      $mediafnt "System.en"      070000
     emit add_file $disposition "mgtk/fonts/Monaco.en"      $mediafnt "Monaco.en"      070000
-    emit add_file $disposition "mgtk/fonts/MP.FONT"        $mediafnt "MousePaint"     070000
+    emit add_file $disposition "mgtk/fonts/MousePaint"     $mediafnt "MousePaint"     070000
     emit add_file $disposition "mgtk/fonts/mini"           $mediafnt "Mini"           070000
-    emit add_file $disposition "mgtk/fonts/ATHENS"         $mediafnt "Athens"         070000
-    emit add_file $disposition "mgtk/fonts/NEW.YORK"       $mediafnt "New.York"       070000
-    emit add_file $disposition "mgtk/fonts/TORONTO"        $mediafnt "Toronto"        070000
-    emit add_file $disposition "mgtk/fonts/VENICE"         $mediafnt "Venice"         070000
+    emit add_file $disposition "mgtk/fonts/Athens"         $mediafnt "Athens"         070000
+    emit add_file $disposition "mgtk/fonts/New.York"       $mediafnt "New.York"       070000
+    emit add_file $disposition "mgtk/fonts/Toronto"        $mediafnt "Toronto"        070000
+    emit add_file $disposition "mgtk/fonts/Venice"         $mediafnt "Venice"         070000
 
     emit add_file $disposition "mgtk/fonts/fairfax/Fairfax.en"   $mediafnt "Fairfax.en"     070000
     emit add_file $disposition "mgtk/fonts/fairfax/FairfaxBd.en" $mediafnt "FairfaxBd.en"   070000
@@ -174,20 +174,20 @@ if [[ -z "$no_sample_media" ]]; then
     emit add_file $disposition "mgtk/fonts/erin/MontereyBd.en"   $mediafnt "MontereyBd.en"  070000
 
     # HRCG conversions
-    emit add_file $disposition "mgtk/fonts/ASCII"          $mediafnt "ASCII"          070000
-    emit add_file $disposition "mgtk/fonts/BLIPPO.BLACK"   $mediafnt "Blippo.Black"   070000
-    emit add_file $disposition "mgtk/fonts/BYTE"           $mediafnt "Byte"           070000
-    emit add_file $disposition "mgtk/fonts/COLOSSAL"       $mediafnt "Colossal"       070000
-    emit add_file $disposition "mgtk/fonts/COUNT"          $mediafnt "Count"          070000
-    emit add_file $disposition "mgtk/fonts/FLOW"           $mediafnt "Flow"           070000
-    emit add_file $disposition "mgtk/fonts/GOTHIC"         $mediafnt "Gothic"         070000
-    emit add_file $disposition "mgtk/fonts/MIRROR"         $mediafnt "Mirror"         070000
-    emit add_file $disposition "mgtk/fonts/OUTLINE"        $mediafnt "Outline"        070000
-    emit add_file $disposition "mgtk/fonts/PUDGY"          $mediafnt "Pudgy"          070000
-    emit add_file $disposition "mgtk/fonts/ROMAN"          $mediafnt "Roman"          070000
-    emit add_file $disposition "mgtk/fonts/SLANT"          $mediafnt "Slant"          070000
-    emit add_file $disposition "mgtk/fonts/STOP"           $mediafnt "Stop"           070000
-    emit add_file $disposition "mgtk/fonts/UPSIDE.DOWN"    $mediafnt "Upside.Down"    070000
-
-    emit add_file $disposition "mgtk/fonts/PIG.FONT"       $mediafnt "Pig.Font"       070000
+    emit add_file $disposition "mgtk/fonts/hrcg/ASCII"           $mediafnt "ASCII"          070000
+    emit add_file $disposition "mgtk/fonts/hrcg/BLIPPO.BLACK"    $mediafnt "Blippo.Black"   070000
+    emit add_file $disposition "mgtk/fonts/hrcg/BYTE"            $mediafnt "Byte"           070000
+    emit add_file $disposition "mgtk/fonts/hrcg/COLOSSAL"        $mediafnt "Colossal"       070000
+    emit add_file $disposition "mgtk/fonts/hrcg/COUNT"           $mediafnt "Count"          070000
+    emit add_file $disposition "mgtk/fonts/hrcg/FLOW"            $mediafnt "Flow"           070000
+    emit add_file $disposition "mgtk/fonts/hrcg/GOTHIC"          $mediafnt "Gothic"         070000
+    emit add_file $disposition "mgtk/fonts/hrcg/MIRROR"          $mediafnt "Mirror"         070000
+    emit add_file $disposition "mgtk/fonts/hrcg/OUTLINE"         $mediafnt "Outline"        070000
+    emit add_file $disposition "mgtk/fonts/hrcg/PUDGY"           $mediafnt "Pudgy"          070000
+    emit add_file $disposition "mgtk/fonts/hrcg/ROMAN"           $mediafnt "Roman"          070000
+    emit add_file $disposition "mgtk/fonts/hrcg/SLANT"           $mediafnt "Slant"          070000
+    emit add_file $disposition "mgtk/fonts/hrcg/STOP"            $mediafnt "Stop"           070000
+    emit add_file $disposition "mgtk/fonts/hrcg/UPSIDE.DOWN"     $mediafnt "Upside.Down"    070000
+
+    emit add_file $disposition "mgtk/fonts/Pig.Font"       $mediafnt "Pig.Font"       070000
 fi
diff --git a/mgtk/fonts/ATHENS → mgtk/fonts/Athens b/mgtk/fonts/ATHENS → mgtk/fonts/Athens
diff --git a/mgtk/fonts/MP.FONT → mgtk/fonts/MousePaint b/mgtk/fonts/MP.FONT → mgtk/fonts/MousePaint
diff --git a/mgtk/fonts/NEW.YORK → mgtk/fonts/New.York b/mgtk/fonts/NEW.YORK → mgtk/fonts/New.York
diff --git a/mgtk/fonts/PIG.FONT → mgtk/fonts/Pig.Font b/mgtk/fonts/PIG.FONT → mgtk/fonts/Pig.Font
diff --git a/mgtk/fonts/README.md b/mgtk/fonts/README.md
@@ -23,34 +23,16 @@ System.en     | Apple II DeskTop  | Single | 9
 System.fr     | MouseDesk 2.0 fr  | Single | 9
 System.de     | MouseDesk 1.0 de  | Single | 9
 System.it     | MouseDesk 1.0 it  | Single | 9
-System.nl     | custom            | Single | 9
-System.pt     | custom            | Single | 9
-System.es     | custom            | Single | 9
-System.sv     | custom            | Single | 9
-System.da     | custom            | Single | 9
+System.*      | custom            | Single | 9
 Monaco.*      | custom            | Single | 9
-MP.FONT       | MousePaint        | Single | 9
-ATHENS        | MousePaint        | Double | 12
-NEW.YORK      | MousePaint        | Double | 11
-TORONTO       | MousePaint        | Double | 11
-VENICE        | MousePaint        | Double | 10
-ASCII         | HRCG              | Single | 8
-BLIPPO.BLACK  | HRCG              | Single | 8
-BYTE          | HRCG              | Single | 8
-COLOSSAL      | HRCG              | Single | 8
-COUNT         | HRCG              | Single | 8
-FLOW          | HRCG              | Single | 8
-GOTHIC        | HRCG              | Single | 8
-MIRROR        | HRCG              | Single | 8
-OUTLINE       | HRCG              | Single | 8
-PINOCCHIO     | HRCG              | Single | 8
-PUDGY         | HRCG              | Single | 8
-ROMAN         | HRCG              | Single | 8
-SLANT         | HRCG              | Single | 8
-STOP          | HRCG              | Single | 8
-UPSIDE.DOWN   | HRCG              | Single | 8
+MousePaint    | MousePaint        | Single | 9
+Athens        | MousePaint        | Double | 12
+New.York      | MousePaint        | Double | 11
+Toronto       | MousePaint        | Double | 11
+Venice        | MousePaint        | Double | 10
+hrcg/*        | Applesoft Toolkit | Single | 8
 mini          | custom            | Single | 8
-PIG.FONT      | "The Pig Sty"     | Single | 8
+Pig.Font      | "The Pig Sty"     | Single | 8
 Fairfax.*     | Kreative Software | Single | 12
 FairfaxBd.*   | Kreative Software | Single | 12
 FairfaxIt.*   | Kreative Software | Single | 12

diff --git a/mgtk/fonts/TORONTO → mgtk/fonts/Toronto b/mgtk/fonts/TORONTO → mgtk/fonts/Toronto
diff --git a/mgtk/fonts/VENICE → mgtk/fonts/Venice b/mgtk/fonts/VENICE → mgtk/fonts/Venice
diff --git a/mgtk/fonts/ASCII → mgtk/fonts/hrcg/ASCII b/mgtk/fonts/ASCII → mgtk/fonts/hrcg/ASCII
diff --git a/mgtk/fonts/BLIPPO.BLACK → mgtk/fonts/hrcg/BLIPPO.BLACK b/mgtk/fonts/BLIPPO.BLACK → mgtk/fonts/hrcg/BLIPPO.BLACK
diff --git a/mgtk/fonts/BYTE → mgtk/fonts/hrcg/BYTE b/mgtk/fonts/BYTE → mgtk/fonts/hrcg/BYTE
diff --git a/mgtk/fonts/COLOSSAL → mgtk/fonts/hrcg/COLOSSAL b/mgtk/fonts/COLOSSAL → mgtk/fonts/hrcg/COLOSSAL
diff --git a/mgtk/fonts/COUNT → mgtk/fonts/hrcg/COUNT b/mgtk/fonts/COUNT → mgtk/fonts/hrcg/COUNT
diff --git a/mgtk/fonts/FLOW → mgtk/fonts/hrcg/FLOW b/mgtk/fonts/FLOW → mgtk/fonts/hrcg/FLOW
diff --git a/mgtk/fonts/GOTHIC → mgtk/fonts/hrcg/GOTHIC b/mgtk/fonts/GOTHIC → mgtk/fonts/hrcg/GOTHIC
diff --git a/mgtk/fonts/MIRROR → mgtk/fonts/hrcg/MIRROR b/mgtk/fonts/MIRROR → mgtk/fonts/hrcg/MIRROR
diff --git a/mgtk/fonts/OUTLINE → mgtk/fonts/hrcg/OUTLINE b/mgtk/fonts/OUTLINE → mgtk/fonts/hrcg/OUTLINE
diff --git a/mgtk/fonts/PINOCCHIO → mgtk/fonts/hrcg/PINOCCHIO b/mgtk/fonts/PINOCCHIO → mgtk/fonts/hrcg/PINOCCHIO
diff --git a/mgtk/fonts/PUDGY → mgtk/fonts/hrcg/PUDGY b/mgtk/fonts/PUDGY → mgtk/fonts/hrcg/PUDGY
diff --git a/mgtk/fonts/ROMAN → mgtk/fonts/hrcg/ROMAN b/mgtk/fonts/ROMAN → mgtk/fonts/hrcg/ROMAN
diff --git a/mgtk/fonts/SLANT → mgtk/fonts/hrcg/SLANT b/mgtk/fonts/SLANT → mgtk/fonts/hrcg/SLANT
diff --git a/mgtk/fonts/STOP → mgtk/fonts/hrcg/STOP b/mgtk/fonts/STOP → mgtk/fonts/hrcg/STOP
diff --git a/mgtk/fonts/UPSIDE.DOWN → mgtk/fonts/hrcg/UPSIDE.DOWN b/mgtk/fonts/UPSIDE.DOWN → mgtk/fonts/hrcg/UPSIDE.DOWN