From 6ce70aee7efb9e915a6772ed5b200eac3a12d4ec Mon Sep 17 00:00:00 2001 From: 2ro <17595647+2ro@users.noreply.github.com> Date: Sat, 13 Jun 2026 21:45:56 -0400 Subject: [PATCH] =?UTF-8?q?Build=2057:=20Pay=20puck=20uses=20a=20Noto=20Sa?= =?UTF-8?q?ns=20JP=20=E3=83=84=20instead=20of=20Gamja=20Flower?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Owner disliked the Gamja Flower ツ style on the center Pay puck. Replace it with Noto Sans JP's cleaner, more geometric katakana tsu — subset to ONLY that one glyph (~1.7 KB) the same way the old one was, loaded as the "noto-tsu" family and drawn at the puck (mod.rs). Drop the now-unused Gamja Flower font + its license. --- fonts/GamjaFlower-OFL.txt | 93 ------------------------------------ fonts/GamjaFlowerTsu.ttf | Bin 1232 -> 0 bytes fonts/NotoSansJpTsu.otf | Bin 0 -> 1708 bytes src/gui/views/goblin/mod.rs | 4 +- src/lib.rs | 14 +++--- 5 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 fonts/GamjaFlower-OFL.txt delete mode 100644 fonts/GamjaFlowerTsu.ttf create mode 100644 fonts/NotoSansJpTsu.otf diff --git a/fonts/GamjaFlower-OFL.txt b/fonts/GamjaFlower-OFL.txt deleted file mode 100644 index 79b486cf..00000000 --- a/fonts/GamjaFlower-OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) YoonDesign Inc. All Rights Reserved. - -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/fonts/GamjaFlowerTsu.ttf b/fonts/GamjaFlowerTsu.ttf deleted file mode 100644 index 1f217e2e1bb910eda6e274206653dcff209468e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 zcma)6OHUI~7(I8UEiKTgN*_qI4BAvAf~EAKA~7m~pazJD1~)L$(o*OnfT&RuHX5TQ z8r_)a!uSu|s0)K8HgRE$uH5KPaH%^(J$I%GMi<_j`+etpk9)uSn1KM`#tKx74vvnD zVJjK|+YMSb4UUZ;xmUgOjr;+5a%608?AE~jtANr@J~dr1%4qBkkjwaZ)>tgdJjSn3 zJG1kbX5M-quM&UZSj}aOw5Qzn5D*peWR8Zq+v-l{+sMPY!qUaMeYj5l4|3;xY1+Uf z5yVRhN5QyQMnYU5e?+bqjY6jFwu`3cu{W1ikAwr9CO4+`7yVu{*8*V!m z(waO?>4Lh}-_X$Had&mLHEV81W8#&|r@4YbpVFe$dxX73Ja?#?zqj*HdiY?#7Yusb z0ej%u$`)O-Z+2<^K)9o6lds;tC+~7=zCa|t&AY|v4E1pXkaweqWyB;gnF;<7@_b~R z3ZyUJoSF0-{EnbJPT*7M^9xfy3%vu@*3`V(O74Intvn?TRh~EVRlTYU(?Xp8Yb^yf zH7@SL&Xo7;5UrM0-(aRTot*MlvkEZTME{VE*U?I}Vy&U-LMF(XAySG)rJGDzxeItH zrPs@HbZQ$rd9+fkTJl4m>8A^II4h%VF5)zYg$0_)EUZAol^RxY05@ychIUkH*p4K= z*02K+u>(g@LK&B^fLUab!xAfL$24|RPtaFF5&g(u(exK-9inBLuT1AVn`hT?@^|i{ z$z*hfGcHr6894|81>`Ap3^1dF3#R`hWftdYF&N#$$S8X+#&H~HFif1OCW`%M4c3kFVyY$iUH+p92;Qs5 uywQ68d*pkNO>oq6oj7d$11CA7m&}gP$mMlj6BFQp+uX`=^+!i%zKk04nIrn$Y zx#!P)_grUJmlHB!3K$UV2V70|8_r(<)E@%C4~@;uT>Vd3!l8#3!u>=7Mw1NZSI?A-^Be0p|{)F>0pNGQZs=>>kjY&u+@2}_aUzF zd3ld1-uof|L;dadp@7ZOjv!t`TPLUk|2 zLTE&c9|s#^>W>?v{!Zs{sG3GxI!68Z-~{3+#F#VsVz4?;tAG%a+a3}_EA?3YOV=a_g;v451)hpH@@>_nmr`H5CHH z<7}~XJyZIT-5mk8RQfp!w1jAM?xQD`F0CK%g!;UPJl>$_7bhD-!erP#;1fBUwYsLt zX0=sw2?K7gPZWjwEtc`|aWhZ1nBAd(rQFQXBsu>G$8%zs_jm(*c#sSAbB<7GV93iI z3cAe+3t9(Wq$+;%1Zl&37W%Ha)q!+v*aWh)=#Q){}Z3QtvYPaMBKQ2~Qz3U*i` zJ2w^95IKMQSnRw;E{z^BD64W+T12l=-idY_Bno1mrpK&(iM6yEMQn|1B8pZi6zSy0 zB2OFYhu?T)MX}6x8n2yw;<8iPH+s=1ceENTXU3I^cBQ6vx3NsQQz^e&DdDd+6Flk_w5bBl8e+StI1p*FbKdsV4B{h;x?CGm?kscQJLQ70dcOd1-( zi#^Lq#e&QD?b)Nt4@s8M3r5-AW~e?hp_Dll>jUM+az(F{niZ4#iX&etyeO4yZc6!U zw?39k=cJu8r{)%)pV!7ZW({@0*ZC{Ty{|ZFkk8wtJ>g469WaF4k!6%Qwrn@;>^8_jO09D6nc$GC z@rT&D5|1b8mvu=m32QWnKSg^w#h_la;KORwkbbbatqUsMli?w#9|(H~q29*_2cQzE zA1Vjw?W`Q)#URxGnU5NZpcu;FhD|-B?((fi7iCO(GhNi18R9aaRGR b@J%LqAh)(ydROE7V~^rpP3DYjdywA&a}>pW literal 0 HcmV?d00001 diff --git a/src/gui/views/goblin/mod.rs b/src/gui/views/goblin/mod.rs index 307b974d..e0fdd1f9 100644 --- a/src/gui/views/goblin/mod.rs +++ b/src/gui/views/goblin/mod.rs @@ -446,8 +446,8 @@ impl GoblinWalletView { rect.center(), egui::Align2::CENTER_CENTER, w::TSU, - // Gamja Flower's ツ — the cute smiley shape — only here. - FontId::new(31.0, egui::FontFamily::Name("gamja-tsu".into())), + // Noto Sans JP's clean ツ — the Pay puck mark, only here. + FontId::new(31.0, egui::FontFamily::Name("noto-tsu".into())), t.accent_ink, ); } diff --git a/src/lib.rs b/src/lib.rs index ae05a5b7..9746173c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -249,11 +249,11 @@ pub fn setup_fonts(ctx: &Context) { ), ), ); - // Gamja Flower subset — ONLY the ツ glyph (1.2 KB), used for the friendlier - // smiley-style ツ on the center Pay puck. Referenced solely at that widget. + // Noto Sans JP subset — ONLY the ツ glyph (~1.7 KB), the mark on the center + // Pay puck. A clean, geometric katakana tsu; referenced solely at that widget. fonts.font_data.insert( - "gamja-tsu".to_owned(), - plain(include_bytes!("../fonts/GamjaFlowerTsu.ttf")), + "noto-tsu".to_owned(), + plain(include_bytes!("../fonts/NotoSansJpTsu.otf")), ); // Default proportional stack: Geist first, icons and CJK/ツ as fallback. @@ -282,12 +282,12 @@ pub fn setup_fonts(ctx: &Context) { vec![name.to_owned(), "phosphor".to_owned(), "noto".to_owned()], ); } - // Gamja ツ family: the subset first, then the normal fallbacks so anything + // Puck ツ family: the subset first, then the normal fallbacks so anything // other than ツ still renders (the puck only ever draws ツ with it). fonts.families.insert( - egui::FontFamily::Name("gamja-tsu".into()), + egui::FontFamily::Name("noto-tsu".into()), vec![ - "gamja-tsu".to_owned(), + "noto-tsu".to_owned(), "geist-bold".to_owned(), "noto".to_owned(), ],