From dbecff6469cafc4994aa2ef379b0221a269174a1 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sun, 3 Jul 2022 09:36:02 -0700
Subject: [PATCH] Improved font

---
 etc/block8.chr   | Bin 4096 -> 0 bytes
 etc/block8.icn   | Bin 0 -> 2048 bytes
 src/font.tal     | 146 ++++++++++++++++-------------------------------
 src/manifest.tal |   4 +-
 4 files changed, 51 insertions(+), 99 deletions(-)
 delete mode 100644 etc/block8.chr
 create mode 100644 etc/block8.icn

diff --git a/etc/block8.chr b/etc/block8.chr
deleted file mode 100644
index 9b7a05a6638f028823f2456db881f9ef10029342..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmeHIy=ogl5FQp`HgK2=xNxCDs5)F3lR}j^nKM|BB8_@MT!h4hN)r~{u^dLINTD)S
zaH(f-r6<V)xKNow9G=;OnOV6t1cXKs?6>p(&F%^ymXrii-pn#yhDFg71^#$5ombB6
z#2yNp_CyU2_2TY#{Zs6FybOz8P9mGOLt@3K$kI&3gEVzmU@WQlqr$~XLgHXLSYKYT
ziSs1lav2C1D7|r2)o9!`%D#W?8)FRXn+o|*dgrU1j^Fr>wW<NkPha*&FxT;@cB!7s
z5bJ)iomA09?MpN=x7aa<2aKQSh|aIp>(w0_puRyu81KBNFJtVds#LwGL=ipqztw!T
zxYGW=bie2v<s0nre}ZHfmCx6U?V^_Yuo@JZ&&w(Z=i59zt(MD2#@HW<FhtE^fJnbo
z=auy6p!D&4n^3P19Kt`!c_)lVnEl)GUKo=yD<pofR_CKJNjg>iP3gMiQ}(ZN9Dm0!
zPQv|37^i#pw^ayV@!27*Gjl&@e}EklAoE4N*YgKJ^T^&Iq1xa1zlvY-pBo*I?uYc>
zo^Rm`<Aa_*fUp0l`2*neqI~y6v8w-h6UTQ5W&WYRH}wgh0M8ptpyGuGPvLL^6vpsT
z{CNHVRNlR|F9vG<*dOwv>uc}<l6m#=ywdMwd;Ekid_PU}ega&5R@vSxXWxqc#}6mG
zpHF8GZYD3v<!xQxeiA~4CCQNO?Zw&GvkS2=N2Ag8ja-0o@?-LSBDmW}gMOF&yA*IJ
zct79OjgRuP<2x;Ea$24yQolVPl!J4Hu|R7Twie43{7z*Y!~7oxwykjTFMq;^@u4rM
mecj`F(th;baeZXqU>O*W$K`k||7QS0+|c-7TR%2-WZ)GR2mjar

diff --git a/etc/block8.icn b/etc/block8.icn
new file mode 100644
index 0000000000000000000000000000000000000000..87a8023fc9eab791baba439e9089cd231b9749d7
GIT binary patch
literal 2048
zcmeHFv1%JZ6dV>|HXzIfT)0pnR2{C2Nuf%d%o!|5kw(2BE<&P0r4fg;EQb*)Qm9N7
zT<RNK=}YnfDO9F74$tfg)vg2~d3VR$+nt?x`*wj8P63B3OL@^01wXijFHP-$!n$q&
zJXWiRAJrVLn|R$^(S>a(EP0vB$b)kw1ydw)dB`*g)1qGPQ3gec>sUaaxhcJGgdM~2
z-fd`%F=#yNU|t4ai{FHnwKU**y~2ff(oVKS`O?O*EPxz=vvg(_LR-u-Y_{9YgYt%j
zpbkMVbMHNMnJ{Yk?^Rbq)$PB_my>Z_|4{!Ki!d6mR{K>IKov%V-<ufNJwI>O>nHg!
zqJB+6%-8H|@(<FF`)#7GlTQdwb7E0snM0DBBE)_Njc25yF>N=Y--M@<=M(sx+iw}P
z<N37V4(F>@01exb{@4+-2n!}P8&DHj0qX-e9LLL0d(D^O7wZ)+jCfuxBC6l&yn*%)
zcHj^9&v}N{O;s}SWtaHsfOvE}>goJmc3eP=7mpY_KqNisYNyO4H`RF2FXW>OAiahc
zs6jW+z3yddpVR#`@qPj~AIaK|(}UTUqWAvY8S=^Ov7A|4-&fWB2ZO;<F@U|g_<V6?
zu^bMEw|8?a$KS?Z$8&Ug9O!k>5pmEtuDiJlaXmfW6t;c7Ja1dr%l@)|Nu;2)L~AK~
uJe@ab{e`4`3Viw*pOf!E_A))*hm%+Ej~fm~qvdEcU>64b5&n-8cHk8Yn*z%K

literal 0
HcmV?d00001

diff --git a/src/font.tal b/src/font.tal
index f597434..2cdc420 100644
--- a/src/font.tal
+++ b/src/font.tal
@@ -1,97 +1,49 @@
-@font
-0000 0000 0000 0000
-1010 1010 1000 1000
-2828 0000 0000 0000
-44fe 4444 44fe 4400
-107e 807c 02fc 1000
-0044 0810 2044 0000
-7884 8864 9a84 7a00
-1020 0000 0000 0000
-2040 4040 4040 2000
-0804 0404 0404 0800
-0044 2810 2844 0000
-0010 107c 1010 0000
-0000 0000 0010 2000
-0000 007c 0000 0000
-0000 0000 0000 1000
-0204 0810 2040 8000
-7c82 8282 8282 7c00
-3010 1010 1010 3800
-7c82 027c 8080 fe00
-7c82 021c 0282 7c00
-2242 82fe 0202 0200
-fe80 807c 0282 7c00
-7c82 80fc 8282 7c00
-fe82 0408 0810 1000
-7c82 827c 8282 7c00
-7c82 827e 0202 0200
-0000 1000 1000 0000
-0000 1000 1010 2000
-0008 1020 1008 0000
-0000 7c00 7c00 0000
-0010 0804 0810 0000
-7c82 820c 1000 1000
-7c82 92aa aa92 6400
-7c82 82fe 8282 8200
-fc82 82fc 8282 fc00
-7c82 8080 8082 7c00
-fc82 8282 8282 fc00
-fe80 80f0 8080 fe00
-fe80 80f0 8080 8000
-7c82 808e 8282 7c00
-8282 82fe 8282 8200
-3810 1010 1010 3800
-0602 0202 0282 7c00
-8284 88f0 8884 8200
-8080 8080 8080 fe00
-ec92 9292 9292 9200
-c2a2 a292 8a8a 8600
-7c82 8282 8282 7c00
-fc82 82fc 8080 8000
-7c82 8282 8a84 7a00
-fc82 82fc 8282 8200
-7c82 807c 0282 7c00
-fe10 1010 1010 1000
-8282 8282 8286 7a00
-8282 8282 4428 1000
-9292 9292 9292 ec00
-8244 2810 2844 8200
-8282 4428 1010 1000
-fe02 0c10 6080 fe00
-6040 4040 4040 6000
-8040 2010 0804 0200
-0c04 0404 0404 0c00
-1028 0000 0000 0000
-0000 0000 0000 fe00
-1008 0000 0000 0000
-0000 7c02 7e82 7e00
-0000 fc82 fc82 fc00
-0000 7c82 8082 7c00
-0000 027e 8282 7e00
-0000 7c82 fc80 7e00
-0000 7c82 e080 8000
-0000 7c82 7e02 fc00
-0000 80fc 8282 8200
-0000 1000 1010 1000
-0000 0200 0282 7c00
-0000 8284 f884 8200
-0000 8080 8080 7e00
-0000 6c92 9292 9200
-0000 bcc2 8282 8200
-0000 7c82 8282 7c00
-0000 fc82 fc80 8000
-0000 7c82 7e02 0200
-0000 bcc2 8080 8000
-0000 7e80 7c02 fc00
-0000 fe10 1010 1000
-0000 8282 8282 7c00
-0000 8282 4428 1000
-0000 9292 9292 6c00
-0000 8244 3844 8200
-0000 8282 7e02 7c00
-0000 fe02 7c80 fe00
-2040 4080 4040 2000
-1010 1010 1010 1000
-0804 0402 0404 0800
-0000 0032 4c00 0000
-0000 0000 0000 0000
+@font ( block8 )
+0000 0000 0000 0000 1010 1010 1000 1000
+2828 0000 0000 0000 44fe 4444 44fe 4400
+107e 807c 02fc 1000 0044 0810 2044 0000
+7884 8864 9a84 7a00 1020 0000 0000 0000
+2040 4040 4040 2000 0804 0404 0404 0800
+0044 2810 2844 0000 0010 107c 1010 0000
+0000 0000 0010 2000 0000 007c 0000 0000
+0000 0000 0000 1000 0204 0810 2040 8000
+7c82 8282 8282 7c00 3010 1010 1010 3800
+7c82 027c 8080 fe00 7c82 021c 0282 7c00
+2242 82fe 0202 0200 fe80 807c 0282 7c00
+7c82 80fc 8282 7c00 fe82 0408 0810 1000
+7c82 827c 8282 7c00 7c82 827e 0202 0200
+0000 1000 1000 0000 0000 1000 1010 2000
+0008 1020 1008 0000 0000 7c00 7c00 0000
+0010 0804 0810 0000 7c82 820c 1000 1000
+7c82 92aa aa92 6400 7c82 82fe 8282 8200
+fc82 82fc 8282 fc00 7c82 8080 8082 7c00
+fc82 8282 8282 fc00 fe80 80f0 8080 fe00
+fe80 80f0 8080 8000 7c82 808e 8282 7c00
+8282 82fe 8282 8200 3810 1010 1010 3800
+0602 0202 0282 7c00 8284 88f0 8884 8200
+8080 8080 8080 fe00 ec92 9292 9292 9200
+c2a2 a292 8a8a 8600 7c82 8282 8282 7c00
+fc82 82fc 8080 8000 7c82 8282 8a84 7a00
+fc82 82fc 8282 8200 7c82 807c 0282 7c00
+fe10 1010 1010 1000 8282 8282 8286 7a00
+8282 4444 2828 1000 9292 9292 9292 6c00
+8244 2810 2844 8200 8282 4428 1010 1000
+fe02 0c10 6080 fe00 6040 4040 4040 6000
+8040 2010 0804 0200 0c04 0404 0404 0c00
+1028 0000 0000 0000 0000 0000 0000 fe00
+1008 0000 0000 0000 0000 7c02 7e82 7e00
+0000 fc82 fc82 fc00 0000 7c82 8082 7c00
+0000 027e 8282 7e00 0000 7c82 fc80 7e00
+0000 7c82 e080 8000 0000 7c82 7e02 fc00
+0000 80fc 8282 8200 0000 1000 1010 1000
+0000 0200 0282 7c00 0000 8284 f884 8200
+0000 8080 8080 7e00 0000 6c92 9292 9200
+0000 bcc2 8282 8200 0000 7c82 8282 7c00
+0000 fc82 fc80 8000 0000 7c82 7e02 0200
+0000 bcc2 8080 8000 0000 7e80 7c02 fc00
+0000 fe10 1010 1000 0000 8282 8282 7c00
+0000 8282 4428 1000 0000 9292 9292 6c00
+0000 8244 3844 8200 0000 8282 7e02 7c00
+0000 fe02 7c80 fe00 2040 4080 4040 2000
+1010 1010 1010 1000 0804 0402 0404 0800
+0000 0032 4c00 0000 aa55 aa55 aa55 aa55
diff --git a/src/manifest.tal b/src/manifest.tal
index f6c376e..14c6704 100644
--- a/src/manifest.tal
+++ b/src/manifest.tal
@@ -1,7 +1,7 @@
 @manifest
 
 	&name "Nasu $1 
-	&date "2022-06-28 $1
+	&date "2022-07-03 $1
 	&menu
 		07 "File $1
 			01 'n :file-new "New $1
@@ -355,7 +355,7 @@ JMP2r
 	&inv .Screen/x DEI2 #0010 SUB2 .Screen/x DEO2 ROT POP ;draw-str JSR2 POP2 JMP2r
 	&del "del $1 &tab "tab $1 &ent "ent $1 &spc "spc $1 &esc "esc $1
 
-@draw-str ( str* -- str* )
+@draw-str ( str* -- nextstr* )
 
 	&while
 		LDAk ,draw-chr JSR