Fixed issue with shavian glyph lenght

This commit is contained in:
Devine Lu Linvega 2024-02-08 16:25:16 -08:00
parent 03933fdbcf
commit c42dfb7a99
5 changed files with 21 additions and 14 deletions

Binary file not shown.

View File

@ -622,4 +622,4 @@ HDR yew
000000 000000
000000 000000
000000 000000
HDR --- ------

Binary file not shown.

View File

@ -622,4 +622,4 @@ HDR yew
0000000 0000000
0000000 0000000
0000000 0000000
HDR --- -------

View File

@ -12,13 +12,13 @@
|0100 |0100
@on-reset ( -> ) @on-reset ( -> )
#f07f .System/r DEO2 #f0ef .System/r DEO2
#f0d6 .System/g DEO2 #f0e6 .System/g DEO2
#f0b2 .System/b DEO2 #f0e2 .System/b DEO2
#0000 DUP2 .Screen/x DEO2 #0000 DUP2 .Screen/x DEO2
.Screen/y DEO2 .Screen/y DEO2
#0040 .Screen/width DEO2 #0047 .Screen/width DEO2
#0060 .Screen/height DEO2 #0065 .Screen/height DEO2
;on-console .Console/vector DEO2 ;on-console .Console/vector DEO2
[ LIT2 15 -Screen/auto ] DEO [ LIT2 15 -Screen/auto ] DEO
#ffff .id STZ2 #ffff .id STZ2
@ -35,6 +35,7 @@
( >> ) ( >> )
@new-glyph ( -- ) @new-glyph ( -- )
;buf LDA [ LIT "- ] NEQ ?{ <output> }
( clean ) #0000 ;buf STA2 ( clean ) #0000 ;buf STA2
.id LDZ2 <draw-glyph> .id LDZ2 <draw-glyph>
.id LDZ2 INC2 .id STZ2 .id LDZ2 INC2 .id STZ2
@ -43,12 +44,18 @@
@new-pixels ( -- ) @new-pixels ( -- )
;buf parse-pixels ;buf parse-pixels
( store ) DUP .id LDZ2 #40 SFT2 ;glyphs ADD2 [ LIT2 &row 0003 ] INC2k ,&row STR2 ( store ) .id LDZ2 #40 SFT2 ;glyphs ADD2 [ LIT2 &row 0003 ] INC2k ,&row STR2
ADD2 STA ADD2 STA
( output ) #18 DEO
( clean ) #0000 ;buf STA2 ( clean ) #0000 ;buf STA2
JMP2r JMP2r
@<output> ( -- )
;glyphs/end ;glyphs
&l ( -- )
LDAk #18 DEO
INC2 GTH2k ?&l
POP2 POP2 JMP2r
@parse-pixels ( line* -- icn ) @parse-pixels ( line* -- icn )
[ LITr 00 ] DUP2 [ LITr 00 ] DUP2
&w ( -- ) &w ( -- )
@ -59,10 +66,10 @@
@<draw-glyph> ( id* -- ) @<draw-glyph> ( id* -- )
DUP2 #ffff NEQ2 ?{ POP2 JMP2r } DUP2 #ffff NEQ2 ?{ POP2 JMP2r }
DUP2 #0007 AND2 #30 SFT2 .Screen/x DEO2 DUP2 #0007 AND2 #0009 MUL2 .Screen/x DEO2
DUP2 #43 SFT2 .Screen/y DEO2 DUP2 #03 SFT2 #0011 MUL2 .Screen/y DEO2
#40 SFT2 ;glyphs ADD2 .Screen/addr DEO2 #40 SFT2 ;glyphs ADD2 .Screen/addr DEO2
[ LIT2 01 -Screen/sprite ] DEO [ LIT2 09 -Screen/sprite ] DEO
JMP2r JMP2r
( (
@ -85,6 +92,6 @@
#0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO #0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO
JMP2r JMP2r
@glyphs @glyphs $300
&end