Support carriage returns, tabs, and "[0;m"

regex.txt

@@ -1,7 +1,7 @@
 this is the source definitions for the scary escape code regex
 
 # from tests in Terminal.app, this regex should cover all basic \e[ and \e] cases
-^([\[\]]([\d\?]+)?(;[\d\?]+)*)?.
+^([\[\]]([\d\?]+)?(;[\d\?]*)*)?[m@GCDPK;l]
 
 # this catches any case the above does not
 # make sure to not include any special characters the main regex finds (like ?)

vtclean.go

@@ -7,7 +7,7 @@ import (
 )
 
 // see regex.txt for a slightly separated version of this regex
-var vt100re = regexp.MustCompile(`^\033([\[\]]([\d\?]+)?(;[\d\?]+)*)?(.)`)
+var vt100re = regexp.MustCompile(`^\033([\[\]]([\d\?]+)?(;[\d\?]*)*)?([m@GCDPK;l])`)
 var vt100exc = regexp.MustCompile(`^\033(\[[^a-zA-Z0-9@\?]+|[\(\)]).`)
 
 // this is to handle the RGB escape generated by `tput initc 1 500 500 500`
@@ -21,6 +21,8 @@ func Clean(line string, color bool) string {
 	for i := 0; i < len(lineb); {
 		c := lineb[i]
 		switch c {
+		case '\r':
+			edit.MoveAbs(0)
 		case '\b':
 			edit.Move(-1)
 		case '\033':
@@ -74,7 +76,7 @@ func Clean(line string, color bool) string {
 			}
 			continue
 		default:
-			if c == '\n' || c >= ' ' {
+			if c == '\n' || c == '\t' || c >= ' ' {
 				edit.Write([]byte{c})
 			}
 		}

vtclean_test.go

@@ -43,10 +43,22 @@ var tests = map[string]string{
 
 	"bbb \033]4;1;rgb:38/54/71\033\\test": "bbb test",
 	"ccc \033]4;1;rgb:38/54/71test":       "ccc rgb:38/54/71test",
+
+	// tabs
+	"aa\tbb": "aa\tbb",
+
+	// carriage return
+	"aaa\rb": "baa",
 }
 
 var colorTests = map[string]string{
 	"aaa \033[25;25mtest": "aaa \033[25;25mtest\x1b[0m",
+
+	// [0;m cases
+	// TODO: trailing [0;m should probably not be overridden with [0m
+	// TODO: when [0;m seen, may not want to append [0m to the end
+	"\033[0;m aa":                     "\033[0;m aa\033[0m",
+	"\033[32;1m$ echo foobar\033[0;m": "\033[32;1m$ echo foobar\033[0m",
 }
 
 func TestMain(t *testing.T) {