diff options
39 files changed, 726 insertions, 583 deletions
diff --git a/lib/komihash/include/komihash.h b/lib/komihash/include/komihash.h index 7a72fda8..4f6b0f25 100644 --- a/lib/komihash/include/komihash.h +++ b/lib/komihash/include/komihash.h @@ -35,6 +35,8 @@ #include <stdint.h> #include <string.h> +#include "esp_attr.h" + // Macros that apply byte-swapping. #if defined( __GNUC__ ) || defined( __clang__ ) @@ -142,7 +144,7 @@ * @return Endianness-corrected 32-bit value from memory. */ -static inline uint32_t kh_lu32ec( const uint8_t* const p ) +static IRAM_ATTR inline uint32_t kh_lu32ec( const uint8_t* const p ) { uint32_t v; memcpy( &v, p, 4 ); @@ -160,7 +162,7 @@ static inline uint32_t kh_lu32ec( const uint8_t* const p ) * @return Endianness-corrected 64-bit value from memory. */ -static inline uint64_t kh_lu64ec( const uint8_t* const p ) +static IRAM_ATTR inline uint64_t kh_lu64ec( const uint8_t* const p ) { uint64_t v; memcpy( &v, p, 8 ); @@ -179,7 +181,7 @@ static inline uint64_t kh_lu64ec( const uint8_t* const p ) * @return Final byte-padded value from the message. */ -static inline uint64_t kh_lpu64ec_l3( const uint8_t* const Msg, +static IRAM_ATTR inline uint64_t kh_lpu64ec_l3( const uint8_t* const Msg, const size_t MsgLen ) { const int ml8 = -(int) ( MsgLen * 8 ); @@ -211,7 +213,7 @@ static inline uint64_t kh_lpu64ec_l3( const uint8_t* const Msg, * @return Final byte-padded value from the message. */ -static inline uint64_t kh_lpu64ec_nz( const uint8_t* const Msg, +static IRAM_ATTR inline uint64_t kh_lpu64ec_nz( const uint8_t* const Msg, const size_t MsgLen ) { const int ml8 = -(int) ( MsgLen * 8 ); @@ -252,7 +254,7 @@ static inline uint64_t kh_lpu64ec_nz( const uint8_t* const Msg, * @return Final byte-padded value from the message. */ -static inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, +static IRAM_ATTR inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, const size_t MsgLen ) { const int ml8 = -(int) ( MsgLen * 8 ); @@ -280,7 +282,7 @@ static inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, * @param[out] rh The higher half of the 128-bit result. */ - static inline void kh_m128( const uint64_t m1, const uint64_t m2, + static IRAM_ATTR inline void kh_m128( const uint64_t m1, const uint64_t m2, uint64_t* const rl, uint64_t* const rh ) { const __uint128_t r = (__uint128_t) m1 * m2; @@ -293,7 +295,7 @@ static inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, #include <intrin.h> - static inline void kh_m128( const uint64_t m1, const uint64_t m2, + static IRAM_ATTR inline void kh_m128( const uint64_t m1, const uint64_t m2, uint64_t* const rl, uint64_t* const rh ) { *rl = _umul128( m1, m2, rh ); @@ -305,12 +307,12 @@ static inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, // from https://go.dev/src/runtime/softfloat64.go // Licensed under BSD-style license. - static inline uint64_t kh__emulu( const uint32_t x, const uint32_t y ) + static IRAM_ATTR inline uint64_t kh__emulu( const uint32_t x, const uint32_t y ) { return( x * (uint64_t) y ); } - static inline void kh_m128( const uint64_t u, const uint64_t v, + static IRAM_ATTR inline void kh_m128( const uint64_t u, const uint64_t v, uint64_t* const rl, uint64_t* const rh ) { *rl = u * v; @@ -406,7 +408,7 @@ static inline uint64_t kh_lpu64ec_l4( const uint8_t* const Msg, * @return 64-bit hash value. */ -static inline uint64_t komihash_epi( const uint8_t* Msg, size_t MsgLen, +static IRAM_ATTR inline uint64_t komihash_epi( const uint8_t* Msg, size_t MsgLen, uint64_t Seed1, uint64_t Seed5 ) { uint64_t r1h, r2h; @@ -463,7 +465,7 @@ static inline uint64_t komihash_epi( const uint8_t* Msg, size_t MsgLen, * @return 64-bit hash of the input data. */ -static inline uint64_t komihash( const void* const Msg0, size_t MsgLen, +static IRAM_ATTR inline uint64_t komihash( const void* const Msg0, size_t MsgLen, const uint64_t UseSeed ) { const uint8_t* Msg = (const uint8_t*) Msg0; @@ -571,7 +573,7 @@ static inline uint64_t komihash( const void* const Msg0, size_t MsgLen, * @return The next uniformly-random 64-bit value. */ -static inline uint64_t komirand( uint64_t* const Seed1, uint64_t* const Seed2 ) +static IRAM_ATTR inline uint64_t komirand( uint64_t* const Seed1, uint64_t* const Seed2 ) { uint64_t rh; @@ -615,7 +617,7 @@ typedef struct { * little-endian systems. */ -static inline void komihash_stream_init( komihash_stream_t* const ctx, +static IRAM_ATTR inline void komihash_stream_init( komihash_stream_t* const ctx, const uint64_t UseSeed ) { ctx -> Seed[ 0 ] = UseSeed; @@ -633,7 +635,7 @@ static inline void komihash_stream_init( komihash_stream_t* const ctx, * @param MsgLen Message's length, in bytes, can be zero. */ -static inline void komihash_stream_update( komihash_stream_t* const ctx, +static IRAM_ATTR inline void komihash_stream_update( komihash_stream_t* const ctx, const void* const Msg0, size_t MsgLen ) { const uint8_t* Msg = (const uint8_t*) Msg0; @@ -772,7 +774,7 @@ static inline void komihash_stream_update( komihash_stream_t* const ctx, * @return 64-bit hash value. */ -static inline uint64_t komihash_stream_final( komihash_stream_t* const ctx ) +static IRAM_ATTR inline uint64_t komihash_stream_final( komihash_stream_t* const ctx ) { const uint8_t* Msg = ctx -> Buf; size_t MsgLen = ctx -> BufFill; @@ -817,7 +819,7 @@ static inline uint64_t komihash_stream_final( komihash_stream_t* const ctx ) * @return 64-bit hash value. */ -static inline uint64_t komihash_stream_oneshot( const void* const Msg, +static IRAM_ATTR inline uint64_t komihash_stream_oneshot( const void* const Msg, const size_t MsgLen, const uint64_t UseSeed ) { komihash_stream_t ctx; diff --git a/lib/wavpack/CMakeLists.txt b/lib/wavpack/CMakeLists.txt index 98fcda95..f2f24933 100644 --- a/lib/wavpack/CMakeLists.txt +++ b/lib/wavpack/CMakeLists.txt @@ -1,4 +1,5 @@ idf_component_register( SRCS bits.c float.c wputils.c metadata.c unpack.c words.c INCLUDE_DIRS . + LDFRAGMENTS wavpack.lf ) diff --git a/lib/wavpack/wavpack.lf b/lib/wavpack/wavpack.lf new file mode 100644 index 00000000..686acad8 --- /dev/null +++ b/lib/wavpack/wavpack.lf @@ -0,0 +1,4 @@ +[mapping:libwavpack] +archive: libwavpack.a +entries: + * (noflash) diff --git a/lua/fonts/fusion10 b/lua/fonts/fusion10 Binary files differindex adf6fcfc..78369227 100644 --- a/lua/fonts/fusion10 +++ b/lua/fonts/fusion10 diff --git a/lua/fonts/fusion12 b/lua/fonts/fusion12 Binary files differindex c19f896c..b7bffc08 100644 --- a/lua/fonts/fusion12 +++ b/lua/fonts/fusion12 diff --git a/lua/licenses.lua b/lua/licenses.lua index 31d48a40..7a66c063 100644 --- a/lua/licenses.lua +++ b/lua/licenses.lua @@ -62,19 +62,18 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.]]) end -local function xiphbsd(copyright) +local function bsd3(copyright, name) show_license(copyright .. [[ 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 the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +* 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 ]] .. name .. [[ nor the names of its 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 THE FOUNDATION OR CONTRIBUTORS 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.]]) +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 THE REGENTS OR CONTRIBUTORS 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.]]) end local function apache(copyright) @@ -203,6 +202,9 @@ return function(self) library("Fusion font", "OFL", function() ofl("Copyright (C) 2022 TakWolf") end) + library("Galmuri font", "OFL", function() + ofl("Copyright (c) 2019–2024 Lee Minseo (quiple@quiple.dev)") + end) library("komihash", "MIT", function() mit("Copyright (c) 2021-2022 Aleksey Vaneev") end) @@ -242,27 +244,35 @@ return function(self) library("MillerShuffle", "Apache 2.0", function() apache("Copyright 2022 Ronald Ross Miller") end) + library("Miseki font", "OFL", function() + ofl("Copyright (c) 2023-2024 Mark Li (itmarkibfb@gmail.com)") + end) library("ogg", "BSD", function() - xiphbsd("Copyright (c) 2002, Xiph.org Foundation") + bsd3("Copyright (c) 2002, Xiph.org Foundation", "Xiph.org Foundation") end) library("Opus", "BSD", function() - xiphbsd( - "Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic, Jean-Marc Valin, Timothy B. Terriberry, CSIRO, Gregory Maxwell, Mark Borgerding, Erik de Castro Lopo") + bsd3( + "Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic, Jean-Marc Valin, Timothy B. Terriberry, CSIRO, Gregory Maxwell, Mark Borgerding, Erik de Castro Lopo", + "Xiph.org Foundation") end) library("Opusfile", "BSD", function() - xiphbsd("Copyright (c) 1994-2013 Xiph.Org Foundation and contributors") + bsd3("Copyright (c) 1994-2013 Xiph.Org Foundation and contributors", "Xiph.org Foundation") end) library("result", "MIT", function() mit("Copyright (c) 2017-2021 Matthew Rodusek") end) library("speexdsp", "BSD", function() - xiphbsd( - "Copyright 2002-2008 Xiph.org Foundation, Copyright 2002-2008 Jean-Marc Valin, Copyright 2005-2007 Analog Devices Inc., Copyright 2005-2008 Commonwealth Scientific and Industrial Research, Organisation (CSIRO), Copyright 1993, 2002, 2006 David Rowe, Copyright 2003 EpicGames, Copyright 1992-1994 Jutta Degener, Carsten Bormann") + bsd3( + "Copyright 2002-2008 Xiph.org Foundation, Copyright 2002-2008 Jean-Marc Valin, Copyright 2005-2007 Analog Devices Inc., Copyright 2005-2008 Commonwealth Scientific and Industrial Research, Organisation (CSIRO), Copyright 1993, 2002, 2006 David Rowe, Copyright 2003 EpicGames, Copyright 1992-1994 Jutta Degener, Carsten Bormann", + "Xiph.org Foundation") end) library("tinyfsm", "MIT", function() mit("Copyright (c) 2012-2022 Axel Burri") end) library("tremor", "BSD", function() - xiphbsd("Copyright (c) 2002, Xiph.org Foundation") + bsd3("Copyright (c) 2002, Xiph.org Foundation", "Xiph.org Foundation") + end) + library("WavPack", "BSD", function() + bsd3("Copyright (c) 1998 - 2006 Conifer Software, All rights reserved.", "Conifer Software") end) end diff --git a/lua/settings.lua b/lua/settings.lua index d60ecfda..bd5be2ee 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -406,24 +406,38 @@ settings.ThemeSettings = SettingsScreen:new { selected_idx = idx end - local theme_chooser = self.content:Dropdown { + local theme_container = self.content:Object { + w = lvgl.PCT(100), + h = lvgl.SIZE_CONTENT, + flex = { + flex_direction = "column", + justify_content = "flex-start", + align_items = "space-evenly", + align_content = "flex-start", + }, + pad_row = 4, + } + theme_container:add_style(styles.list_item) + local theme_chooser = theme_container:Dropdown { options = options, symbol = img.chevron, } - local theme_chooser_desc = widgets.Description(theme_chooser, "Theme") - theme_chooser:set({ selected = selected_idx }) - - theme_chooser:onevent(lvgl.EVENT.VALUE_CHANGED, function() + local theme_reload = function() local option = theme_chooser:get('selected_str') local selectedTheme = themeOptions[option] if (selectedTheme) then theme.load_theme(tostring(selectedTheme)) backstack.reset(main_menu:new()) end - end) - + end + theme_chooser:set({ selected = selected_idx }) + theme_chooser:onevent(lvgl.EVENT.VALUE_CHANGED, theme_reload) theme_chooser:focus() + + local theme_reload_btn = theme_container:Button {} + theme_reload_btn:Label { text = "Reload" } + theme_reload_btn:onClicked(theme_reload) end } diff --git a/lua/widgets.lua b/lua/widgets.lua index 5e2ed858..6274cd1c 100644 --- a/lua/widgets.lua +++ b/lua/widgets.lua @@ -112,8 +112,9 @@ function widgets.StatusBar(parent, opts) } if not opts.transparent_bg then - theme.set_subject(root, "header"); + theme.set_subject(root, "header") end + theme.set_subject(root, "status_bar") if opts.back_cb then local back = root:Button { @@ -148,6 +149,7 @@ function widgets.StatusBar(parent, opts) if opts.title then title:set { text = opts.title } end + theme.set_subject(title, "status_bar_title") local db_updating = root:Image { src = img.db } theme.set_subject(db_updating, "database_indicator") @@ -160,9 +162,10 @@ function widgets.StatusBar(parent, opts) local is_charging = nil local percent = nil + local charge_state = nil local function update_battery_icon() - if is_charging == nil or percent == nil then return end + if is_charging == nil or percent == nil or charge_state == nil then return end local src theme.set_subject(battery_icon, "battery") if percent >= 95 then @@ -184,10 +187,13 @@ function widgets.StatusBar(parent, opts) theme.set_subject(battery_icon, "battery_0") src = img.bat_0 end + theme.set_subject(battery_icon, "battery_state_" .. charge_state) if is_charging then theme.set_subject(battery_icon, "battery_charging") theme.set_subject(charge_icon, "battery_charge_icon") + theme.set_subject(charge_icon, "battery_charge_icon_state_" .. charge_state) theme.set_subject(charge_icon_outline, "battery_charge_outline") + theme.set_subject(charge_icon_outline, "battery_charge_icon_outline_state_" .. charge_state) charge_icon:clear_flag(lvgl.FLAG.HIDDEN) charge_icon_outline:clear_flag(lvgl.FLAG.HIDDEN) else @@ -209,6 +215,10 @@ function widgets.StatusBar(parent, opts) percent = pct update_battery_icon() end), + power.charge_state:bind(function(state) + charge_state = state + update_battery_icon() + end), power.plugged_in:bind(function(p) is_charging = p update_battery_icon() diff --git a/src/codecs/sample.cpp b/src/codecs/sample.cpp index 63d14203..faf8b0f9 100644 --- a/src/codecs/sample.cpp +++ b/src/codecs/sample.cpp @@ -13,13 +13,17 @@ namespace sample { -static uint64_t sSeed1{0}; -static uint64_t sSeed2{0}; - auto shiftWithDither(int64_t src, uint_fast8_t bits) -> Sample { // FIXME: Use a better dither. - int16_t noise = static_cast<int16_t>(komirand(&sSeed1, &sSeed2) & 1); - return (src >> bits) ^ noise; + static uint64_t sSeed1{0}; + static uint64_t sSeed2{0}; + static uint64_t noise; + static uint_fast8_t pos = 0; + if (pos++ % 64 == 0) + noise = komirand(&sSeed1, &sSeed2); + else + noise >>= 1; + return (src >> bits) ^ (noise & 1); } } // namespace sample diff --git a/src/codecs/wavpack.cpp b/src/codecs/wavpack.cpp index fa168d32..709302e6 100644 --- a/src/codecs/wavpack.cpp +++ b/src/codecs/wavpack.cpp @@ -45,7 +45,7 @@ WavPackDecoder::WavPackDecoder() : input_(), buf_() { buf_ = static_cast<int32_t*>( heap_caps_malloc( kBufSize * sizeof(int32_t), - MALLOC_CAP_INTERNAL | MALLOC_CAP_CACHE_ALIGNED + MALLOC_CAP_INTERNAL | MALLOC_CAP_32BIT )); } @@ -73,7 +73,7 @@ auto WavPackDecoder::OpenStream(std::shared_ptr<IStream> input, uint32_t offset) ); const auto rate = WavpackGetSampleRate(&wavpack_); if (offset && total && input_.get()->CanSeek()) { - const uint32_t want = offset * rate - 1; + const uint32_t want = offset * rate; if (total < want) { ESP_LOGE(kTag, "seeking: offset points beyond the end of the file"); return cpp::fail(Error::kInternalError); @@ -96,7 +96,11 @@ auto WavPackDecoder::OpenStream(std::shared_ptr<IStream> input, uint32_t offset) } const uint32_t blockIndex = loadLe32(header + 16); const uint32_t blockSamples = loadLe32(header + 20); - if (want >= blockIndex && want <= blockIndex + blockSamples) { + if (want >= blockIndex && want == blockIndex + blockSamples) { + input_->SeekTo(size - 24, IStream::SeekFrom::kCurrentPosition); + target = 0; + break; + } else if (want >= blockIndex && want < blockIndex + blockSamples) { input_->SeekTo(-32, IStream::SeekFrom::kCurrentPosition); target = want - blockIndex; break; @@ -150,8 +154,14 @@ auto WavPackDecoder::DecodeTo(std::span<sample::Sample> output) ESP_LOGE(kTag, "CRC error"); return cpp::fail(Error::kMalformedData); } - for (size_t i = 0; i < samples; i++) - output[i] = sample::FromSigned(buf_[i], bitdepth_); + if (bitdepth_ == 16) + for (size_t i = 0; i < samples; i++) + output[i] = buf_[i]; + else if (bitdepth_ > 16) + for (size_t i = 0; i < samples; i++) + output[i] = sample::shiftWithDither(buf_[i], bitdepth_ - 16); + else for (size_t i = 0; i < samples; i++) + output[i] = buf_[i] << (16 - bitdepth_); return OutputInfo{ .samples_written = samples, .is_stream_finished = samples == 0, diff --git a/src/tangara/audio/audio_decoder.cpp b/src/tangara/audio/audio_decoder.cpp index fca7e6da..2306e994 100644 --- a/src/tangara/audio/audio_decoder.cpp +++ b/src/tangara/audio/audio_decoder.cpp @@ -70,7 +70,7 @@ Decoder::Decoder(std::shared_ptr<SampleProcessor> processor) ESP_LOGI(kTag, "allocating codec buffer, %u KiB", kCodecBufferLength / 1024); codec_buffer_ = { reinterpret_cast<sample::Sample*>(heap_caps_calloc( - kCodecBufferLength, sizeof(sample::Sample), MALLOC_CAP_DMA)), + kCodecBufferLength, sizeof(sample::Sample), MALLOC_CAP_SPIRAM)), kCodecBufferLength}; } diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp index 1e8e0cf6..7c1b010d 100644 --- a/src/tangara/audio/audio_fsm.cpp +++ b/src/tangara/audio/audio_fsm.cpp @@ -148,9 +148,7 @@ void AudioState::react(const QueueUpdate& ev) { void AudioState::react(const SetTrack& ev) { if (std::holds_alternative<std::monostate>(ev.new_track)) { - ESP_LOGI(kTag, "playback finished, awaiting drain"); sDecoder->open({}); - sStreamCues.clear(); return; } @@ -212,6 +210,7 @@ void AudioState::react(const TtsPlaybackChanged& ev) { } void AudioState::react(const internal::DecodingFinished& ev) { + ESP_LOGD(kTag, "end of file decoded; awaiting playback of buffered audio"); // If we just finished playing whatever's at the front of the queue, then we // need to advanve and start playing the next one ASAP in order to continue // gaplessly. diff --git a/src/tangara/audio/processor.cpp b/src/tangara/audio/processor.cpp index 2fa7f78e..3126f050 100644 --- a/src/tangara/audio/processor.cpp +++ b/src/tangara/audio/processor.cpp @@ -52,7 +52,7 @@ SampleProcessor::SampleProcessor(drivers::PcmBuffer& sink) : commands_(xQueueCreate(2, sizeof(Args))), source_(xStreamBufferCreateWithCaps(kSourceBufferLength + 1, sizeof(sample::Sample), - MALLOC_CAP_DMA)), + MALLOC_CAP_SPIRAM)), sink_(sink), unprocessed_samples_(0) { tasks::StartPersistent<tasks::Type::kAudioConverter>([&]() { Main(); }); @@ -354,7 +354,7 @@ Buffer::Buffer() : storage_(reinterpret_cast<sample::Sample*>( heap_caps_calloc(kSampleBufferLength, sizeof(sample::Sample), - MALLOC_CAP_DMA))), + MALLOC_CAP_SPIRAM))), buffer_(storage_, kSampleBufferLength), samples_in_buffer_() {} diff --git a/src/tangara/audio/stream_cues.cpp b/src/tangara/audio/stream_cues.cpp index 611138c6..6a9a7674 100644 --- a/src/tangara/audio/stream_cues.cpp +++ b/src/tangara/audio/stream_cues.cpp @@ -43,11 +43,6 @@ auto StreamCues::addCue(std::shared_ptr<TrackInfo> track, uint32_t sample) } } -auto StreamCues::clear() -> void { - upcoming_.clear(); - current_ = {}; -} - auto StreamCues::current() -> std::pair<std::shared_ptr<TrackInfo>, uint32_t> { if (!current_) { return {}; diff --git a/src/tangara/audio/stream_cues.hpp b/src/tangara/audio/stream_cues.hpp index 70ad49a7..cd0782b0 100644 --- a/src/tangara/audio/stream_cues.hpp +++ b/src/tangara/audio/stream_cues.hpp @@ -34,8 +34,6 @@ class StreamCues { auto addCue(std::shared_ptr<TrackInfo>, uint32_t start_at) -> void; - auto clear() -> void; - private: uint32_t now_; diff --git a/src/tasks/tasks.cpp b/src/tasks/tasks.cpp index f0b567f2..c85b492b 100644 --- a/src/tasks/tasks.cpp +++ b/src/tasks/tasks.cpp @@ -40,8 +40,8 @@ auto AllocateStack() -> std::span<StackType_t>; template <> auto AllocateStack<Type::kAudioDecoder>() -> std::span<StackType_t> { constexpr std::size_t size = 20 * 1024; - static StackType_t sStack[size]; - return {sStack, size}; + return {static_cast<StackType_t*>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM)), + size}; } // LVGL requires only a relatively small stack. Lua's stack is allocated // separately. @@ -55,8 +55,8 @@ template <> // PCM conversion and resampling uses a very small amount of stack. auto AllocateStack<Type::kAudioConverter>() -> std::span<StackType_t> { constexpr std::size_t size = 4 * 1024; - static StackType_t sStack[size]; - return {sStack, size}; + return {static_cast<StackType_t*>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM)), + size}; } // Background workers receive huge stacks in PSRAM. This is mostly to faciliate // use of LevelDB from any bg worker; Leveldb is designed for non-embedded use diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/ark-pixel.txt b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/ark-pixel.txt index 94abec4f..be1dc1f3 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/ark-pixel.txt +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/ark-pixel.txt @@ -1,94 +1,94 @@ -Copyright (c) 2021, TakWolf (https://takwolf.com), -with Reserved Font Name 'Ark Pixel'. - -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. +Copyright (c) 2021, TakWolf (https://takwolf.com),
+with Reserved Font Name 'Ark Pixel'.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/boutique-bitmap-9x9.txt b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/boutique-bitmap-9x9.txt index 4ad01759..f2a0f7f8 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/boutique-bitmap-9x9.txt +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/boutique-bitmap-9x9.txt @@ -1,118 +1,122 @@ -[BoutiqueBitmap9x9] -2020-2022《字言字語》Cen-cyun, Liu. Luke Liu. -https://fontspeech.blogspot.com/ -These fonts are free software. -Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially. -THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. -此字型是免費的。 -無論您是否進行對本字型進行商業或非商業性修改，均可無限制地使用，複製和分發它們。 -本字型的衍生品之授權必須與此字型相同，且不作任何擔保。 -此字体是免费的。 -无论您是否进行对本字型进行商业或非商业性修改，均可无限制地使用，复制和分发它们。 -本字型的衍生品之授权必须与此字型相同，且不作任何担保。 -[M+ BITMAP FONTS] -Copyright (C) 2002-2004 COZ -These fonts are free software. -Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. -THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. -これらのフォントはフリー（自由な）ソフトウエアです。 -あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、複製、再配布することができますが、全て無保証とさせていただきます。 -[ベストテン（BestTen-DOT）] -フリーフォントのベストテンは無料でダウンロードできるドットフォント。商用・非商用問わず使用可能なので、安心してダウンロードしてください。 -作成した印刷物およびデジタル・コンテンツにつき、その商用・非商用にかかわらず印刷、放送、通信、各種記録メディアなどの媒体の形式も問わず、使用をすることができます。プログラムへの埋め込みが可能です。 -このフォントのライセンスは、 -M+のライセンスに準じます。 -M+ FONT LICENSEについては、配布物に含まれる -mplus_bitmap_fonts をご覧ください。 - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://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. +[BoutiqueBitmap9x9]
+Copyright © 2025 字言字型 版權所有。
+Copyright © 2025 fancy type foundry. All rights reserved.
+2020-2025《字言字語》Cen-cyun, Liu. Luke Liu.
+https://fontspeech.blogspot.com/
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+此字型是免費的。
+無論您是否進行對本字型進行商業或非商業性修改，均可無限制地使用，複製和分發它們。
+本字型的衍生品之授權必須與此字型相同，且不作任何擔保。
+此字体是免费的。
+无论您是否进行对本字型进行商业或非商业性修改，均可无限制地使用，复制和分发它们。
+本字型的衍生品之授权必须与此字型相同，且不作任何担保。
+[M+ BITMAP FONTS]
+Copyright (C) 2002-2004 COZ
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+これらのフォントはフリー（自由な）ソフトウエアです。
+あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、複製、再配布することができますが、全て無保証とさせていただきます。
+[ベストテン（BestTen-DOT）]
+フリーフォントのベストテンは無料でダウンロードできるドットフォント。商用・非商用問わず使用可能なので、安心してダウンロードしてください。
+作成した印刷物およびデジタル・コンテンツにつき、その商用・非商用にかかわらず印刷、放送、通信、各種記録メディアなどの媒体の形式も問わず、使用をすることができます。プログラムへの埋め込みが可能です。
+このフォントのライセンスは、
+M+のライセンスに準じます。
+M+ FONT LICENSEについては、配布物に含まれる
+mplus_bitmap_fonts をご覧ください。
+[Fusion Pixel]
+Copyright (c) 2022, TakWolf (https://takwolf.com), with Reserved Font Name 'Fusion Pixel'.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://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/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/galmuri.txt b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/galmuri.txt index 295a6fda..c6c485da 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/galmuri.txt +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/LICENSE/galmuri.txt @@ -1,8 +1,8 @@ -Copyright (c) 2019-2023 Minseo Lee (itoupluk427@gmail.com) +Copyright (c) 2019–2024 Lee Minseo (quiple@quiple.dev) -This Font Software is licensed under the SIL Open Font License, Version 1.1. +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 +https://openfontlicense.org ----------------------------------------------------------- @@ -18,7 +18,7 @@ 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, +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 diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/OFL.txt b/tools/fonts/fusion/fusion-pixel-10px-proportional/OFL.txt index 746b9397..45986b79 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/OFL.txt +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/OFL.txt @@ -1,94 +1,94 @@ -Copyright (c) 2022, TakWolf (https://takwolf.com), -with Reserved Font Name 'Fusion Pixel'. - -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. +Copyright (c) 2022, TakWolf (https://takwolf.com),
+with Reserved Font Name 'Fusion Pixel'.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ja.ttf b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ja.ttf Binary files differindex 640ac8b5..b120355d 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ja.ttf +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ja.ttf diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ko.ttf b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ko.ttf Binary files differindex 71cb5b0a..edee1f0e 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ko.ttf +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-ko.ttf diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-latin.ttf b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-latin.ttf Binary files differindex 8a077dbb..5a9130f5 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-latin.ttf +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-latin.ttf diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hans.ttf b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hans.ttf Binary files differindex f14942d7..b6ae05db 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hans.ttf +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hans.ttf diff --git a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hant.ttf b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hant.ttf Binary files differindex c9f4ad3e..52a699c8 100644 --- a/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hant.ttf +++ b/tools/fonts/fusion/fusion-pixel-10px-proportional/fusion-pixel-10px-proportional-zh_hant.ttf diff --git a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ja.ttf b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ja.ttf Binary files differindex 08bf3f01..ed5b97ab 100644 --- a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ja.ttf +++ b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ja.ttf diff --git a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ko.ttf b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ko.ttf Binary files differindex b11ee7a3..aaf9b27b 100644 --- a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ko.ttf +++ b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-ko.ttf diff --git a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-latin.ttf b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-latin.ttf Binary files differindex 4684dda5..9a0aa3bd 100644 --- a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-latin.ttf +++ b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-latin.ttf diff --git a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hans.ttf b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hans.ttf Binary files differindex 9052c501..dd06ffcb 100644 --- a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hans.ttf +++ b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hans.ttf diff --git a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hant.ttf b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hant.ttf Binary files differindex dfa93ea9..24ad549c 100644 --- a/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hant.ttf +++ b/tools/fonts/fusion/fusion-pixel-12px-proportional/fusion-pixel-12px-proportional-zh_hant.ttf diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/boutique-bitmap-7x7.txt b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/boutique-bitmap-7x7.txt index 16d8630e..725d3a34 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/boutique-bitmap-7x7.txt +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/boutique-bitmap-7x7.txt @@ -1,110 +1,110 @@ -[BoutiqueBitmap7x7] -2020-2022《字言字語》Cen-cyun, Liu. Luke Liu. -https://fontspeech.blogspot.com/ -These fonts are free software. -Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially. -THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. -此字型是免費的。 -無論您是否進行對本字型進行商業或非商業性修改，均可無限制地使用，複製和分發它們。 -本字型的衍生品之授權必須與此字型相同，且不作任何擔保。 -[MisakiGothic] -Copyright (C) 2002-2019 Num Kadoma -These fonts are free software. -Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially. -THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. -これらのフォントはフリー（自由な）ソフトウエアです。 -あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、複製、再配布することができますが、全て無保証とさせていただきます。 -[观致] -这是日文字体Misaki基础上补充的 - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://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 +[BoutiqueBitmap7x7]
+2020-2022《字言字語》Cen-cyun, Liu. Luke Liu.
+https://fontspeech.blogspot.com/
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+此字型是免費的。
+無論您是否進行對本字型進行商業或非商業性修改，均可無限制地使用，複製和分發它們。
+本字型的衍生品之授權必須與此字型相同，且不作任何擔保。
+[MisakiGothic]
+Copyright (C) 2002-2019 Num Kadoma
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute them, with or without modification, either commercially or noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+これらのフォントはフリー（自由な）ソフトウエアです。
+あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、複製、再配布することができますが、全て無保証とさせていただきます。
+[观致]
+这是日文字体Misaki基础上补充的
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://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.
\ No newline at end of file diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/galmuri.txt b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/galmuri.txt index 295a6fda..c6c485da 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/galmuri.txt +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/galmuri.txt @@ -1,8 +1,8 @@ -Copyright (c) 2019-2023 Minseo Lee (itoupluk427@gmail.com) +Copyright (c) 2019–2024 Lee Minseo (quiple@quiple.dev) -This Font Software is licensed under the SIL Open Font License, Version 1.1. +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 +https://openfontlicense.org ----------------------------------------------------------- @@ -18,7 +18,7 @@ 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, +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 diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/miseki-bitmap.txt b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/miseki-bitmap.txt new file mode 100644 index 00000000..a43be199 --- /dev/null +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/LICENSE/miseki-bitmap.txt @@ -0,0 +1,92 @@ +Copyright (c) 2023-2024 Mark Li (itmarkibfb@gmail.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 AND 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/tools/fonts/fusion/fusion-pixel-8px-monospaced/OFL.txt b/tools/fonts/fusion/fusion-pixel-8px-monospaced/OFL.txt index 746b9397..45986b79 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/OFL.txt +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/OFL.txt @@ -1,94 +1,94 @@ -Copyright (c) 2022, TakWolf (https://takwolf.com), -with Reserved Font Name 'Fusion Pixel'. - -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. +Copyright (c) 2022, TakWolf (https://takwolf.com),
+with Reserved Font Name 'Fusion Pixel'.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ja.ttf b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ja.ttf Binary files differindex fb09a84f..935760cb 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ja.ttf +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ja.ttf diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ko.ttf b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ko.ttf Binary files differindex 46ae6a66..0f5e3a6e 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ko.ttf +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-ko.ttf diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-latin.ttf b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-latin.ttf Binary files differindex cb3ce746..a8c114b2 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-latin.ttf +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-latin.ttf diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hans.ttf b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hans.ttf Binary files differindex 7a22e8d3..ba5e2cbf 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hans.ttf +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hans.ttf diff --git a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hant.ttf b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hant.ttf Binary files differindex 5c094b78..27c428ed 100644 --- a/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hant.ttf +++ b/tools/fonts/fusion/fusion-pixel-8px-monospaced/fusion-pixel-8px-monospaced-zh_hant.ttf |