1 files changed, 29 insertions(+), 20 deletions(-)

M src/left.tal

@@ 797,26 797,10 @@ JMP2
 	;walk-color JSR2 STH
 	( detect underline )
 	DUP2 ;is-rune JSR2 ;draw-ufx/ul STA
-
-	( TODO: Cleanup )
-	;walk-color/c LDA  ,&skip-highlight JCN
-	.textarea/highlight LDZ ,&skip-highlight JCN
-	LDAk [ LIT ", ] NEQ  ,&no-litrel JCN
-		#08 ;litrel-icn ;draw-ufx/seg JSR2 INC2 ,&w JMP
-		&no-litrel
-	LDAk [ LIT ". ] NEQ ,&no-litzep JCN
-		#08 ;litzep-icn ;draw-ufx/seg JSR2 INC2 ,&w JMP
-		&no-litzep
-	LDAk [ LIT "- ] NEQ ,&no-rawzep JCN
-		#08 ;rawzep-icn ;draw-ufx/seg JSR2 INC2 ,&w JMP
-		&no-rawzep
-	LDAk [ LIT "; ] NEQ ,&no-litabs JCN
-		#08 ;litabs-icn ;draw-ufx/seg JSR2 INC2 ,&w JMP
-		&no-litabs
-	LDAk [ LIT "= ] NEQ ,&no-rawabs JCN
-		#08 ;rawabs-icn ;draw-ufx/seg JSR2 INC2 ,&w JMP
-		&no-rawabs
-	&skip-highlight
+	( draw rune )
+	;walk-color/c LDA  ,&w JCN
+	.textarea/highlight LDZ ,&w JCN
+	;draw-rune JSR2
 
 	&w
 		,&is-selected JSR STH


@@ 838,6 822,31 @@ JMP2r
 
 JMP2r
 
+@draw-rune ( addr* -- addr* )
+
+	( TODO: Cleanup )
+	,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
+
+JMP2r
+
 @walk-color ( addr* -- addr* color )
 
 	.textarea/highlight LDZ ,&skip JCN