SharkPool/Font-Manager: updates (#1745)

- use the new validation APIs from TurboWarp/scratch-vm#231, otherwise adding system font "Arial" will be broken once that goes live
- make the default add custom font block actually do something
- add Chinese, Japanese, Korean fallback fonts
- rename "Scratch" fallback font

Author: GarboMuffin

extensions/SharkPool/Font-Manager.js

@@ -114,11 +114,11 @@
             arguments: {
               NAME: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: "Pusab",
+                defaultValue: "Lobster",
               },
               URL: {
                 type: Scratch.ArgumentType.STRING,
-                defaultValue: "",
+                defaultValue: "https://extensions.turbowarp.org/Lobster.woff2",
               },
               BACKUP: {
                 type: Scratch.ArgumentType.STRING,
@@ -236,15 +236,52 @@
               },
             ],
           },
-          FALLBACKS: [
-            "Sans Serif",
-            "Serif",
-            "Handwriting",
-            "Marker",
-            "Curly",
-            "Pixel",
-            "Scratch",
-          ],
+          FALLBACKS: {
+            acceptReporters: false,
+            items: [
+              {
+                text: "Sans Serif",
+                value: "Sans Serif",
+              },
+              {
+                text: "Serif",
+                value: "Serif",
+              },
+              {
+                text: "Handwriting",
+                value: "Handwriting",
+              },
+              {
+                text: "Marker",
+                value: "Marker",
+              },
+              {
+                text: "Curly",
+                value: "Curly",
+              },
+              {
+                text: "Pixel",
+                value: "Pixel",
+              },
+              {
+                text: "Mopeds",
+                value: "Scratch",
+              },
+              {
+                text: "中文",
+                value: '"Microsoft YaHei", "微软雅黑", STXihei, "华文细黑"',
+              },
+              {
+                text: "한국어",
+                value: "Malgun Gothic",
+              },
+              {
+                text: "日本語",
+                value:
+                  '"ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic"',
+              },
+            ],
+          },
           FILES: {
             acceptReporters: true,
             items: FONT_EXTENSIONS.map((i) => `.${i}`),
@@ -280,14 +317,14 @@
 
     addSystemFont(args) {
       const name = Scratch.Cast.toString(args.NAME);
-      if (fontManager.isValidFamily(name)) {
+      if (fontManager.isValidSystemFont(name)) {
         fontManager.addSystemFont(name, Scratch.Cast.toString(args.BACKUP));
       }
     }
 
     async addCustomFont(args) {
       const name = Scratch.Cast.toString(args.NAME);
-      if (!fontManager.isValidFamily(name)) {
+      if (!fontManager.isValidCustomFont(name)) {
         return;
       }
 

licenses/OFL-Lobster.txt

@@ -0,0 +1,93 @@
+Copyright 2010 The Lobster Project Authors (https://github.com/impallari/The-Lobster-Font), with Reserved Font Name "Lobster".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.