Preparing for INC migration

src/main.tal

@@ -22,7 +22,8 @@
 %++ { ADD2 } %-- { SUB2 }
 %<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 }
 
-%INC { #01 + } %INC2 { #0001 ++ }
+%INC { #01 + }  %INC2 { #0001 ++ }
+%INCk { DUP INC } %INC2k { DUP2 INC2 }
 
 %DEBUG  { ;print-hex JSR2 #0a .Console/write DEO }
 %DEBUG2 { SWP ;print-hex JSR2 ;print-hex JSR2 #0a .Console/write DEO }
@@ -487,14 +488,14 @@ BRK
 		;on-button-trap .Controller/vector DEO2
 		BRK
 		&no-rename
-	DUP INC .settings/color LDZ ! ,&no-eraser JCN
+	INCk .settings/color LDZ ! ,&no-eraser JCN
 		#00 .settings/color STZ
 		;draw-colorview JSR2
 		;draw-toolview JSR2 
 		POP RELEASE-MOUSE BRK
 		&no-eraser
 	DUP #02 > ,&no-color JCN
-		DUP INC .settings/color STZ
+		INCk .settings/color STZ
 		;draw-colorview JSR2
 		;draw-toolview JSR2 
 		POP RELEASE-MOUSE BRK
@@ -667,14 +668,14 @@ RTN
 	DUP2
 	DUP2 #0007 ++ SWP2 LDAk STH
 	&ch1
-		DUP2 INC2 LDA STH
+		INC2k LDA STH
 		DUP2 STHr ROT ROT STA
 		INC2 GTH2k ,&ch1 JCN
 	POP2
 	( cap ) STHr ROT ROT STA
 	#0008 ++ DUP2 #0007 ++ SWP2 LDAk STH
 	&ch2
-		DUP2 INC2 LDA STH
+		INC2k LDA STH
 		DUP2 STHr ROT ROT STA
 		INC2 GTH2k ,&ch2 JCN
 	POP2