Update font inclusion

Source/HBIOS/hbios.asm

@@ -2849,49 +2849,50 @@ SIZ_NEC	.EQU	$ - ORG_NEC
 		.ECHO	" bytes.\n"
 #ENDIF
 ;
-; CVDU AND VGA3 CAN USE THE SAME FONT ROM UNLESS VGA3 MODE IS USING V80X43 MODE
+; FONTS AREA
 ;
-#IF (CVDUENABLE | VGAENABLE)
-ORG_FONTHI	.EQU	$
-#IF (VGAENABLE & CVDUENABLE)
- #IF (VGASIZ=V80X43)
+ORG_FONTHI		.EQU	$
+;
+; DO WE NEED AN 8X16 FONT?
+;
+#IF ((VGAENABLE | CVDUENABLE))
+ #IF (VGAENABLE & ((VGASIZ=V80X25) | (VGASIZ=V80X30)))
 VGA_FONT:
-  #INCLUDE "font8043.asm"
+ #ENDIF
+ #IF (CVDUENABLE)
 CVDU_FONT:
-  #INCLUDE "font_hi.asm"
- #ELSE
+ #ENDIF
+  #INCLUDE "font8x16.asm"
+  .ECHO "8X16 " 
+#ENDIF
+;
+; DO WE NEED AN 8X11 FONT?
+;
+#IF (VGAENABLE)
+ #IF (VGASIZ=V80X43))
 VGA_FONT:
-CVDU_FONT:
-  #INCLUDE "font_hi.asm"
+   #INCLUDE "font8X11.asm"
+   .ECHO "8X11 "
  #ENDIF
-#ELSE
-  #IF (VDUENABLE) 
+#ENDIF
+;
+; DO WE NEED AN 8X8 FONT?
+;
+#IF (VGAENABLE | TMSENABLE)
+ #IF ((VGAENABLE & (VGASIZ=V80X60)))
 VGA_FONT:
-   #IF VGASIZ=(V80X43)
-    #INCLUDE "font8043.asm"
-   #ELSE
-    #INCLUDE "font_hi.asm"
-   #ENDIF
-  #ENDIF
- #IF (CVDUENABLE)
-CVDU_FONT:
-  #INCLUDE "font_hi.asm"
  #ENDIF
+ #IF (TMSENABLE)
+TMS_FONT:
+ #ENDIF
+  #INCLUDE "font_8x8.asm" 
+  .ECHO "8X8 " 
 #ENDIF
+;
 SIZ_FONTHI	.EQU	$ - ORG_FONTHI
 		.ECHO	"FONTS occupy "
 		.ECHO	SIZ_FONTHI
 		.ECHO	" bytes.\n"
-#ENDIF
-;
-#IF (TMSENABLE)
-ORG_FONTTMS	.EQU	$
-  #INCLUDE "font_tms.asm"
-SIZ_FONTTMS	.EQU	$ - ORG_FONTTMS
-		.ECHO	"FONTTMS occupies "
-		.ECHO	SIZ_FONTTMS
-		.ECHO	" bytes.\n"
-#ENDIF
 ;
 #IF (CVDUENABLE | VGAENABLE)
 ORG_KBD		.EQU	$