@@ 827,15 827,16 @@ JMP2r
LDAk #21 LTH ?&whitespace
( rune )
DUP2 is-rune #00 EQU ?&no-rune
- #01 ;draw-ufx/ul STA
- ( color ) is-selected #0c MUL INC DUP ,&color STR ;draw-ufx/color STA
- ( glyph ) LDAk ;runes cndx #50 SFT2 ;rune-icns ADD2 #08 ROT ROT draw-ufx/seg
+ ( underline ) #01 ;draw-glyph/ul STA
+ ( black ) #01 ,&color STR
+ ( selected ) is-selected #0c MUL INC ;draw-glyph/color STA
+ ( glyph ) LDAk ;runes cndx #50 SFT2 ;rune-icns ADD2 #08 ROT ROT draw-glyph/seg
INC2 !&w
&no-rune
( color ) walk-color ,&color STR
&w
is-selected STH
- LDAk [ LIT2 0d &color 00 ] STHr [ JMP SWP POP ] draw-ufx
+ LDAk [ LIT2 0d &color 00 ] STHr [ JMP SWP POP ] draw-glyph
LDAk #1f LTH ?&end
INC2 LDAk #20 GTH ?&w
&end
@@ 844,9 845,9 @@ JMP2r
&whitespace ( str* -- str* )
- ( remove underline ) #00 ;draw-ufx/ul STA
+ ( remove underline ) #00 ;draw-glyph/ul STA
is-selected #0c MUL INC ,&ws-color STR
- LDAk [ LIT &ws-color $1 ] draw-ufx
+ LDAk [ LIT &ws-color $1 ] draw-glyph
INC2
JMP2r
@@ 873,7 874,7 @@ JMP2r
&include #06 JMP2r
&string #0f JMP2r
-@draw-ufx ( char color -- )
+@draw-glyph ( char color -- )
;&color STA
DUP #0a EQU ?draw-space
@@ 904,7 905,7 @@ JMP2r
@draw-space ( c -- )
POP
- #00 ;linebreak-icn draw-ufx/seg
+ #00 ;linebreak-icn draw-glyph/seg
.Screen/y DEI2k #0010 ADD2 ROT DEO2
#0010 .scroll/x LDZ2 SUB2 #0080 ADD2 .Screen/x DEO2
@@ 997,7 998,7 @@ JMP2r
DUP #09 EQU ?&tab
#20 SUB
- DUP #5f GTH ?&unknown
+ DUP #5e GTH ?&unknown
#00 SWP #50 SFT2 ;font/glyphs ADD2
JMP2r