diff src/aa_fonts.asm @ 634:4050675965ea

3.10 stable release
author heinrichsweikamp
date Tue, 28 Apr 2020 17:34:31 +0200
parents 185ba2f91f59
children 75e90cd0c2c3
line wrap: on
line diff
--- a/src/aa_fonts.asm	Thu Mar 05 15:06:14 2020 +0100
+++ b/src/aa_fonts.asm	Tue Apr 28 17:34:31 2020 +0200
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;   File aa_fonts.asm                         combined next generation V3.08.3
+;   File aa_fonts.asm                       * combined next generation V3.08.4f
 ;
 ;   Font-data for the anti-aliased word processor
 ;
@@ -14,14 +14,14 @@
 
 #include "configuration.inc"
 
-
 ; Attention: all fonts need to be in the same 64 kByte page
+;============================================================================
 fonts_data	CODE_PACK	0x10000			; ex 0x11000
-
 ;============================================================================
 
 
 ;---- TINY font description and data ----------------------------------------
+;
 	global	aa_font16_block
 aa_font16_block:
 	DB		'°', 0x7F					; remap a few ASCII chars, to avoid
@@ -41,10 +41,10 @@
 	DB		'¡', 0x8D
 	DB		'¿', 0x8E
 	DB		0							; end of translation table
-	DB		aa_font16_firstChar			; to be subtracted
-	DB		aa_font16_chars				; max value
-	DB		'¿'-aa_font16_firstChar		; replace by ¿ when unknown
-	DB		aa_font16_height + 0x80
+	DB		aa_font16_firstChar			; code of first char  in font set
+	DB		aa_font16_chars				; number of     chars in font set
+	DB		'¿'-aa_font16_firstChar		; default char
+	DB		aa_font16_height + 0x80		; font hight and AA flag
 ;
 #include	"../src/Fonts/aa_font16_idx.inc"
 #include	"../src/Fonts/aa_font16.inc"
@@ -54,7 +54,9 @@
 		error TINY font should be encoded with 3 bits anti-aliasing!
 	endif
 
+
 ;---- SMALL font description and data ----------------------------------------
+;
 	global	aa_font28_block
 aa_font28_block:
 	DB		'°', 0x7F					; remap a few ASCII chars, to avoid
@@ -79,20 +81,22 @@
 	DB		0xB8,0x93					; arrow down
 	DB		0xB9,0x94					; arrow up
 	DB		0							; end of translation table
-	DB		aa_font28_firstChar			; to be subtracted
-	DB		aa_font28_chars				; max value
-	DB		0x83-aa_font28_firstChar	; replace by ¤ when unknown
-	DB		aa_font28_height + 0x80
+	DB		aa_font28_firstChar			; code of first char  in font set
+	DB		aa_font28_chars				; number of     chars in font set
+	DB		0x83-aa_font28_firstChar	; default char
+	DB		aa_font28_height + 0x80		; font hight and AA flag
 ;
 #include	"../src/Fonts/aa_font28_idx.inc"
 #include	"../src/Fonts/aa_font28.inc"
 aa_font28_end:
-; Attention: make sure this is coherent...
+; Attention: make sure this is coherent:
 	if aa_font28_nbbits != 3
 		error SMALL font should be encoded with 3 bits anti-aliasing!
 	endif
 
+
 ;---- STD font description and data ------------------------------------------
+;
 	global	aa_font34_block
 aa_font34_block:
 	DB		'°', 0x7F					; remap a few ASCII chars, to avoid
@@ -119,20 +123,22 @@
 	; 95 is left-right arrow (dive duration)
 	DB		'¤', 0x96					; unused
 	DB		0							; end of translation table
-	DB		aa_font34_firstChar			; to be subtracted
-	DB		aa_font34_chars				; max value
-	DB		0x87-aa_font34_firstChar	; replace by ¤ when unknown
-	DB		aa_font34_height + 0x80
+	DB		aa_font34_firstChar			; code of first char  in font set
+	DB		aa_font34_chars				; number of     chars in font set
+	DB		0x87-aa_font34_firstChar	; default char
+	DB		aa_font34_height + 0x80		; font hight and AA flag
 ;
 #include	"../src/Fonts/aa_font34_idx.inc"
 #include	"../src/Fonts/aa_font34.inc"
 aa_font36_end:
-; Attention: make sure this is coherent...
+; Attention: make sure this is coherent:
 	if aa_font34_nbbits != 3
 		error STANDARD font should be encoded with 3 bits anti-aliasing!
 	endif
 
+
 ;---- MEDIUM font description and data ---------------------------------------
+;
 	global	aa_font48_block
 aa_font48_block:
 	DB		' ',  0x3F					; space, full-width
@@ -144,54 +150,59 @@
 	DB		'm',  0x3D					; m
 	DB		'f',  0x3E					; ft-ligature
 	DB		0							; end of translation table
-	DB		aa_font48_firstChar			; to be subtracted
-	DB		aa_font48_chars				; max value
-	DB		0x3F-aa_font48_firstChar	; replace by space when unknown
-	DB		aa_font48_height + 0x80		; AA flag
+	DB		aa_font48_firstChar			; code of first char  in font set
+	DB		aa_font48_chars				; number of     chars in font set
+	DB		0x3F-aa_font48_firstChar	; default char
+	DB		aa_font48_height + 0x80		; font hight and AA flag
 ;
 #include	"../src/Fonts/aa_font48_idx.inc"
 #include	"../src/Fonts/aa_font48.inc"
 aa_font48_end:
-; Attention: make sure this is coherent...
+; Attention: make sure this is coherent:
 	if aa_font48_nbbits != 3
 		error MEDIUM font should be encoded with 3 bits anti-aliasing!
 	endif
 
+
 ;---- LARGE font description and data ----------------------------------------
+;
 	global	aa_font90_block
 aa_font90_block:
-	DB		' ', 0x2F
-	DB		0
-	DB		aa_font90_firstChar
-	DB		aa_font90_chars
-	DB		0x2F-aa_font90_firstChar
-	DB		aa_font90_height + 0x80		; AA flag
+	DB		' ', 0x2F					; space
+	DB		0							; end of translation table
+	DB		aa_font90_firstChar			; code of first char  in font set
+	DB		aa_font90_chars				; number of     chars in font set
+	DB		0x2F-aa_font90_firstChar	; default char
+	DB		aa_font90_height + 0x80		; font hight and AA flag
 ;
 #include	"../src/Fonts/aa_font90_idx.inc"
 #include	"../src/Fonts/aa_font90.inc"
 aa_font90_end:
-; Attention: make sure this is coherent...
+; Attention: make sure this is coherent:
 	if aa_font90_nbbits != 3
 		error SMALL font should be encoded with 3 bits anti-aliasing!
 	endif
 
+
 ;---- HUGE font description and data ----------------------------------------
+;
 	global aa_font92_block
 aa_font92_block:
-			DB	' ', 0x2F
-			DB	0
-			DB	aa_font92_firstChar
-			DB	aa_font92_chars
-			DB	0x2F-aa_font92_firstChar
+			DB	' ', 0x2F					; space
+			DB	0							; end of translation table
+			DB	aa_font92_firstChar			; code of first char  in font set
+			DB	aa_font92_chars				; number of     chars in font set
+			DB	0x2F-aa_font92_firstChar	; default char
 			DB	aa_font92_height + 0x80		; AA flag
 ;
 #include	"../src/Fonts/aa_font92_idx.inc"
 #include	"../src/Fonts/aa_font92.inc"
 aa_font92_end:
-; Make sure this is coherent...
+; Attention: make sure this is coherent:
 	if aa_font92_nbbits != 3
 		error SMALL font should be encoded with 3bits anti-aliasing...
 	endif
 
-;=============================================================================
-	END
\ No newline at end of file
+;-----------------------------------------------------------------------------
+
+	END