core: Include a regular subsetted Noto Sans as the default font

Author: evilpie

core/assets/noto-sans-definefont3.bin

@@ -0,0 +1,14 @@
+# Download Noto Sans from https://fonts.google.com/noto/specimen/Noto+Sans
+# Run `pyftsubset --unicodes-file=unicodes-file.txt NotoSans-Regular.ttf`
+0000-007F, # Basic Latin
+0080-00FF, # Latin-1 Supplement
+0100-017F, # Latin Extended-A
+0180-024F, # Latin Extended-B
+02B0-02FF, # Spacing Modifier Letters
+2000-206F, # General Punctuation
+2070-209F, # Superscripts and Subscripts
+20A0-20CF, # Currency Symbols
+2100-214F, # Letterlike Symbols
+2150-218F, # Number Forms
+2200-22FF, # Mathematical Operators
+# Compress with `cat NotoSans-Regular.subset.ttf | gzip --no-name | tail --bytes=+11 | head --bytes=-8 > notosans-regular.subset.ttf.gz`

core/assets/noto-sans.fla

@@ -1074,35 +1074,31 @@ impl Default for TextRenderSettings {
 
 #[cfg(test)]
 mod tests {
-    use crate::font::{EvalParameters, Font, FontType};
+    use crate::font::{EvalParameters, Font, FontDescriptor, FontType};
     use crate::string::WStr;
+    use flate2::read::DeflateDecoder;
     use gc_arena::{rootless_arena, Mutation};
-    use ruffle_render::backend::{null::NullRenderer, ViewportDimensions};
+    use std::borrow::Cow;
+    use std::io::Read;
     use swf::Twips;
 
-    const DEVICE_FONT_TAG: &[u8] = include_bytes!("../assets/noto-sans-definefont3.bin");
+    const DEVICE_FONT: &[u8] = include_bytes!("../assets/notosans-regular.subset.ttf.gz");
 
     fn with_device_font<F>(callback: F)
     where
         F: for<'gc> FnOnce(&Mutation<'gc>, Font<'gc>),
     {
         rootless_arena(|mc| {
-            let mut renderer = NullRenderer::new(ViewportDimensions {
-                width: 0,
-                height: 0,
-                scale_factor: 1.0,
-            });
-            let mut reader = swf::read::Reader::new(DEVICE_FONT_TAG, 8);
-            let device_font = Font::from_swf_tag(
-                mc,
-                &mut renderer,
-                reader
-                    .read_define_font_2(3)
-                    .expect("Built-in font should compile"),
-                reader.encoding(),
-                FontType::Device,
-            );
-
+            let mut data = Vec::new();
+            let mut decoder = DeflateDecoder::new(DEVICE_FONT);
+            decoder
+                .read_to_end(&mut data)
+                .expect("default font decompression must succeed");
+
+            let descriptor = FontDescriptor::from_parts("Noto Sans", false, false);
+            let device_font =
+                Font::from_font_file(mc, descriptor, Cow::Owned(data), 0, FontType::Device)
+                    .unwrap();
             callback(mc, device_font);
         })
     }

core/assets/noto-sans.swf

@@ -71,7 +71,7 @@ use web_time::Instant;
 pub const NEWEST_PLAYER_VERSION: u8 = 32;
 
 #[cfg(feature = "default_font")]
-pub const FALLBACK_DEVICE_FONT_TAG: &[u8] = include_bytes!("../assets/noto-sans-definefont3.bin");
+pub const FALLBACK_DEVICE_FONT: &[u8] = include_bytes!("../assets/notosans-regular.subset.ttf.gz");
 
 #[derive(Collect)]
 #[collect(no_drop)]
@@ -2907,12 +2907,23 @@ impl PlayerBuilder {
 
         #[cfg(feature = "default_font")]
         {
-            let mut font_reader = swf::read::Reader::new(FALLBACK_DEVICE_FONT_TAG, 8);
-            let font_tag = font_reader
-                .read_define_font_2(3)
-                .expect("Built-in font should compile");
-            player_lock
-                .register_device_font(FontDefinition::SwfTag(font_tag, font_reader.encoding()));
+            use flate2::read::DeflateDecoder;
+            use std::io::Read;
+
+            let mut data = Vec::new();
+            let mut decoder = DeflateDecoder::new(FALLBACK_DEVICE_FONT);
+            decoder
+                .read_to_end(&mut data)
+                .expect("default font decompression must succeed");
+
+            player_lock.register_device_font(FontDefinition::FontFile {
+                name: "Noto Sans".into(),
+                is_bold: false,
+                is_italic: false,
+                data,
+                index: 0,
+            });
+
             player_lock.set_default_font(DefaultFont::Sans, vec!["Noto Sans".to_string()]);
             player_lock.set_default_font(DefaultFont::Serif, vec!["Noto Sans".to_string()]);
             player_lock.set_default_font(DefaultFont::Typewriter, vec!["Noto Sans".to_string()]);