Rationalize Font Files

- Consolidated font files from 6 to 4 by eliminating redundant files.
- Use code page 437 for all fonts (except 8x11).

Source/HBIOS/Makefile

@@ -23,8 +23,9 @@ endif
 
 include $(TOOLS)/Makefile.inc
 
-FONTS := font8x11c.asm font8x11u.asm font8x16c.asm font8x16u.asm font8x8c.asm font8x8u.asm \
-	font6x8c.asm font6x8u.asm fontcgac.asm fontcgau.asm fontvgarcc.asm fontvgarcu.asm
+FONTS := font6x8c.asm font6x8u.asm font8x8c.asm font8x8u.asm \
+	font8x11c.asm font8x11u.asm font8x16c.asm font8x16u.asm
+	
 
 ifeq ($(CPUFAM),2)
 	TASM=$(BINDIR)/uz80as -t hd64180

Source/HBIOS/cvdu.asm

@@ -48,8 +48,8 @@ CVDU_ROWS	.EQU	25
 CVDU_COLS	.EQU	80
 ;
 #IF (CVDUMON == CVDUMON_CGA)
-  #DEFINE	USEFONTCGA
-  #DEFINE	CVDU_FONT FONTCGA
+  #DEFINE	USEFONT8X8
+  #DEFINE	CVDU_FONT FONT8X8
 #ENDIF
 ;
 #IF (CVDUMON == CVDUMON_EGA)
@@ -486,6 +486,10 @@ CVDU_CRTINIT2:	; ADJUST FOR 16K RAM SIZE
 ; LOAD FONT DATA
 ;----------------------------------------------------------------------
 ;
+; THE GDP USES 16 BYTES PER FONT EVEN WHEN THE FONT HAS ONLY 8
+; BYTES.  SO, FOR FONT8X8, WE NEED TO ALTERNATELY WRITE 8 BYTES OF
+; REAL FONT DATA, THEN WRITE 8 BYTES OF GARBAGE.
+;
 CVDU_LOADFONT:
 	LD	HL,$2000		; START OF FONT BUFFER
 	LD	C,18			; UPDATE ADDRESS REGISTER PAIR
@@ -512,8 +516,14 @@ CVDU_LOADFONT:
 CVDU_LOADFONT1:
 	LD	A,(HL)			; LOAD NEXT BYTE OF FONT DATA
 	CALL	CVDU_WR			; WRITE IT
-	INC	HL			; INCREMENT FONT DATA POINTER
 	DEC	DE			; DECREMENT LOOP COUNTER
+#IF (CVDUMON == CVDUMON_CGA)
+	; SKIP ALTERNATING 8 BYTE PAIRS (SEE COMMENT ABOVE)
+	BIT	3,E			; BIT 3 CHANGES WITH EVERY 8 BYTES
+	JR	Z,CVDU_LOADFONT2	; WHEN ZERO, DON'T INC FONT PTR
+#ENDIF
+	INC	HL			; INCREMENT FONT DATA POINTER
+CVDU_LOADFONT2:
 	LD	A,D			; CHECK DE...
 	OR	E			; FOR COUNTER EXHAUSTED
 	JR	NZ,CVDU_LOADFONT1	; LOOP TILL DONE

Source/HBIOS/vga.asm

@@ -551,7 +551,7 @@ VGA_LOADFONT:
 	LD	HL,$7000 | VGA_89BIT	; CLEAR FONT PAGE NUM
 	CALL	VGA_SETCFG
 
-#IF USELZSA2 & (VGASIZ != V80X60)
+#IF USELZSA2
 	LD	(VGA_STACK),SP		; SAVE STACK
 	LD	HL,(VGA_STACK)		; AND SHIFT IT
 	LD	DE,$2000		; DOWN 4KB TO
@@ -588,7 +588,7 @@ VGA_LOADFONT2:
 	LD	HL,$7070 | VGA_89BIT	; SET FONT PAGE NUM TO 7
 	CALL	VGA_SETCFG
 
-#IF USELZSA2 & (VGASIZ != V80X60)
+#IF USELZSA2
 	LD	HL,(VGA_STACK)		; ERASE DECOMPRESS BUFFER
 	LD	SP,HL			; BY RESTORING THE STACK
 	RET				; DONE

Source/HBIOS/vrc.asm

@@ -21,8 +21,8 @@ VRC_KBDST	.EQU	$F5		; KBD CTLR STATUS/CMD PORT
 VRC_ROWS	.EQU	48
 VRC_COLS	.EQU	64
 ;
-#DEFINE USEFONTVGARC
-#DEFINE	VRC_FONT FONTVGARC
+#DEFINE USEFONT8X8
+#DEFINE	VRC_FONT FONT8X8
 ;
 TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 KBDENABLE	.SET	TRUE		; INCLUDE KBD KEYBOARD SUPPORT