2 files changed, 16 insertions(+), 23 deletions(-)

M src/assets.tal
M src/left.tal

@@ 16,19 16,20 @@
 @underline-icn
 	0000 0000 0000 0000 0000 0000 00ff 0000
 	0000 0000 0000 0000 0000 0000 00ff 0000
-@litrel-icn
+@rune-icns
+	( litrel )
 	0000 0000 0010 0804 fe04 0810 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@litzep-icn
+	( litzep )
 	0000 0000 0038 4482 9282 4438 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@rawzep-icn
+	( rawzep )
 	0000 0000 00fe 8282 9282 82fe 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@litabs-icn
+	( litabs )
 	0000 0000 0010 08fc 02fc 0810 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
-@rawabs-icn
+	( rawabs )
 	0000 0000 00fe 8282 fe82 82fe 0000 0000
 	0000 0000 0000 0000 0000 0000 0000 0000
 

@@ 824,26 824,18 @@ JMP2r
 
 @draw-rune ( addr* -- addr* )
 
-	( TODO: Cleanup )
+	LDAk ;runes ;cndx JSR2 INC2k ORA ,&continue JCN
+		POP2 JMP2r
+		&continue
+	( set color )
+	SWP2
 	,draw-token/is-selected JSR #0d01 ROT [ JMP SWP POP ]
 		;draw-ufx/color STA
-
-	LDAk [ LIT ", ] NEQ  ,&no-litrel JCN
-		#08 ;litrel-icn ;draw-ufx/seg JSR2 INC2 JMP2r
-		&no-litrel
-	LDAk [ LIT ". ] NEQ ,&no-litzep JCN
-		#08 ;litzep-icn ;draw-ufx/seg JSR2 INC2 JMP2r
-		&no-litzep
-	LDAk [ LIT "- ] NEQ ,&no-rawzep JCN
-		#08 ;rawzep-icn ;draw-ufx/seg JSR2 INC2 JMP2r
-		&no-rawzep
-	LDAk [ LIT "; ] NEQ ,&no-litabs JCN
-		#08 ;litabs-icn ;draw-ufx/seg JSR2 INC2 JMP2r
-		&no-litabs
-	LDAk [ LIT "= ] NEQ ,&no-rawabs JCN
-		#08 ;rawabs-icn ;draw-ufx/seg JSR2 INC2 JMP2r
-		&no-rawabs
-	&skip-highlight
+	SWP2
+	( draw glyph )
+	#50 SFT2 ;rune-icns ADD2 #08 ROT ROT
+		;draw-ufx/seg JSR2
+	INC2
 
 JMP2r