From 2a01a25278379aea49c7db74d65131d0b18b9d2d Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@sbcglobal.net>
Date: Fri, 17 Jan 2025 17:59:43 -0800
Subject: [PATCH] Add default fonts to system directory

---
 src/dhgr.tk/inc/dhgrutils.plh              |   1 +
 src/dhgr.tk/libs/dhgrutils.pla             |  12 ++++++++++--
 src/dhgr.tk/makefile                       |   4 ++++
 src/dhgr.tk/utils/fonts/A2SLIM8.FON.BIN    | Bin 0 -> 1077 bytes
 src/dhgr.tk/utils/fonts/APPLE2.FON.BIN     | Bin 0 -> 788 bytes
 src/dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN | Bin 0 -> 788 bytes
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 src/dhgr.tk/utils/fonts/A2SLIM8.FON.BIN
 create mode 100644 src/dhgr.tk/utils/fonts/APPLE2.FON.BIN
 create mode 100644 src/dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN

diff --git a/src/dhgr.tk/inc/dhgrutils.plh b/src/dhgr.tk/inc/dhgrutils.plh
index f138b934..a1675a69 100644
--- a/src/dhgr.tk/inc/dhgrutils.plh
+++ b/src/dhgr.tk/inc/dhgrutils.plh
@@ -10,6 +10,7 @@ import dhgrutils
     //
     const FONT_DEFAULT  = 0
     const FONT_DEF_THIN = 1
+    const FONT_DEF_SLIM = 2
     //
     // Exported functions
     //
diff --git a/src/dhgr.tk/libs/dhgrutils.pla b/src/dhgr.tk/libs/dhgrutils.pla
index 78ec98e5..1df3cce3 100644
--- a/src/dhgr.tk/libs/dhgrutils.pla
+++ b/src/dhgr.tk/libs/dhgrutils.pla
@@ -31,7 +31,7 @@ end
 //
 // Current and default font pointers
 //
-var fontPtr, fontDefault, fontDefThin
+var fontPtr, fontDefault, fontDefThin, fontDefSlim
 //
 // Function pointers
 //
@@ -224,7 +224,7 @@ export def dcgrFont(font)#1
             fin
         fin
         font = fontDefault
-    elsif font == FONT_DEF_THIN
+    elsif font == FONT_DEF_THIN // Thin version of Apple2 font
         if not fontDefThin
             fontDefThin = fontRead("apple2thin.fon")
             if not fontDefThin
@@ -232,6 +232,14 @@ export def dcgrFont(font)#1
             fin
         fin
         font = fontDefThin
+    elsif font == FONT_DEF_SLIM // Proportional version of thin font
+        if not fontDefSlim
+            fontDefSlim = fontRead("a2slim8.fon")
+            if not fontDefSlim
+                return fontPtr
+            fin
+        fin
+        font = fontDefSlim
     fin
     prevFont = fontPtr
     fontPtr  = font
diff --git a/src/dhgr.tk/makefile b/src/dhgr.tk/makefile
index 89cf9d2f..faf6f9df 100644
--- a/src/dhgr.tk/makefile
+++ b/src/dhgr.tk/makefile
@@ -21,6 +21,10 @@ PENGUINS   = dhgr.tk/demos/penguins/PENGUINS.REL
 libs: $(DHGRLIB) $(DHGRUTILS)
 	cp $(DHGRLIB)   prodos/sys
 	cp $(DHGRUTILS) prodos/sys
+	-mkdir prodos/sys/fonts
+	cp dhgr.tk/utils/fonts/APPLE2.FON.BIN prodos/sys/fonts
+	cp dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN prodos/sys/fonts
+	cp dhgr.tk/utils/fonts/A2SLIM8.FON.BIN prodos/sys/fonts
 
 test: $(DHGRTEST) $(FONTTEST)
 	-mkdir prodos/dhgr.tk/
diff --git a/src/dhgr.tk/utils/fonts/A2SLIM8.FON.BIN b/src/dhgr.tk/utils/fonts/A2SLIM8.FON.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..cfe812543c6996580708334d77c9ab9add5fb131
GIT binary patch
literal 1077
zcmZ8gOKw9k2y}VWu`G)-^bEa057S*2xj}cma~1V7GvJr1PNWbF!!Y2Fm+STI^||fy
z^xj7Mu?K7I(=MjdtbN%*vwix--2)#_dv(WGc8AkrrN4KNzV3O)<!}cA^I+4!-;7nB
zx0^o-+s~{YfAA0+)9qkV=FEtgz}g%))<lejVglx1j5s^#rQiD4{^izZ#V{VH@TYG-
zj5WL`D`;`EM^uv<>dM(m`|<-^QCZy?do3j1Zq$fwr4V3aPQ`!%zZH+nVgx5n`opZ-
z?o4*#FNDWTOaucGnEzB6JcT(sPu4{$vsG7u79YSs-HZWEoa9fENGP6&!i1?V{TtJ#
zovL%N?4B`#*&GCU`dO@E5PfpE=V~&$ckvJH1BD;TjKve00w7v$&fZ#W)>x$y#6$fq
z1ge)k4BTVTxrH<Kl$LjPaO02mK;;smgyt$xlw%wiG)}z-j4@UDGYv9HZE0z~RgoIA
zN@^?<gw`0k$J(F-a~9;SO(Cb1?*`QI@^}wRd}*Ol`ao*J>b%7+%c)nVZWbv!WU!%D
TvK`Kq_}Kh!toTa7`1Io!4r6sP

literal 0
HcmV?d00001

diff --git a/src/dhgr.tk/utils/fonts/APPLE2.FON.BIN b/src/dhgr.tk/utils/fonts/APPLE2.FON.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..457dc30061493c7b63c01a090b1c5f40876c34bb
GIT binary patch
literal 788
zcmXw1O{>Eo5L`rpgis`SkRl>WDG%wP<WNcx;r*C*>!JUkfBnsvb`#u;JMPDr>G$<|
z{%!KL@}AuH+tI{H2w`l6(D4LuZB9Sg$#nM4ZdbAMZ0mXvvT4p5V=PYkQi_MK$)$>z
zbNxfXrzN#>*$r`!tr1DO)w3pX3mZtlC0f&^7at4ueGF^&Ub@MJ_-;*Bc*LEx7JTJP
z--<sVJ*S|-qb{ph=Yf$EE53OWd_U$*S|3N##0Ax^DoD;3am<Ch0I-buCL8uOype|R
zrcDsUF_pyj(LYoeed;<-^Qr<Gtc%`iB~SHSH}V14H;aKVFm)y7In+;_7b4PFXYhv$
z1J`<EzQERpCvWJ&J|`L`=JW;AUujeTbgUnH@7fTh(l8IkLx~K`2^;2Vz>RV3!0}`=
zbti`6Y3D1{<^|%uBzo`H1>&s-%rUMN`yxXCc;;sZRDk=t0;tD)MdUG257tj5i)Fb}
v1O|P(>>l$ILjZaTu<xTEOp5F6a$lBdS?>H#haF<P#)$vpas(Gv10IoofV(?A

literal 0
HcmV?d00001

diff --git a/src/dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN b/src/dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..95d3b46a1937b9ec2c1cf4f91359068c123ef2fc
GIT binary patch
literal 788
zcmX|<fk_2H3`D~c!V*Gium(G@2U`#nM1BXh?wdr-eJ(${vy;s1<;&yo`S$$!{_$ms
zr*FUWhnFjihquDLd8jM&v!L)U^9b)C|KrX%!uh>dd2n!uV5$DFJ;cjy2G|d<?CzYt
zERd6p)7GTB>uPO%;;Jq`k!0;JK3z4hx*nRGM=_l0&3IaYQ>)PKxp`0jIMS2ZnFhIj
ztfLEF3L@x#;%KhP$BOOFGB!Du;#C+f%$ymDG+;v7$OH!*z2HT={P3Qs<*S<O9Q{YX
z>=f_7!SAujBBEw@co#RmXwK=6VyWkryA<m{%AO6;|Niw`=s_MW<f9Z8dWyQJxheTn
z9(!gTUp(`!1HU;O^H#@<HU5uoTStda`lrSL`soHW>G+}kez^y=E8!S}?{D(VJWi^n
cgA{4Z3s91p?_>`C-OIA*`zUE6^m${)4>dj%B>(^b

literal 0
HcmV?d00001