diff --git a/src/dhgr.tk/inc/dhgrutils.plh b/src/dhgr.tk/inc/dhgrutils.plh index f138b93..a1675a6 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 78ec98e..1df3cce 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 89cf9d2..faf6f9d 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 0000000..cfe8125 Binary files /dev/null and b/src/dhgr.tk/utils/fonts/A2SLIM8.FON.BIN differ 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 0000000..457dc30 Binary files /dev/null and b/src/dhgr.tk/utils/fonts/APPLE2.FON.BIN differ 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 0000000..95d3b46 Binary files /dev/null and b/src/dhgr.tk/utils/fonts/APPLE2THIN.FON.BIN differ