3 files changed, 27 insertions(+), 19 deletions(-)

M etc/cream.uf2
M src/assets.tal
M src/left.tal

@@ 16,17 16,20 @@
 @underline-icn
 	0000 0000 0000 0000 0000 0000 00ff 0000
 	0000 0000 0000 0000 0000 0000 00ff 0000
-@litabs-icn
-	0000 0000 1008 7c02 7c08 1000 0000 0000
-	0000 0000 0000 0000 0000 0000 0000 0000
 @litrel-icn
-	0000 0000 1008 04fe 0408 1000 0000 0000
+	0000 0000 0010 0804 fe04 0810 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@rawabs-icn
-	0000 0000 fe82 82fe 8282 fe00 0000 0000
+@litzep-icn
+	0000 0000 0038 4482 9282 4438 0000 0000
+	0000 0000 0000 0000 0000 0000 0000 0000
+@rawzep-icn
+	0000 0000 00fe 8282 9282 82fe 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@litzpa-icn
-	0000 0000 1028 4492 4428 1000 0000 0000
+@litabs-icn
+	0000 0000 0010 08fc 02fc 0810 0000 0000
+	0000 0000 0000 0000 0000 0000 0000 0000
+@rawabs-icn
+	0000 0000 00fe 8282 fe82 82fe 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
 
 @font

@@ 301,7 301,7 @@ BRK
 	( a ) LIT2r 0000
 	&hor
 		LDAk #0a EQU ,&hor-end JCN
-		LDAk ;get-width JSR2 STH2 ADD2r
+		;get-width JSR2 STH2 ADD2r
 		LTH2kr STHr ,&hor-end JCN
 		INC2 LDAk ,&hor JCN
 	&hor-end


@@ 420,7 420,7 @@ JMP2r
 	DUP2 ;find-line-start JSR2
 	&loop
 		EQU2k ,&end JCN
-		LDAk ,get-width JSR STH2 ADD2r
+		,get-width JSR STH2 ADD2r
 		INC2 GTH2k ,&loop JCN
 	&end
 	POP2 POP2


@@ 428,12 428,13 @@ JMP2r
 
 JMP2r
 
-@get-width ( char -- width* )
+@get-width ( addr* -- width* )
 
-	DUP #7e GTH ,&special JCN
+	LDAk DUP #7e GTH ,&special JCN
 	.textarea/highlight LDZ ,&skip-highlight JCN
-		[ LIT ". ] EQUk NIP ,&special JCN
 		[ LIT ", ] EQUk NIP ,&special JCN
+		[ LIT ". ] EQUk NIP ,&special JCN
+		[ LIT "- ] EQUk NIP ,&special JCN
 		[ LIT "; ] EQUk NIP ,&special JCN
 		[ LIT "= ] EQUk NIP ,&special JCN
 		&skip-highlight


@@ 824,9 825,10 @@ JMP2r
 	.textarea/highlight LDZ ,&skip JCN
 	,walk-color/c LDR ,&skip JCN
 	LDAk LIT ", EQU ,&pass JCN
-	LDAk LIT "= EQU ,&pass JCN
-	LDAk LIT "; EQU ,&pass JCN
 	LDAk LIT ". EQU ,&pass JCN
+	LDAk LIT "- EQU ,&pass JCN
+	LDAk LIT "; EQU ,&pass JCN
+	LDAk LIT "= EQU ,&pass JCN
 	&skip
 	#00
 


@@ 857,15 859,18 @@ JMP2r
 
 @draw-ufx ( char color -- )
 
-	,&color STR
+	;&color STA
 
 	.textarea/highlight LDZ ,&skip-highlight JCN
-	[ LIT ". ] NEQk NIP  ,&no-litzpa JCN
-		POP #08 ;litzpa-icn ,&seg JMP
-		&no-litzpa
 	[ LIT ", ] NEQk NIP  ,&no-litrel JCN
 		POP #08 ;litrel-icn ,&seg JMP
 		&no-litrel
+	[ LIT ". ] NEQk NIP  ,&no-litzep JCN
+		POP #08 ;litzep-icn ,&seg JMP
+		&no-litzep
+	[ LIT "- ] NEQk NIP  ,&no-rawzep JCN
+		POP #08 ;rawzep-icn ,&seg JMP
+		&no-rawzep
 	[ LIT "; ] NEQk NIP  ,&no-litabs JCN
 		POP #08 ;litabs-icn ,&seg JMP
 		&no-litabs