2 files changed, 9 insertions(+), 21 deletions(-)

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

@@ 14,6 14,11 @@
 	ffff ffff ffff ffff
 	ffef c783 c7ef ffff
 	ffff ffff ffff ffff
+@underline-icn
+	0000 0000 0000 0000
+	0000 0000 00ff 0000 
+	0000 0000 0000 0000 
+	0000 0000 00ff 0000
 
 @font
 0000 0000 0000 0000 000f 0800 0000 0000

@@ 805,6 805,8 @@ JMP2
 	( paint )
 	#0010 .scroll/x LDZ2 SUB2 #0080 ADD2 .Screen/x DEO2
 	#0020 .Screen/y DEO2
+	.selection/from LDZ2 ;get-current-marker JSR2
+		;get-marker JSR2 ;walk-color/scope STA2
 	.scroll/y LDZ2 .textarea/lines LDZ2 ADD2 ;line-to-addr JSR2 .scroll/addr LDZ2
 	&loop
 		,draw-token JSR


@@ 845,6 847,7 @@ JMP2r
 	LDAk LIT ") EQU ,&comment-end JCN
 	[ LIT &c $1 ] ,&comment JCN
 	LDAk LIT "( EQU ,&comment JCN
+	DUP2 [ LIT2 &scope $2 ] EQU2 ,&parent JCN
 	LDAk LIT "@ EQU ,&label JCN
 	LDAk LIT "& EQU ,&label JCN
 	LDAk LIT "~ EQU ,&include JCN


@@ 854,6 857,7 @@ JMP2r
 JMP2r
 	&comment #01 ,&c STR #03 JMP2r
 	&comment-end #00 ,&c STR #03 JMP2r
+	&parent #08 JMP2r
 	&label #02 JMP2r
 	&include #06 JMP2r
 	&string #0f JMP2r


@@ 871,20 875,6 @@ JMP2r
 JMP2r
 	&pass #01 JMP2r
 
-@draw-uf2 ( text* color -- )
-
-	,draw-ufx/color STR
-	LDAk ,&no-null JCN
-		POP2 JMP2r
-		&no-null
-	#15 .Screen/auto DEO
-	&while
-		LDAk ,draw-ufx/basic JSR
-		INC2 LDAk ,&while JCN
-	POP2
-
-JMP2r
-
 @draw-ufx ( char color -- )
 
 	,&color STR


@@ 915,13 905,6 @@ JMP2r
 
 JMP2r
 
-@underline-icn
-	0000 0000 0000 0000
-	0000 0000 00ff 0000 
-	0000 0000 0000 0000 
-	0000 0000 00ff 0000
-
-
 @draw-special ( char -- )
 
 	[ #09 ] NEQk NIP ,&no-tab JCN