From 98ea44de36be4d23bf49354e85fe06fc1c4772a6 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Mon, 26 Apr 2021 09:31:09 -0400 Subject: [PATCH] Base: Add 36pt font to Marieta family plus minor fixes to 24pt Unslashes '0' and zeros out widths for control codes and unused glyphs --- Base/res/fonts/MarietaBold24.font | Bin 24910 -> 24910 bytes Base/res/fonts/MarietaBold36.font | Bin 0 -> 37198 bytes Base/res/fonts/MarietaRegular24.font | Bin 24910 -> 24910 bytes Base/res/fonts/MarietaRegular36.font | Bin 0 -> 37198 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Base/res/fonts/MarietaBold36.font create mode 100644 Base/res/fonts/MarietaRegular36.font diff --git a/Base/res/fonts/MarietaBold24.font b/Base/res/fonts/MarietaBold24.font index 13b213884b375ffe15e863998e5a61c81a97b4f4..d9ba2f19d4d9234bebf2afebebe3f30a3cabb4fe 100644 GIT binary patch delta 146 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 literal 0 HcmV?d00001 diff --git a/Base/res/fonts/MarietaRegular24.font b/Base/res/fonts/MarietaRegular24.font index 079fe700d76fb903e385892c736a7219d9ee5c1d..abeb38a568d7a6d1772eee5a311f15415eff8afa 100644 GIT binary patch delta 118 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�K`?B+189sAhC%ZQ=;jOs{{R2-3@}WrdqMdC zlpjE81vDoOnja@tFTK?vkDY@ZXpoyo$HVd$Hu^X_1H*TD$oP$Y4FiLG1$3+&+^+$R7hz(MoB1mk80>8z z`at?Y<`C%|yvh!M)&+pZ*guiJX3HKx3~3 z3=C}0c@5;g9&%iR!Vi?5$evFD#R+K6k{vSliChkYyDHFme`IlT*u;eZepR5k8(4gS z!e5Ta_yWZ%NIhsM8KnOKXki>Q4}j7;C|`i)8~?~d<{OY*fgIN8Y*4-c5Z1=vK&2w3=hw`X7gl|P_z3|#&|%QkH80m*~P zDR}+P&%gjO2jnDNm{?cB%jfqD40eAQ7~thIo;npYzX(zXE1y5W>Qj6L29XW|=WS5^ z#mK+_nxX-N9RsRsKyd)BBN!MMKyCt+W&c3+uss80$`LdK z1`RiU(3%p^dWm`l2GCk3(3&T_7NJRk+RWJMY)b3*AIuC4AE12~G%LyCg2MyUCME@g z+O!o64Dxjh4FAd*82%J9FnlN^%X$n=ptU`q_7x1v6fiJ=unlOPG<0oxfeZr!3_svw zV1QvzTNi{ueNzy|Fq{klcsX2ifRV4}0RvwS2!CLZc~`(7bFP5F;+O>-7aW&mC}@V@ zgl1lb2hIEp4;a}Q4nQ#()?;V^rAtuxCR4${09rF<0SXH_28IuyaDWbHg2y>PX#~{H zn}j{69|KX6WZ+rFV(=s29*gQ`#@zQtn34^L1G{| zT>6m3L3V-c1YuCv!Q2TmZ=h+Idq8C@sI3UXpdmSAKj316t02&L6Ot!DX#^Huxbz{5 zgX{v?3Bn*Zz}!O#4Kni|GZVxAc4mh5|I7@Gp!sZ&ASH&5>KzS%(GVC7fzc2c4S~@R z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c z4S~@R7!3hDA;8AWAtEFr%FMyRE6B{n%q74nC?F^xC@3Jn%q%D