diff --git a/CMakeLists.txt b/CMakeLists.txt index c39ff7ba36..7c8fc4463b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,14 +31,17 @@ else() endif() if(MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast") + # These are needed for MSVC to play ball as much as possible + # with the /EHs- flag + add_definitions("-D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast /EHs- /GR-") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast /EHs- /GR-") # get the number of logical cores for parallel build if (NOT CLANG) cmake_host_system_information(RESULT LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES) math(EXPR COMPILE_CORES "${LOGICAL_CORES} - 1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MD /MP${COMPILE_CORES}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MD /EHa /MP${COMPILE_CORES}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MD /MP${COMPILE_CORES}") endif() # To use the sanitizer with MSVC, you will need to either have your Visual Studio # or Build Tools install in your PATH variable, or copy the appropriate DLL to the program @@ -58,8 +61,8 @@ if(MSVC) set(CMAKE_EXE_LINKER_FLAGS "/SUBSYSTEM:WINDOWS") endif() else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-exceptions -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti -fno-strict-aliasing") if (OBSIDIAN_SANITIZE AND OBSIDIAN_SANITIZE_UB) message( FATAL_ERROR "Enable only one of OBSIDIAN_SANITIZE or OBSIDIAN_SANITIZE_UB!" ) elseif (OBSIDIAN_SANITIZE) diff --git a/data/License Attribution.txt b/data/License Attribution.txt index 543ade5b55..d7e9e0ca00 100644 --- a/data/License Attribution.txt +++ b/data/License Attribution.txt @@ -2,13 +2,6 @@ BSD 3-Clause License =========================================================================================== -3270 Font - Copyright (c) 2011-2017, Ricardo Banffy. - Copyright (c) 1993-2011, Paul Mattes. - Copyright (c) 2004-2005, Don Russell. - Copyright (c) 2004, Dick Altenbern. - Copyright (c) 1990, Jeff Sparkes. - Copyright (c) 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA 30332. - Blasphemer (Assorted graphic assets) - Copyright (c) 2021 Contributors to the Blasphemer project Freedoom (Assorted graphic assets) - Copyright (c) 2001-2019 Contributors to the Freedoom project @@ -123,31 +116,6 @@ miniz - Copyright (c) 2013-2014 RAD Game Tools and Valve Software Copyright (c) 2010-2014 Rich Geldreich and Tenacious Software LLC -=========================================================================================== -SIL Open Font License -=========================================================================================== - -Avenixel - Copyright (c) 2020 Gabriel Sammartino (https://www.behance.net/webcreativity | contact@gabrielsammartino.com), - with Reserved Font Name Avenixel. - -Drama Sans - Copyright (c) 2018 Drama Sans (dramasans@outlook.com), - with Reserved Font Name "Drama Sans". - -FPD Pressure - Copyright (c) 2020 Felix Summ - -Kalam - Copyright (c) 2014 Indian Type Foundry (info@indiantypefoundry.com) - -MiniSmallCaps (renamed to "Sam I Am") - Copyright (c) 2019 Sam Trenholme - -Source Sans Pro (renamed to "Sauce") - Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’ - -Teko - Copyright (c) 2014, Indian Type Foundry (info@indiantypefoundry.com) - -The Neue Black (renamed to "New Black") - Copyright (c) 2019-2021, Tre Seals , Micah Rich , The League of Moveable Type Limited Liability Company -with Reserved Font Name: "The Neue Black" - -Workbench - Copyright (c) 2019, Jens Kutilek (www.kutilek.de) - =========================================================================================== Public Domain =========================================================================================== diff --git a/data/licenses/OFL.txt b/data/licenses/OFL.txt deleted file mode 100644 index ad1f9ac761..0000000000 --- a/data/licenses/OFL.txt +++ /dev/null @@ -1,86 +0,0 @@ ------------------------------------------------------------ -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. diff --git a/source/g_doom.cc b/source/g_doom.cc index 91dd8e0b58..77741ead6e 100644 --- a/source/g_doom.cc +++ b/source/g_doom.cc @@ -1299,10 +1299,7 @@ bool Doom::game_interface_c::Finish(bool build_ok) if (!build_ok) { // remove the WAD if an error occurred - if (!preserve_failures) - { - FileDelete(filename); - } + FileDelete(filename); } else { diff --git a/source/lib_wad.cc b/source/lib_wad.cc index c7737e193b..5dc3cb75e0 100644 --- a/source/lib_wad.cc +++ b/source/lib_wad.cc @@ -72,7 +72,7 @@ bool WAD_OpenRead(const std::string &filename) if (wad_R_header.num_entries >= 5000) // sanity check { - LogPrint("WAD_OpenRead: bad header (%u entries?)\n", static_cast(wad_R_header.num_entries)); + LogPrint("WAD_OpenRead: bad header (%u entries?)\n", wad_R_header.num_entries); PHYSFS_close(wad_R_fp); return false; } @@ -80,7 +80,7 @@ bool WAD_OpenRead(const std::string &filename) if (!PHYSFS_seek(wad_R_fp, wad_R_header.dir_start)) { LogPrint("WAD_OpenRead: cannot seek to directory (at 0x%u)\n", - static_cast(wad_R_header.dir_start)); + wad_R_header.dir_start); PHYSFS_close(wad_R_fp); return false; } diff --git a/source/m_addons.cc b/source/m_addons.cc index baa21be0ba..eb504f276f 100644 --- a/source/m_addons.cc +++ b/source/m_addons.cc @@ -104,7 +104,6 @@ void VFS_InitAddons() VFS_AddFolder("ports"); VFS_AddFolder("presets"); VFS_AddFolder("addons"); - VFS_AddFolder("temp"); LogPrint("DONE.\n\n"); } diff --git a/source/m_cookie.cc b/source/m_cookie.cc index a7c4df0f3d..7b46b6ab32 100644 --- a/source/m_cookie.cc +++ b/source/m_cookie.cc @@ -81,33 +81,10 @@ static void Cookie_SetValue(std::string name, const std::string &value) if (context == cookie_context_e::Arguments || keep_seed) { - try - { - next_rand_seed = stoull(value); - return; - } - catch (std::invalid_argument &e) - { - (void)e; - if (!value.empty()) - { - string_seed = value; - ob_set_config("string_seed", value.c_str()); - next_rand_seed = StringHash64(string_seed); - } - else - { - LogPrint("Invalid argument. Will generate new seed.\n"); - } - } - catch (std::out_of_range &e) - { - (void)e; - LogPrint("Resulting number would be out of range. Will generate new " - "seed.\n"); - } + string_seed = value; + ob_set_config("seed", value); + next_rand_seed = StringHash64(string_seed); } - return; } diff --git a/source/m_dialog.cc b/source/m_dialog.cc index e4b05636bd..00c561d14e 100644 --- a/source/m_dialog.cc +++ b/source/m_dialog.cc @@ -326,50 +326,14 @@ void DLG_EditSeed(void) int user_response; user_buf = fl_input_str(user_response, 0 /* limit */, "%s", - string_seed.empty() ? std::format("{}", "{}", next_rand_seed).c_str() : string_seed.c_str(), - _("Enter New Seed Number or Phrase:")); + string_seed.c_str(), _("Enter New Seed Number or Phrase:")); // cancelled? if (user_response < 0) { return; } - - std::string word = {user_buf.c_str(), static_cast(user_buf.size())}; - try - { - for (long unsigned int i = 0; i < word.size(); i++) - { - char character = word[i]; - if (!IsDigitASCII(character)) - { - throw std::runtime_error( - // clang-format off - _("String contains non-digits. Will process as string\n")); - // clang-format on - } - } - did_specify_seed = true; - next_rand_seed = stoull(word); - return; - } - catch (std::invalid_argument &e) - { - (void)e; - printf("%s\n", _("Invalid argument. Will process as string.")); - } - catch (std::out_of_range &e) - { - (void)e; - // clang-format off - printf("%s\n", _("Resulting number would be out of range. Will process as string.")); - // clang-format on - } - catch (std::exception &e) - { - printf("%s\n", e.what()); - } - string_seed = word; - ob_set_config("string_seed", word.c_str()); + string_seed = user_buf; + ob_set_config("seed", string_seed); next_rand_seed = StringHash64(string_seed); did_specify_seed = true; return; diff --git a/source/m_lua.cc b/source/m_lua.cc index acf1fbf915..065b80586d 100644 --- a/source/m_lua.cc +++ b/source/m_lua.cc @@ -1389,20 +1389,6 @@ int generate_midi_track(lua_State *L) return 0; } -int remove_temp_file(lua_State *L) -{ - std::string path = PathAppend(home_dir, "temp"); - - const char *temp_file = luaL_checkstring(L, 1); - - path = PathAppend(path, GetFilename(temp_file)); - - if (FileExists(path)) - FileDelete(path); - - return 0; -} - //------------------------------------------------------------------------ extern int SPOT_begin(lua_State *L); @@ -1593,9 +1579,6 @@ static const luaL_Reg gui_script_funcs[] = { // MIDI generation {"generate_midi_track", generate_midi_track}, - // Miscellany - {"remove_temp_file", remove_temp_file}, - {NULL, NULL} // the end }; diff --git a/source/m_options.cc b/source/m_options.cc index c4e203d265..843c6e9a84 100644 --- a/source/m_options.cc +++ b/source/m_options.cc @@ -88,10 +88,6 @@ void Parse_Option(const std::string &name, const std::string &value) { randomize_misc = StringToInt(value) ? true : false; } - else if (StringCompare(name, "random_string_seeds") == 0) - { - random_string_seeds = StringToInt(value) ? true : false; - } else if (StringCompare(name, "password_mode") == 0) { password_mode = StringToInt(value) ? true : false; @@ -214,7 +210,6 @@ bool Options_Save(const std::string &filename) fprintf(option_fp, "randomize_monsters = %d\n", (randomize_monsters ? 1 : 0)); fprintf(option_fp, "randomize_pickups = %d\n", (randomize_pickups ? 1 : 0)); fprintf(option_fp, "randomize_misc = %d\n", (randomize_misc ? 1 : 0)); - fprintf(option_fp, "random_string_seeds = %d\n", (random_string_seeds ? 1 : 0)); fprintf(option_fp, "password_mode = %d\n", (password_mode ? 1 : 0)); fprintf(option_fp, "mature_word_lists = %d\n", (mature_word_lists ? 1 : 0)); fprintf(option_fp, "filename_prefix = %d\n", filename_prefix); @@ -254,8 +249,6 @@ class UI_OptionsWin : public Fl_Window Fl_Button *opt_default_output_path; Fl_Box *opt_current_output_path; - UI_CustomCheckBox *opt_random_string_seeds; - UI_HelpLink *random_string_seeds_help; UI_CustomCheckBox *opt_password_mode; UI_HelpLink *password_mode_help; UI_CustomCheckBox *opt_mature_words; @@ -348,39 +341,6 @@ class UI_OptionsWin : public Fl_Window that->want_quit = true; } - static void callback_Random_String_Seeds(Fl_Widget *w, void *data) - { - UI_OptionsWin *that = (UI_OptionsWin *)data; - - random_string_seeds = that->opt_random_string_seeds->value() ? true : false; - - if (!random_string_seeds) - { - that->opt_password_mode->deactivate(); - } - else - { - that->opt_password_mode->activate(); - } - } - - static void callback_RandomStringSeedsHelp(Fl_Widget *w, void *data) - { - fl_cursor(FL_CURSOR_DEFAULT); - Fl_Window *win = new Fl_Window(640, 480, _("Random String Seeds")); - Fl_Text_Buffer *buff = new Fl_Text_Buffer(); - Fl_Text_Display *disp = new Fl_Text_Display(20, 20, 640 - 40, 480 - 40); - disp->buffer(buff); - disp->wrap_mode(Fl_Text_Display::WRAP_AT_BOUNDS, 0); - win->resizable(*disp); - win->hotspot(0, 0, 0); - win->set_modal(); - win->show(); - // clang-format off - buff->text(_("Will randomly pull 1 to 3 words from Obsidian's random word list and use those as input for the map generation seed. Purely for cosmetic/entertainment value.")); - // clang-format on - } - static void callback_Password_Mode(Fl_Widget *w, void *data) { UI_OptionsWin *that = (UI_OptionsWin *)data; @@ -693,21 +653,6 @@ UI_OptionsWin::UI_OptionsWin(int W, int H, const char *label) : Fl_Window(W, H, cy += opt_current_output_path->h() + y_step; - opt_random_string_seeds = new UI_CustomCheckBox(cx + W * .38, cy, listwidth, KromulentHeight(24), ""); - opt_random_string_seeds->copy_label(_(" Random String Seeds")); - opt_random_string_seeds->value(random_string_seeds ? 1 : 0); - opt_random_string_seeds->callback(callback_Random_String_Seeds, this); - opt_random_string_seeds->labelfont(font_style); - opt_random_string_seeds->selection_color(SELECTION); - opt_random_string_seeds->down_box(button_style); - - random_string_seeds_help = - new UI_HelpLink(cx + W * .38 + this->opt_filename_prefix->w(), cy, W * 0.10, KromulentHeight(24)); - random_string_seeds_help->labelfont(font_style); - random_string_seeds_help->callback(callback_RandomStringSeedsHelp, this); - - cy += opt_random_string_seeds->h() + y_step * .5; - opt_password_mode = new UI_CustomCheckBox(cx + W * .38, cy, listwidth, KromulentHeight(24), ""); opt_password_mode->copy_label(_(" Password Mode")); opt_password_mode->value(password_mode ? 1 : 0); @@ -715,10 +660,6 @@ UI_OptionsWin::UI_OptionsWin(int W, int H, const char *label) : Fl_Window(W, H, opt_password_mode->labelfont(font_style); opt_password_mode->selection_color(SELECTION); opt_password_mode->down_box(button_style); - if (!random_string_seeds) - { - opt_password_mode->deactivate(); - } password_mode_help = new UI_HelpLink(cx + W * .38 + this->opt_filename_prefix->w(), cy, W * 0.10, KromulentHeight(24)); diff --git a/source/m_theme.cc b/source/m_theme.cc index 9d92ae425d..ff2e30424c 100644 --- a/source/m_theme.cc +++ b/source/m_theme.cc @@ -862,7 +862,7 @@ class UI_ThemeWin : public Fl_Window } break; case 2: - button_style = static_cast(FL_FREE_BOXTYPE + 2); + button_style = (Fl_Boxtype)(FL_FREE_BOXTYPE + 2); break; case 3: button_style = FL_EMBOSSED_BOX; @@ -1086,7 +1086,7 @@ class UI_ThemeWin : public Fl_Window } break; case 2: - button_style = static_cast(FL_FREE_BOXTYPE + 2); + button_style = (Fl_Boxtype)(FL_FREE_BOXTYPE + 2); break; case 3: button_style = FL_EMBOSSED_BOX; diff --git a/source/main.cc b/source/main.cc index cdfaae4fc9..175e9cd237 100644 --- a/source/main.cc +++ b/source/main.cc @@ -132,7 +132,7 @@ int button_theme = 0; int widget_theme = 0; int window_scaling = 0; int font_scaling = 18; -int num_fonts = 0; +static constexpr int num_fonts = 4; std::vector> font_menu_items; static int old_x = 0; static int old_y = 0; @@ -149,14 +149,12 @@ bool create_backups = true; bool overwrite_warning = true; bool debug_messages = false; bool limit_break = false; -bool preserve_failures = false; bool preserve_old_config = false; bool did_randomize = false; bool randomize_architecture = false; bool randomize_monsters = false; bool randomize_pickups = false; bool randomize_misc = false; -bool random_string_seeds = false; bool password_mode = false; bool mature_word_lists = false; bool did_specify_seed = false; @@ -173,22 +171,8 @@ extern bool ExtractPresetData(FILE *fp, std::string &buf); #ifndef OBSIDIAN_CONSOLE_ONLY #ifdef _WIN32 -#ifndef OBSIDIAN_CONSOLE_ONLY static FLASHWINFO *blinker; -static int LoadPrivateFont(const char *path) -{ - return AddFontResourceExW((LPCWSTR)UTF8ToWString(path).data(), FR_PRIVATE, nullptr); -} -#endif -#else -#ifndef OBSIDIAN_CONSOLE_ONLY -static int LoadPrivateFont(const char *path) -{ - return static_cast(FcConfigAppFontAddFile(NULL, (const FcChar8 *)path)); -} -#endif #endif - static void main_win_surprise_config_CB(Fl_Widget *w, void *data) { Fl_Menu_Bar *menu = (Fl_Menu_Bar *)w; @@ -476,143 +460,15 @@ static int DetermineScaling() return 0; } -static bool LoadInternalFont(const char *fontpath, const int fontnum, const char *fontname) -{ - /* set the extra font */ - if (LoadPrivateFont(fontpath)) - { - Fl::set_font(fontnum, fontname); - return true; - } - return false; -} static void PopulateFontMap() { if (font_menu_items.empty()) { - // Load bundled fonts. Fonts without a bold variant are essentially - // loaded twice in a row so that calls for a bold variant don't - // accidentally change fonts - - // Some custom fonts will have a different display name than that of - // their TTF fontname. This is because these fonts have been - // modified in some fashion, and the OFL 1.1 license dictates that - // modified versions cannot display their Reserved Name to users - - int current_free_font = FL_ZAPF_DINGBATS+1; - - if (LoadInternalFont("./theme/fonts/SourceSansPro/SourceSansPro-Regular.ttf", current_free_font, - "Source Sans Pro")) - { - if (LoadInternalFont("./theme/fonts/SourceSansPro/SourceSansPro-Bold.ttf", current_free_font + 1, - "Source Sans Pro Bold")) - { - font_menu_items.push_back({"Sauce ", current_free_font}); - current_free_font += 2; - } - } - - font_menu_items.push_back({"Helvetica ", FL_HELVETICA}); - font_menu_items.push_back({"Courier ", FL_COURIER}); - font_menu_items.push_back({"Times ", FL_TIMES}); - font_menu_items.push_back({"Screen ", FL_SCREEN}); - - if (LoadInternalFont("./theme/fonts/Avenixel/Avenixel-Regular.ttf", current_free_font, "Avenixel")) - { - Fl::set_font(current_free_font + 1, "Avenixel"); - font_menu_items.push_back({"Avenixel", current_free_font}); - current_free_font += 2; - } - - if (LoadInternalFont("./theme/fonts/TheNeueBlack/TheNeue-Black.ttf", current_free_font, "The Neue Black")) - { - Fl::set_font(current_free_font + 1, "The Neue Black"); - font_menu_items.push_back({"New Black", current_free_font}); - current_free_font += 2; - } - - if (LoadInternalFont("./theme/fonts/Teko/Teko-Regular.ttf", current_free_font, "Teko")) - { - if (LoadInternalFont("./theme/fonts/Teko/Teko-Bold.ttf", current_free_font + 1, "Teko Bold")) - { - font_menu_items.push_back({"Teko", current_free_font}); - current_free_font += 2; - } - } - - if (LoadInternalFont("./theme/fonts/Kalam/Kalam-Regular.ttf", current_free_font, "Kalam")) - { - if (LoadInternalFont("./theme/fonts/Kalam/Kalam-Bold.ttf", current_free_font + 1, "Kalam Bold")) - { - font_menu_items.push_back({"Kalam", current_free_font}); - current_free_font += 2; - } - } - - if (LoadInternalFont("./theme/fonts/3270/3270.ttf", current_free_font, "3270 Condensed")) - { - Fl::set_font(current_free_font + 1, "3270 Condensed"); - font_menu_items.push_back({"3270", current_free_font}); - current_free_font += 2; - } - - if (LoadInternalFont("./theme/fonts/Workbench/Workbench.ttf", current_free_font, "Workbench Light Regular")) - { - if (LoadInternalFont("./theme/fonts/Workbench/Workbench.ttf", current_free_font + 1, "Workbench Regular")) - { - font_menu_items.push_back({"Workbench", current_free_font}); - current_free_font += 2; - } - } - - if (LoadInternalFont("./theme/fonts/FPD-Pressure/FPDPressure-Light.otf", current_free_font, - "FPD Pressure Light")) - { - if (LoadInternalFont("./theme/fonts/FPD-Pressure/FPDPressure-Regular.otf", current_free_font + 1, - "FPD Pressure")) - { - font_menu_items.push_back({"FPD Pressure", current_free_font}); - current_free_font += 2; - } - } - - if (LoadInternalFont("./theme/fonts/DramaSans/DramaSans.ttf", current_free_font, "Drama Sans")) - { - Fl::set_font(current_free_font + 1, "Drama Sans"); - font_menu_items.push_back({"Drama Sans", current_free_font}); - current_free_font += 2; - } - - if (LoadInternalFont("./theme/fonts/SamIAm/MiniSmallCaps.ttf", current_free_font, "MiniSmallCaps")) - { - Fl::set_font(current_free_font + 1, "MiniSmallCaps"); - font_menu_items.push_back({"Sam I Am", current_free_font}); - current_free_font += 2; - } + font_menu_items.push_back({"Helvetica", FL_HELVETICA}); + font_menu_items.push_back({"Courier", FL_COURIER}); + font_menu_items.push_back({"Times", FL_TIMES}); + font_menu_items.push_back({"Screen", FL_SCREEN}); } - num_fonts = static_cast(font_menu_items.size()); -} -static void UnloadFontMap() -{ -#ifdef _WIN32 - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/SourceSansPro/SourceSansPro-Regular.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/SourceSansPro/SourceSansPro-Bold.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Avenixel/Avenixel-Regular.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/TheNeueBlack/TheNeue-Black.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Teko/Teko-Regular.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Teko/Teko-Bold.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Kalam/Kalam-Regular.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Kalam/Kalam-Bold.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/3270/3270.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Workbench/Workbench.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/Workbench/Workbench.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/FPD-Pressure/FPDPressure-Light.otf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/FPD-Pressure/FPDPressure-Regular.otf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/DramaSans/DramaSans.ttf").data(), FR_PRIVATE, nullptr); - RemoveFontResourceExW((LPCWSTR)UTF8ToWString("./theme/fonts/SamIAm/MiniSmallCaps.ttf").data(), FR_PRIVATE, nullptr); -#else - FcConfigAppFontClear(NULL); -#endif } static void SetupFLTK() { @@ -691,11 +547,11 @@ static void SetupFLTK() Fl::set_boxtype(FL_PLASTIC_DOWN_BOX, cplastic_down_box, 2, 2, 4, 4); Fl::set_boxtype(FL_SHADOW_BOX, cshadow_box, 1, 1, 5, 5); Fl::set_boxtype(FL_FREE_BOXTYPE, crectbound, 1, 1, 2, 2); - Fl::set_boxtype(static_cast(FL_FREE_BOXTYPE + 1), crectbound, 1, 1, 2, 2); + Fl::set_boxtype((Fl_Boxtype)(FL_FREE_BOXTYPE + 1), crectbound, 1, 1, 2, 2); Fl::set_boxtype(FL_THIN_UP_BOX, cthin_up_box, 1, 1, 2, 2); Fl::set_boxtype(FL_EMBOSSED_BOX, cembossed_box, 2, 2, 4, 4); - Fl::set_boxtype(static_cast(FL_FREE_BOXTYPE + 2), cengraved_box, 2, 2, 4, 4); - Fl::set_boxtype(static_cast(FL_FREE_BOXTYPE + 3), cengraved_box, 2, 2, 4, 4); + Fl::set_boxtype((Fl_Boxtype)(FL_FREE_BOXTYPE + 2), cengraved_box, 2, 2, 4, 4); + Fl::set_boxtype((Fl_Boxtype)(FL_FREE_BOXTYPE + 3), cengraved_box, 2, 2, 4, 4); Fl::set_boxtype(FL_DOWN_BOX, cdown_box, 2, 2, 4, 4); Fl::set_boxtype(FL_UP_BOX, cup_box, 2, 2, 4, 4); switch (widget_theme) @@ -834,7 +690,7 @@ static void SetupFLTK() } break; case 2: - button_style = static_cast(FL_FREE_BOXTYPE + 2); + button_style = (Fl_Boxtype)(FL_FREE_BOXTYPE + 2); break; case 3: button_style = FL_EMBOSSED_BOX; @@ -855,7 +711,8 @@ static void SetupFLTK() else { // Fallback - font_style = 0; + font_style = FL_HELVETICA; + font_theme = 0; } if (font_scaling < 6) { // Values from old configs @@ -971,40 +828,42 @@ int Main_key_handler(int event) void Main_CalcNewSeed() { - next_rand_seed = twister_UInt(); + if (string_seed.empty()) + { + if (password_mode) + { + string_seed = ob_get_password(); + } + else + { + string_seed = ob_get_random_words(); + } + } + ob_set_config("seed", string_seed); + next_rand_seed = StringHash64(string_seed); + twister_Reseed(next_rand_seed); } void Main_SetSeed() { - if (random_string_seeds && !did_specify_seed) + if (!did_specify_seed || string_seed.empty()) { - if (string_seed.empty()) + if (password_mode) { - if (password_mode) - { - if (next_rand_seed % 2 == 1) - { - string_seed = ob_get_password(); - } - else - { - string_seed = ob_get_random_words(); - } - } - else - { - string_seed = ob_get_random_words(); - } - ob_set_config("string_seed", string_seed.c_str()); - next_rand_seed = StringHash64(string_seed); + string_seed = ob_get_password(); + } + else + { + string_seed = ob_get_random_words(); } } + ob_set_config("seed", string_seed); + next_rand_seed = StringHash64(string_seed); twister_Reseed(next_rand_seed); - ob_set_config("seed", std::format("{}", next_rand_seed)); #ifndef OBSIDIAN_CONSOLE_ONLY if (!batch_mode) { - main_win->build_box->seed_disp->copy_label(std::format("{} {}", _("Seed:"), next_rand_seed).c_str()); + main_win->build_box->seed_disp->copy_label(std::format("{} {}", _("Seed:"), string_seed).c_str()); main_win->build_box->seed_disp->redraw(); } #endif @@ -1422,8 +1281,6 @@ hardrestart:; softrestart:; - Main_CalcNewSeed(); - std::string load_file; // TX_TestSynth(next_rand_seed); - Fractal testing stuff @@ -1548,7 +1405,9 @@ softrestart:; return EXIT_FAILURE; } + Main_CalcNewSeed(); Main_SetSeed(); + if (!Build_Cool_Shit()) { FatalError("FAILED!\n"); @@ -1623,6 +1482,8 @@ softrestart:; Cookie_ParseArguments(); + Main_CalcNewSeed(); + if (main_action != MAIN_SOFT_RESTART) { #ifndef OBSIDIAN_CONSOLE_ONLY @@ -1795,77 +1656,70 @@ softrestart:; main_action = MAIN_NONE; - try + // run the GUI until the user quits + for (;;) { - // run the GUI until the user quits - for (;;) - { #ifndef OBSIDIAN_CONSOLE_ONLY - Fl::wait(0.2); + Fl::wait(0.2); #endif - if (main_action == MAIN_QUIT || main_action == MAIN_HARD_RESTART || main_action == MAIN_SOFT_RESTART) - { - break; - } + if (main_action == MAIN_QUIT || main_action == MAIN_HARD_RESTART || main_action == MAIN_SOFT_RESTART) + { + break; + } - if (main_action == MAIN_BUILD) - { + if (main_action == MAIN_BUILD) + { - main_action = 0; + main_action = 0; - Main_SetSeed(); + Main_SetSeed(); - // save config in case everything blows up - if (did_randomize) - { - if (!preserve_old_config) - { - Cookie_Save(config_file); - } - } - else + // save config in case everything blows up + if (did_randomize) + { + if (!preserve_old_config) { Cookie_Save(config_file); } + } + else + { + Cookie_Save(config_file); + } - bool result = Build_Cool_Shit(); + bool result = Build_Cool_Shit(); - did_specify_seed = false; + did_specify_seed = false; #ifndef OBSIDIAN_CONSOLE_ONLY - if (result) + if (result) + { + old_seed = string_seed.empty() ? std::format("{}", next_rand_seed) : string_seed; + if (main_win->build_box->name_disp->label()) { - old_seed = string_seed.empty() ? std::format("{}", next_rand_seed) : string_seed; - if (main_win->build_box->name_disp->label()) - { - old_name = main_win->build_box->name_disp->label(); - } - if (main_win->build_box->mini_map->pixels) - { - int map_size = main_win->build_box->mini_map->map_W * main_win->build_box->mini_map->map_H * 3; - old_pixels = new uint8_t[map_size]; - memcpy(old_pixels, main_win->build_box->mini_map->pixels, map_size); - } + old_name = main_win->build_box->name_disp->label(); } - else + if (main_win->build_box->mini_map->pixels) { - old_seed.clear(); - old_name.clear(); + int map_size = main_win->build_box->mini_map->map_W * main_win->build_box->mini_map->map_H * 3; + old_pixels = new uint8_t[map_size]; + memcpy(old_pixels, main_win->build_box->mini_map->pixels, map_size); } - main_win->build_box->alt_disp->label(""); + } + else + { + old_seed.clear(); + old_name.clear(); + } + main_win->build_box->alt_disp->label(""); #endif - // regardless of success or fail, compute a new seed - Main_CalcNewSeed(); + // regardless of success or fail, compute a new seed + Main_CalcNewSeed(); - main_action = MAIN_SOFT_RESTART; - } + main_action = MAIN_SOFT_RESTART; } } - catch (std::exception &e) - { - FatalError(_("An exception occurred: \n%s"), e.what()); - } if (main_action != MAIN_SOFT_RESTART) { @@ -1923,10 +1777,6 @@ softrestart:; Main::Shutdown(false); -#ifndef OBSIDIAN_CONSOLE_ONLY - UnloadFontMap(); -#endif - return 0; } diff --git a/source/main.h b/source/main.h index 0eaeb68de0..ee3678fde5 100644 --- a/source/main.h +++ b/source/main.h @@ -126,7 +126,6 @@ extern int button_theme; extern int widget_theme; extern int window_scaling; extern int font_scaling; -extern int num_fonts; extern std::vector> font_menu_items; extern bool collapse_disabled_modules; #endif @@ -136,14 +135,12 @@ extern bool create_backups; extern bool overwrite_warning; extern bool debug_messages; extern bool limit_break; -extern bool preserve_failures; extern bool preserve_old_config; extern bool did_randomize; extern bool randomize_architecture; extern bool randomize_monsters; extern bool randomize_pickups; extern bool randomize_misc; -extern bool random_string_seeds; extern bool password_mode; extern bool mature_word_lists; extern bool did_specify_seed; diff --git a/source/ui_module.cc b/source/ui_module.cc index 3d25ede909..25c07df74b 100644 --- a/source/ui_module.cc +++ b/source/ui_module.cc @@ -384,33 +384,13 @@ void UI_Module::AddSliderOption(const std::string &opt, std::string &label, cons if (!map_string.empty()) { std::string::size_type temp_pos = map_string.find(':'); - if (temp_pos == std::string::npos) + if (temp_pos != std::string::npos) { - goto skippreset; - } - double key; - try - { - key = stod(map_string.substr(0, temp_pos)); + double key = StringToDouble(map_string.substr(0, temp_pos)); std::string value = map_string.substr(temp_pos + 1); rsl->preset_choices[key] = value; } - catch (std::invalid_argument &e) - { - fl_message("Invalid argument for preset slider value!"); - goto skippreset; - } - catch (std::out_of_range &e) - { - fl_message("Number out of range for preset slider value!"); - goto skippreset; - } - catch (std::exception &e) - { - fl_message("%s", e.what()); - } } - skippreset: if (pos != std::string::npos) { oldpos = pos + 1; @@ -794,40 +774,20 @@ bool UI_Module::SetSliderOption(const std::string &option, const std::string &va { return false; } - double double_value; - try - { - double_value = stod(value); - if (limit_break) - { - rsl->mod_slider->value(double_value); - } - else - { - rsl->mod_slider->value(rsl->mod_slider->clamp(double_value)); - } - rsl->mod_slider->do_callback(); - if (rsl->nan_choices.size() > 0) - { - rsl->nan_options->value(0); - rsl->nan_options->do_callback(); - } - } - catch (std::invalid_argument &e) + double double_value = StringToDouble(value); + if (limit_break) { - // If it is a nan value instead - rsl->nan_options->value(rsl->nan_options->find_index(value.c_str())); - rsl->nan_options->do_callback(); + rsl->mod_slider->value(double_value); } - catch (std::out_of_range &e) + else { - // This shouldn't happen - fl_message("%s", e.what()); + rsl->mod_slider->value(rsl->mod_slider->clamp(double_value)); } - catch (std::exception &e) + rsl->mod_slider->do_callback(); + if (rsl->nan_choices.size() > 0) { - // This shouldn't happen either - fl_message("%s", e.what()); + rsl->nan_options->value(0); + rsl->nan_options->do_callback(); } return true; } @@ -1114,58 +1074,24 @@ void UI_Module::callback_ShowHelp(Fl_Widget *w, void *data) void UI_Module::callback_ManualEntry(Fl_Widget *w, void *data) { UI_ManualEntry *mod_entry = (UI_ManualEntry *)w; - UI_RSlide *current_slider = (UI_RSlide *)mod_entry->parent(); - - std::string float_buf; - double new_value = 0; - std::string string_value; - - float_buf = std::format("{}", current_slider->mod_slider->value()); - -tryagain: - - const char *value_buf = fl_input("%s", float_buf.c_str(), _("Enter Value:")); + const char *value_buf = fl_input("%s", std::format("{}", current_slider->mod_slider->value()).c_str(), _("Enter Value:")); // cancelled? if (!value_buf) { - goto end; - } - - string_value = value_buf; - - try - { - new_value = stod(string_value); - } - catch (std::invalid_argument &e) - { - fl_message("Invalid argument! Try again!"); - goto tryagain; - } - catch (std::out_of_range &e) - { - fl_message("Number out of range! Try again!"); - goto tryagain; - } - catch (std::exception &e) - { - fl_message("%s", e.what()); + return; } - if (limit_break) { - current_slider->mod_slider->value(current_slider->mod_slider->round(new_value)); + current_slider->mod_slider->value(current_slider->mod_slider->round(StringToDouble(value_buf))); } else { current_slider->mod_slider->value( - current_slider->mod_slider->clamp(current_slider->mod_slider->round(new_value))); + current_slider->mod_slider->clamp(current_slider->mod_slider->round(StringToDouble(value_buf)))); } current_slider->mod_slider->do_callback(); - -end:; } void UI_Module::callback_NanOptions(Fl_Widget *w, void *data) diff --git a/temp/.gitkeep b/temp/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/theme/.gitkeep b/theme/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/theme/fonts/3270/3270.ttf b/theme/fonts/3270/3270.ttf deleted file mode 100644 index 4567827ab3..0000000000 Binary files a/theme/fonts/3270/3270.ttf and /dev/null differ diff --git a/theme/fonts/3270/LICENSE.txt b/theme/fonts/3270/LICENSE.txt deleted file mode 100644 index 3ca71cba95..0000000000 --- a/theme/fonts/3270/LICENSE.txt +++ /dev/null @@ -1,49 +0,0 @@ -Copyright (c) 2011-2017, Ricardo Banffy. -Copyright (c) 1993-2011, Paul Mattes. -Copyright (c) 2004-2005, Don Russell. -Copyright (c) 2004, Dick Altenbern. -Copyright (c) 1990, Jeff Sparkes. -Copyright (c) 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA 30332. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name of Ricardo Banffy, Paul Mattes, Don Russell, - Dick Altenbern, Jeff Sparkes, GTRC nor the names of their contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL RICARDO BANFFY, PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF -SPARKES OR GTRC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The Debian Logo glyph is based on the Debian Open Use Logo and is -Copyright (c) 1999 Software in the Public Interest, Inc., and it is -incorporated here under the terms of the Creative Commons -Attribution-ShareAlike 3.0 Unported License. The logo is released -under the terms of the GNU Lesser General Public License, version 3 or -any later version, or, at your option, of the Creative Commons -Attribution-ShareAlike 3.0 Unported License. - -Ubuntu, the Ubuntu logo and the Circle of Friends symbol are -registered trademarks of Canonical Ltd. - -The Fontforge SFD font description file is optionally licensed under -the SIL Open Font License v1.1 with no Reserved Font Name. This -license is available with a FAQ at http://scripts.sil.org/OFL. diff --git a/theme/fonts/Avenixel/Avenixel-Regular.ttf b/theme/fonts/Avenixel/Avenixel-Regular.ttf deleted file mode 100644 index b34e05b9b0..0000000000 Binary files a/theme/fonts/Avenixel/Avenixel-Regular.ttf and /dev/null differ diff --git a/theme/fonts/Avenixel/License.txt b/theme/fonts/Avenixel/License.txt deleted file mode 100644 index 738249014d..0000000000 --- a/theme/fonts/Avenixel/License.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright (c) 2020, Gabriel Sammartino (https://www.behance.net/webcreativity | contact@gabrielsammartino.com), -with Reserved Font Name Avenixel. - -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: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -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. diff --git a/theme/fonts/DramaSans/DramaSans.ttf b/theme/fonts/DramaSans/DramaSans.ttf deleted file mode 100644 index 1d315117c0..0000000000 Binary files a/theme/fonts/DramaSans/DramaSans.ttf and /dev/null differ diff --git a/theme/fonts/DramaSans/LICENSE.txt b/theme/fonts/DramaSans/LICENSE.txt deleted file mode 100644 index 47ff562f6f..0000000000 --- a/theme/fonts/DramaSans/LICENSE.txt +++ /dev/null @@ -1,91 +0,0 @@ -Copyright (c) 2018, Drama Sans (dramasans@outlook.com), -with Reserved Font Name "Drama Sans". - -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: http://scripts.sil.org/OFL - -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 SOFT \ No newline at end of file diff --git a/theme/fonts/FPD-Pressure/FPDPressure-Light.otf b/theme/fonts/FPD-Pressure/FPDPressure-Light.otf deleted file mode 100644 index 7e2d8dfb0f..0000000000 Binary files a/theme/fonts/FPD-Pressure/FPDPressure-Light.otf and /dev/null differ diff --git a/theme/fonts/FPD-Pressure/FPDPressure-Regular.otf b/theme/fonts/FPD-Pressure/FPDPressure-Regular.otf deleted file mode 100644 index 97b0caead7..0000000000 Binary files a/theme/fonts/FPD-Pressure/FPDPressure-Regular.otf and /dev/null differ diff --git a/theme/fonts/FPD-Pressure/LICENSE.txt b/theme/fonts/FPD-Pressure/LICENSE.txt deleted file mode 100644 index fd9b59c51f..0000000000 --- a/theme/fonts/FPD-Pressure/LICENSE.txt +++ /dev/null @@ -1,103 +0,0 @@ -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: -http://scripts.sil.org/OFL - -SIL Open Font License v1.1 -==================================================== - - -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. diff --git a/theme/fonts/Kalam/Kalam-Bold.ttf b/theme/fonts/Kalam/Kalam-Bold.ttf deleted file mode 100644 index 166456d1d1..0000000000 Binary files a/theme/fonts/Kalam/Kalam-Bold.ttf and /dev/null differ diff --git a/theme/fonts/Kalam/Kalam-Regular.ttf b/theme/fonts/Kalam/Kalam-Regular.ttf deleted file mode 100644 index 16f1586124..0000000000 Binary files a/theme/fonts/Kalam/Kalam-Regular.ttf and /dev/null differ diff --git a/theme/fonts/Kalam/OFL.txt b/theme/fonts/Kalam/OFL.txt deleted file mode 100644 index 79115a58c1..0000000000 --- a/theme/fonts/Kalam/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2014, Indian Type Foundry (info@indiantypefoundry.com). - -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: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -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. diff --git a/theme/fonts/SamIAm/COPYING.TXT b/theme/fonts/SamIAm/COPYING.TXT deleted file mode 100644 index 2d5ff2d248..0000000000 --- a/theme/fonts/SamIAm/COPYING.TXT +++ /dev/null @@ -1,173 +0,0 @@ -There are pieces of six font families here: - -* Matthew Carter's Bitstream Charter and its derivative Charis SIL - (the serif fonts in Caulixtla) - -* Paul Hunt's Source Sans Pro (The sans serif bold font in Caulixtla) - -* Steve Matteson's Liberation Mono / Cousine (Called Wterm here) - -* The infinity symbol in the serif fonts comes from Source Serif Pro - -* The card symbols in the monospace font and the right arrow in the - non-italic serif fonts both come from DejaVu; since these are glyphs which - are not part of Bitstream Vera nor Arev, the symbols are public - domain - -* The font m7x14.fon comes from the public domain "misc-fixed" font set - included with X11 - -The fonts are open source fonts and are used in compliance with their -licenses. Read below for legal details. - --- - -This is the license for the regular and italic Caulixtla (modified -Bitstream Charter): - -(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. - -You are hereby granted permission under all Bitstream propriety rights -to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream -Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts -for any purpose and without restriction; provided, that this notice is -left intact on all copies of such fonts and that Bitstream's trademark -is acknowledged as shown below on all unmodified copies of the 4 Charter -Type 1 fonts. - -BITSTREAM CHARTER is a registered trademark of Bitstream Inc. - ---- - -This is the license for Charis SIL (we use this derivative of Bitstream -Charter for the non-italic serif font): - -This Font Software is Copyright (c) 1997-2014, SIL International (http://scripts.sil.org/) -with Reserved Font Names "Charis" and "SIL". - -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: -http://scripts.sil.org/OFL - ---- - -This is the license for Source Serif Pro (we use its infinity symbol in the -regular and italic forms of Caulixtla): - -Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. - ---- - -This is the license for Caulixtla Bold (modified Source Sans Pro): - -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -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: http://scripts.sil.org/OFL - ---- - -Note: Newer versions of Cousine have a difference license, but this is -a copy of the older version of the font with an OFL license. - -This is the license for WTerm (modified Liberation Mono / older Cousine). -Note that WTerm's "reserved font name" may be Cousine and possibly -"Liberation Mono": - -Copyright (c) 2010, Google Corporation. - -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: -http://scripts.sil.org/OFL - ---- - ------------------------------------------------------------ -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. diff --git a/theme/fonts/SamIAm/MiniSmallCaps.ttf b/theme/fonts/SamIAm/MiniSmallCaps.ttf deleted file mode 100644 index a5a2da1dde..0000000000 Binary files a/theme/fonts/SamIAm/MiniSmallCaps.ttf and /dev/null differ diff --git a/theme/fonts/SourceSansPro/OFL.txt b/theme/fonts/SourceSansPro/OFL.txt deleted file mode 100644 index 72d81ab3b8..0000000000 --- a/theme/fonts/SourceSansPro/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’. - -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: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -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. diff --git a/theme/fonts/SourceSansPro/SourceSansPro-Bold.ttf b/theme/fonts/SourceSansPro/SourceSansPro-Bold.ttf deleted file mode 100644 index 453fe27e4e..0000000000 Binary files a/theme/fonts/SourceSansPro/SourceSansPro-Bold.ttf and /dev/null differ diff --git a/theme/fonts/SourceSansPro/SourceSansPro-Regular.ttf b/theme/fonts/SourceSansPro/SourceSansPro-Regular.ttf deleted file mode 100644 index b422bf4322..0000000000 Binary files a/theme/fonts/SourceSansPro/SourceSansPro-Regular.ttf and /dev/null differ diff --git a/theme/fonts/Teko/OFL.txt b/theme/fonts/Teko/OFL.txt deleted file mode 100644 index 79115a58c1..0000000000 --- a/theme/fonts/Teko/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2014, Indian Type Foundry (info@indiantypefoundry.com). - -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: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -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. diff --git a/theme/fonts/Teko/Teko-Bold.ttf b/theme/fonts/Teko/Teko-Bold.ttf deleted file mode 100644 index fd974fec40..0000000000 Binary files a/theme/fonts/Teko/Teko-Bold.ttf and /dev/null differ diff --git a/theme/fonts/Teko/Teko-Regular.ttf b/theme/fonts/Teko/Teko-Regular.ttf deleted file mode 100644 index 4b27b8973c..0000000000 Binary files a/theme/fonts/Teko/Teko-Regular.ttf and /dev/null differ diff --git a/theme/fonts/TheNeueBlack/OFL.md b/theme/fonts/TheNeueBlack/OFL.md deleted file mode 100644 index 2542aa6f0c..0000000000 --- a/theme/fonts/TheNeueBlack/OFL.md +++ /dev/null @@ -1,100 +0,0 @@ -Copyright (c) 2019-2021, Tre Seals , Micah Rich , The League of Moveable Type Limited Liability Company -with Reserved Font Name: "The Neue Black". - -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: -http://scripts.sil.org/aOFL - -Version 1.1 - 26 February 2007 - ---- - -# SIL Open Font License - -## 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. diff --git a/theme/fonts/TheNeueBlack/TheNeue-Black.ttf b/theme/fonts/TheNeueBlack/TheNeue-Black.ttf deleted file mode 100644 index 7d66b0a808..0000000000 Binary files a/theme/fonts/TheNeueBlack/TheNeue-Black.ttf and /dev/null differ diff --git a/theme/fonts/Workbench/LICENSE.txt b/theme/fonts/Workbench/LICENSE.txt deleted file mode 100644 index 10fa1ec9c0..0000000000 --- a/theme/fonts/Workbench/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2019, Jens Kutilek (www.kutilek.de), - -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: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -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. diff --git a/theme/fonts/Workbench/Workbench.ttf b/theme/fonts/Workbench/Workbench.ttf deleted file mode 100644 index 9d816fc137..0000000000 Binary files a/theme/fonts/Workbench/Workbench.ttf and /dev/null differ