Tweaking indent.

common/utils.fs

@@ -80,7 +80,11 @@ variable indent
    dup ['] DOES> = if icr then
    dup >flags -TAB AND if -1 indent+! then
    dup see.
-   dup >flags +TAB AND if 1 indent+! then
+   dup >flags +TAB AND if
+     1 indent+!
+   else
+     dup >flags -TAB AND if icr then
+   then
    dup ['] ! = if icr then
    dup ['] +! = if icr then
    dup  @ ['] BRANCH @ =

common/utils_tests.fs

@@ -64,6 +64,7 @@ e: test-see-begin-again
   out:     BEGIN 
   out:         . 
   out:     AGAIN 
+  out:     
   out: ; 
 ;e
 
@@ -74,6 +75,7 @@ e: test-see-begin-until
   out:     BEGIN 
   out:         . 
   out:     UNTIL 
+  out:     
   out: ;  
 ;e
 
@@ -86,6 +88,7 @@ e: test-see-begin-while-repeat
   out:     WHILE 
   out:         . 
   out:     REPEAT 
+  out:     
   out: ;  
 ;e
 
@@ -96,6 +99,7 @@ e: test-see-ahead-then
   out:     AHEAD 
   out:         . 
   out:     THEN 
+  out:     
   out: ; 
 ;e
 
@@ -106,18 +110,21 @@ e: test-see-for-next
   out:     FOR 
   out:         I . 
   out:     NEXT 
+  out:     
   out: ; 
 ;e
 
 e: test-see-for-aft-next
-  : test for aft i . then . next ;
+  : test for aft i . then . next . ;
   see test
   out: : test 
   out:     FOR 
   out:         AFT 
   out:             I . 
-  out:         THEN . 
+  out:         THEN 
+  out:         . 
   out:     NEXT 
+  out:     . 
   out: ; 
 ;e
 
@@ -136,54 +143,63 @@ e: test-see-string-strides
   out:     1 IF 
   out:         s" " type 
   out:     THEN 
+  out:     
   out: ; 
   see test1
   out: : test1 
   out:     1 IF 
   out:         s" >" type 
   out:     THEN 
+  out:     
   out: ; 
   see test2
   out: : test2 
   out:     1 IF 
   out:         s" ->" type 
   out:     THEN 
+  out:     
   out: ; 
   see test3
   out: : test3 
   out:     1 IF 
   out:         s" -->" type 
   out:     THEN 
+  out:     
   out: ; 
   see test4
   out: : test4 
   out:     1 IF 
   out:         s" --->" type 
   out:     THEN 
+  out:     
   out: ; 
   see test5
   out: : test5 
   out:     1 IF 
   out:         s" ---->" type 
   out:     THEN 
+  out:     
   out: ; 
   see test6
   out: : test6 
   out:     1 IF 
   out:         s" ----->" type 
   out:     THEN 
+  out:     
   out: ; 
   see test7
   out: : test7 
   out:     1 IF 
   out:         s" ------>" type 
   out:     THEN 
+  out:     
   out: ; 
   see test8
   out: : test8 
   out:     1 IF 
   out:         s" ------->" type 
   out:     THEN 
+  out:     
   out: ; 
 ;e