diff --git a/Base/res/fonts/ComicBookRegular10.font b/Base/res/fonts/ComicBookRegular10.font deleted file mode 100644 index 382a59804c..0000000000 Binary files a/Base/res/fonts/ComicBookRegular10.font and /dev/null differ diff --git a/Base/res/fonts/CsillaBold10.font b/Base/res/fonts/CsillaBold10.font deleted file mode 100644 index f6c71b4188..0000000000 Binary files a/Base/res/fonts/CsillaBold10.font and /dev/null differ diff --git a/Base/res/fonts/CsillaBold12.font b/Base/res/fonts/CsillaBold12.font deleted file mode 100644 index 0ea4f8bbde..0000000000 Binary files a/Base/res/fonts/CsillaBold12.font and /dev/null differ diff --git a/Base/res/fonts/CsillaRegular10.font b/Base/res/fonts/CsillaRegular10.font deleted file mode 100644 index d3ecbbe17c..0000000000 Binary files a/Base/res/fonts/CsillaRegular10.font and /dev/null differ diff --git a/Base/res/fonts/CsillaRegular12.font b/Base/res/fonts/CsillaRegular12.font deleted file mode 100644 index 70e74ddca9..0000000000 Binary files a/Base/res/fonts/CsillaRegular12.font and /dev/null differ diff --git a/Base/res/fonts/KaticaBold10.font b/Base/res/fonts/KaticaBold10.font deleted file mode 100644 index 38341b02f5..0000000000 Binary files a/Base/res/fonts/KaticaBold10.font and /dev/null differ diff --git a/Base/res/fonts/KaticaBold12.font b/Base/res/fonts/KaticaBold12.font deleted file mode 100644 index 5ac0482037..0000000000 Binary files a/Base/res/fonts/KaticaBold12.font and /dev/null differ diff --git a/Base/res/fonts/KaticaBoldOblique10.font b/Base/res/fonts/KaticaBoldOblique10.font deleted file mode 100644 index ea3f37e819..0000000000 Binary files a/Base/res/fonts/KaticaBoldOblique10.font and /dev/null differ diff --git a/Base/res/fonts/KaticaItalic10.font b/Base/res/fonts/KaticaItalic10.font deleted file mode 100644 index 99d51652da..0000000000 Binary files a/Base/res/fonts/KaticaItalic10.font and /dev/null differ diff --git a/Base/res/fonts/KaticaRegular10.font b/Base/res/fonts/KaticaRegular10.font deleted file mode 100644 index f12ac154a0..0000000000 Binary files a/Base/res/fonts/KaticaRegular10.font and /dev/null differ diff --git a/Base/res/fonts/KaticaRegular12.font b/Base/res/fonts/KaticaRegular12.font deleted file mode 100644 index aae326c6e9..0000000000 Binary files a/Base/res/fonts/KaticaRegular12.font and /dev/null differ diff --git a/Ladybird/FontPlugin.cpp b/Ladybird/FontPlugin.cpp index 317a016a49..2d870557b3 100644 --- a/Ladybird/FontPlugin.cpp +++ b/Ladybird/FontPlugin.cpp @@ -82,8 +82,8 @@ void FontPlugin::update_generic_fonts() // The lists are basically arbitrary, taken from https://www.w3.org/Style/Examples/007/fonts.en.html Vector cursive_fallbacks { "Comic Sans MS"_fly_string, "Comic Sans"_fly_string, "Apple Chancery"_fly_string, "Bradley Hand"_fly_string, "Brush Script MT"_fly_string, "Snell Roundhand"_fly_string, "URW Chancery L"_fly_string }; Vector fantasy_fallbacks { "Impact"_fly_string, "Luminari"_fly_string, "Chalkduster"_fly_string, "Jazz LET"_fly_string, "Blippo"_fly_string, "Stencil Std"_fly_string, "Marker Felt"_fly_string, "Trattatello"_fly_string }; - Vector monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "DejaVu Sans Mono"_fly_string, "Liberation Mono"_fly_string, "Csilla"_fly_string }; - Vector sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string, "Katica"_fly_string }; + Vector monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "DejaVu Sans Mono"_fly_string, "Liberation Mono"_fly_string }; + Vector sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string }; Vector serif_fallbacks { "Times"_fly_string, "Times New Roman"_fly_string, "Didot"_fly_string, "Georgia"_fly_string, "Palatino"_fly_string, "Bookman"_fly_string, "New Century Schoolbook"_fly_string, "American Typewriter"_fly_string, "Liberation Serif"_fly_string, "Roman"_fly_string }; update_mapping(Web::Platform::GenericFont::Cursive, cursive_fallbacks); diff --git a/Ladybird/cmake/ResourceFiles.cmake b/Ladybird/cmake/ResourceFiles.cmake index 56e51b4c06..4e4121f2ca 100644 --- a/Ladybird/cmake/ResourceFiles.cmake +++ b/Ladybird/cmake/ResourceFiles.cmake @@ -2,16 +2,6 @@ file(STRINGS "${LADYBIRD_SOURCE_DIR}/Meta/emoji-file-list.txt" EMOJI) list(TRANSFORM EMOJI PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/emoji/") set(FONTS - CsillaBold10.font - CsillaBold12.font - CsillaRegular10.font - CsillaRegular12.font - KaticaBold10.font - KaticaBold12.font - KaticaBoldOblique10.font - KaticaItalic10.font - KaticaRegular10.font - KaticaRegular12.font SerenitySans-Regular.ttf ) list(TRANSFORM FONTS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/fonts/") diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn index d987695060..1e0b5df7c0 100644 --- a/Meta/gn/secondary/Ladybird/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/BUILD.gn @@ -210,19 +210,7 @@ foreach(file, _emoji) { emoji += [ "//Base/res/emoji/" + file ] } -fonts = [ - "//Base/res/fonts/CsillaBold10.font", - "//Base/res/fonts/CsillaBold12.font", - "//Base/res/fonts/CsillaRegular10.font", - "//Base/res/fonts/CsillaRegular12.font", - "//Base/res/fonts/KaticaBold10.font", - "//Base/res/fonts/KaticaBold12.font", - "//Base/res/fonts/KaticaBoldOblique10.font", - "//Base/res/fonts/KaticaItalic10.font", - "//Base/res/fonts/KaticaRegular10.font", - "//Base/res/fonts/KaticaRegular12.font", - "//Base/res/fonts/SerenitySans-Regular.ttf", -] +fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ] icons_16x16 = [ "//Base/res/icons/16x16/app-browser.png", diff --git a/Tests/LibCompress/TestBrotli.cpp b/Tests/LibCompress/TestBrotli.cpp index 7102f9f8ce..810d27cb23 100644 --- a/Tests/LibCompress/TestBrotli.cpp +++ b/Tests/LibCompress/TestBrotli.cpp @@ -127,11 +127,6 @@ TEST_CASE(brotli_decompress_happy3rd_html) run_test("happy3rd.html"sv); } -TEST_CASE(brotli_decompress_katica_regular_10_font) -{ - run_test("KaticaRegular10.font"sv); -} - TEST_CASE(brotli_single_z) { run_test("single-z.txt"sv); diff --git a/Tests/LibCompress/brotli-test-files/KaticaRegular10.font b/Tests/LibCompress/brotli-test-files/KaticaRegular10.font deleted file mode 100644 index 4c19ad065b..0000000000 Binary files a/Tests/LibCompress/brotli-test-files/KaticaRegular10.font and /dev/null differ