1 files changed, 98 insertions, 68 deletions
diff --git a/cnmfmt/cnmfmt_test.go b/cnmfmt/cnmfmt_test.go
index 89a40a9..5d50b18 100644
--- a/cnmfmt/cnmfmt_test.go
+++ b/cnmfmt/cnmfmt_test.go
@@ -14,16 +14,16 @@ var parseTests = map[string]Text{
 		Span{Format{}, "\nfoo bar\\"},
 	}},
 	"**foo": Text{[]Span{
-		Span{Format{Bold: true}, "foo"},
-	}},
-	"//foo": Text{[]Span{
-		Span{Format{Italic: true}, "foo"},
+		Span{Format{Emphasized: true}, "foo"},
 	}},
 	"__foo": Text{[]Span{
-		Span{Format{Underline: true}, "foo"},
+		Span{Format{Alternate: true}, "foo"},
 	}},
 	"``foo": Text{[]Span{
-		Span{Format{Monospace: true}, "foo"},
+		Span{Format{Code: true}, "foo"},
+	}},
+	"\"\"foo": Text{[]Span{
+		Span{Format{Quote: true}, "foo"},
 	}},
 	"foo*bar": Text{[]Span{
 		Span{Format{}, "foo*bar"},
@@ -36,7 +36,7 @@ var parseTests = map[string]Text{
 	}},
 	"foo***": Text{[]Span{
 		Span{Format{}, "foo"},
-		Span{Format{Bold: true}, "*"},
+		Span{Format{Emphasized: true}, "*"},
 	}},
 	"foo****": Text{[]Span{
 		Span{Format{}, "foo"},
@@ -48,35 +48,35 @@ var parseTests = map[string]Text{
 		Span{Format{}, "foo"},
 	}},
 	"******foo": Text{[]Span{
-		Span{Format{Bold: true}, "foo"},
+		Span{Format{Emphasized: true}, "foo"},
 	}},
 	"foo ** bar": Text{[]Span{
 		Span{Format{}, "foo "},
-		Span{Format{Bold: true}, " bar"},
+		Span{Format{Emphasized: true}, " bar"},
 	}},
 	"foo** bar": Text{[]Span{
 		Span{Format{}, "foo"},
-		Span{Format{Bold: true}, " bar"},
+		Span{Format{Emphasized: true}, " bar"},
 	}},
 	"foo **bar": Text{[]Span{
 		Span{Format{}, "foo "},
-		Span{Format{Bold: true}, "bar"},
+		Span{Format{Emphasized: true}, "bar"},
 	}},
 	"foo ** bar ** baz": Text{[]Span{
 		Span{Format{}, "foo "},
-		Span{Format{Bold: true}, " bar "},
+		Span{Format{Emphasized: true}, " bar "},
 		Span{Format{}, " baz"},
 	}},
 	"foo ** bar** baz": Text{[]Span{
 		Span{Format{}, "foo "},
-		Span{Format{Bold: true}, " bar"},
+		Span{Format{Emphasized: true}, " bar"},
 		Span{Format{}, " baz"},
 	}},
-	"**__**foo": Text{[]Span{
-		Span{Format{Underline: true}, "foo"},
+	"**\"\"**foo": Text{[]Span{
+		Span{Format{Quote: true}, "foo"},
 	}},
 	"***": Text{[]Span{
-		Span{Format{Bold: true}, "*"},
+		Span{Format{Emphasized: true}, "*"},
 	}},
 	"*\\**": Text{[]Span{
 		Span{Format{}, "***"},
@@ -99,18 +99,18 @@ var parseTests = map[string]Text{
 	"\\\\": Text{[]Span{
 		Span{Format{}, "\\"},
 	}},
-	" ** // `` ": Text{[]Span{
-		Span{Format{Bold: true}, " "},
-		Span{Format{Bold: true, Italic: true}, " "},
+	" ** __ `` ": Text{[]Span{
+		Span{Format{Emphasized: true}, " "},
+		Span{Format{Emphasized: true, Alternate: true}, " "},
 	}},
 	"**": Text{[]Span{}},
-	"**``__//foo": Text{[]Span{
-		Span{Format{Bold: true, Monospace: true, Underline: true, Italic: true}, "foo"},
+	"**``\"\"__foo": Text{[]Span{
+		Span{Format{Emphasized: true, Code: true, Quote: true, Alternate: true}, "foo"},
 	}},
-	"**foo//bar**baz": Text{[]Span{
-		Span{Format{Bold: true}, "foo"},
-		Span{Format{Bold: true, Italic: true}, "bar"},
-		Span{Format{Italic: true}, "baz"},
+	"**foo__bar**baz": Text{[]Span{
+		Span{Format{Emphasized: true}, "foo"},
+		Span{Format{Emphasized: true, Alternate: true}, "bar"},
+		Span{Format{Alternate: true}, "baz"},
 	}},
 	"@@foo": Text{[]Span{
 		Span{Format{Link: "foo"}, ""},
@@ -147,34 +147,34 @@ var parseTests = map[string]Text{
 	}},
 	"@@http://example.com foo **bar @@baz**": Text{[]Span{
 		Span{Format{Link: "http://example.com"}, "foo "},
-		Span{Format{Bold: true, Link: "http://example.com"}, "bar "},
-		Span{Format{Bold: true}, "baz"},
+		Span{Format{Emphasized: true, Link: "http://example.com"}, "bar "},
+		Span{Format{Emphasized: true}, "baz"},
 	}},
-	"//@@http://example.com foo //bar @@": Text{[]Span{
-		Span{Format{Italic: true, Link: "http://example.com"}, "foo "},
-		Span{Format{Link: "http://example.com"}, "bar "},
+	"__@@http://example.com/__/ foo __bar @@": Text{[]Span{
+		Span{Format{Alternate: true, Link: "http://example.com/__/"}, "foo "},
+		Span{Format{Link: "http://example.com/__/"}, "bar "},
 	}},
-	"__\\  asd \\ zxc\\ ": Text{[]Span{
-		Span{Format{Underline: true, Monospace: false}, "  asd  zxc "},
+	"\"\"\\  asd \\ zxc\\ ": Text{[]Span{
+		Span{Format{Quote: true, Code: false}, "  asd  zxc "},
 	}},
-	"@@/ test/@@": Text{[]Span{
-		Span{Format{Link: "/"}, "test/"},
+	"@@_ test_@@": Text{[]Span{
+		Span{Format{Link: "_"}, "test_"},
 	}},
-	"@@/ /test@@": Text{[]Span{
-		Span{Format{Link: "/"}, "/test"},
+	"@@_ _test@@": Text{[]Span{
+		Span{Format{Link: "_"}, "_test"},
 	}},
-	"/": Text{[]Span{
-		Span{Format{}, "/"},
+	"_": Text{[]Span{
+		Span{Format{}, "_"},
 	}},
-	"test/**": Text{[]Span{
-		Span{Format{}, "test/"},
+	"test_**": Text{[]Span{
+		Span{Format{}, "test_"},
 	}},
-	"//test/": Text{[]Span{
-		Span{Format{Italic: true}, "test/"},
+	"__test_": Text{[]Span{
+		Span{Format{Alternate: true}, "test_"},
 	}},
-	"/**test": Text{[]Span{
-		Span{Format{}, "/"},
-		Span{Format{Bold: true}, "test"},
+	"_**test": Text{[]Span{
+		Span{Format{}, "_"},
+		Span{Format{Emphasized: true}, "test"},
 	}},
 }
 
@@ -213,16 +213,16 @@ func textEqual(a, b Text) bool {
 }
 
 var escapeTests = map[string]string{
-	"\n\r\t\v\x00":     "\\n\\r\\t\v\\x00",
-	"@@!!##__//__``**": "\\@\\@!!##\\_\\_\\/\\/\\_\\_\\`\\`\\*\\*",
-	`foo\@\@bar`:       `foo\\\@\\\@bar`,
+	"\n\r\t\v\x00":                               "\\n\\r\\t\v\\x00",
+	"@@!!##\"\"//\"\"__``**%%^^&&++==\x01\x01\\": "\\@\\@!!##\\\"\\\"//\\\"\\\"\\_\\_\\`\\`\\*\\*%%^^&&++==\x01\x01\\\\",
+	`foo\@\@bar`:                                 `foo\\\@\\\@bar`,
 }
 
 func TestEscape(t *testing.T) {
 	for k, v := range escapeTests {
 		t.Run(k, func(t *testing.T) {
 			if e := Escape(k); e != v {
-				t.Errorf("Escape(%q): expected %q, got %q", k, v, e)
+				t.Errorf("Escape(%q):\nexpected: %q\n     got: %q", k, v, e)
 			}
 		})
 	}
@@ -232,7 +232,7 @@ var parseTextTests = map[string]TextFmtContents{
 	"foo  ** bar\nbaz\n\n\nquux ** ": TextFmtContents{[]Text{
 		Text{[]Span{
 			Span{Format{}, "foo "},
-			Span{Format{Bold: true}, " bar baz"},
+			Span{Format{Emphasized: true}, " bar baz"},
 		}},
 		Text{[]Span{
 			Span{Format{}, "quux "},
@@ -261,9 +261,14 @@ var parseTextTests = map[string]TextFmtContents{
 
 	`foo**bar\*\*baz\*\*quux**qweasd`: TextFmtContents{[]Text{Text{[]Span{
 		Span{Format{}, "foo"},
-		Span{Format{Bold: true}, "bar**baz**quux"},
+		Span{Format{Emphasized: true}, "bar**baz**quux"},
 		Span{Format{}, "qweasd"},
 	}}}},
+
+	"**foo\n\nbar": TextFmtContents{[]Text{
+		Text{[]Span{Span{Format{Emphasized: true}, "foo"}}},
+		Text{[]Span{Span{Format{}, "bar"}}},
+	}},
 }
 
 func TestParseTextFmt(t *testing.T) {
@@ -316,14 +321,14 @@ var writeTests = map[string]TextFmtContents{
 
 	"**foo\n": TextFmtContents{[]Text{
 		Text{[]Span{
-			Span{Format{Bold: true}, "foo"},
+			Span{Format{Emphasized: true}, "foo"},
 		}},
 	}},
 
 	"foo **bar baz\n\nquux\n": TextFmtContents{[]Text{
 		Text{[]Span{
 			Span{Format{}, "foo "},
-			Span{Format{Bold: true}, "bar baz"},
+			Span{Format{Emphasized: true}, "bar baz"},
 		}},
 		Text{[]Span{
 			Span{Format{}, "quux"},
@@ -331,35 +336,62 @@ var writeTests = map[string]TextFmtContents{
 	}},
 
 	"foo**bar``baz**quux\n\n" +
-		"\\ __qwe\\ __//\\  asd \\ //``zxc``**\\ \n\n" +
-		"//@@http://example.com exa//mple@@ @@href text@@// test\n": TextFmtContents{[]Text{
+		"\\ \"\"qwe\\ \"\"__\\  asd \\ __``zxc``**\\ \n\n" +
+		"__@@http://example.com/__/ exa__mple@@ @@href text@@__ test\n": TextFmtContents{[]Text{
 		Text{[]Span{
 			Span{Format{}, "foo"},
-			Span{Format{Bold: true}, "bar"},
-			Span{Format{Bold: true, Monospace: true}, "baz"},
-			Span{Format{Monospace: true}, "quux"},
+			Span{Format{Emphasized: true}, "bar"},
+			Span{Format{Emphasized: true, Code: true}, "baz"},
+			Span{Format{Code: true}, "quux"},
 		}},
 		Text{[]Span{
 			Span{Format{}, " "},
-			Span{Format{Underline: true}, "qwe "},
-			Span{Format{Italic: true}, "  asd  "},
-			Span{Format{Monospace: true}, "zxc"},
-			Span{Format{Bold: true}, " "},
+			Span{Format{Quote: true}, "qwe "},
+			Span{Format{Alternate: true}, "  asd  "},
+			Span{Format{Code: true}, "zxc"},
+			Span{Format{Emphasized: true}, " "},
 		}},
 		Text{[]Span{
-			Span{Format{Italic: true, Link: "http://example.com"}, "exa"},
-			Span{Format{Link: "http://example.com"}, "mple"},
+			Span{Format{Alternate: true, Link: "http://example.com/__/"}, "exa"},
+			Span{Format{Link: "http://example.com/__/"}, "mple"},
 			Span{Format{}, " "},
 			Span{Format{Link: "href"}, "text"},
-			Span{Format{Italic: true}, " test"},
+			Span{Format{Alternate: true}, " test"},
 		}},
 	}},
 
 	"foo**bar\\*\\*baz\\*\\*quux**qweasd\n": TextFmtContents{[]Text{Text{[]Span{
 		Span{Format{}, "foo"},
-		Span{Format{Bold: true}, "bar**baz**quux"},
+		Span{Format{Emphasized: true}, "bar**baz**quux"},
 		Span{Format{}, "qweasd"},
 	}}}},
+
+	"**1** **2** **3** **4** **5** **6** **7** **8**" +
+		" **9** **10** **11** **12\n": TextFmtContents{[]Text{Text{[]Span{
+		Span{Format{Emphasized: true}, "1"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "2"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "3"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "4"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "5"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "6"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "7"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "8"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "9"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "10"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "11"},
+		Span{Format{}, " "},
+		Span{Format{Emphasized: true}, "12"},
+	}}}},
 }
 
 func TestWriteTextFmt(t *testing.T) {
@@ -371,8 +403,6 @@ func TestWriteTextFmt(t *testing.T) {
 				t.Fatalf("WriteIndent error: %v", err)
 			}
 			w := buf.String()
-			t.Log("expected:\n" + k)
-			t.Log("     got:\n" + w)
 			if k != w {
 				t.Fatalf("WriteIndent: output did not match expected document:\nexpected: %q\n     got: %q", k, w)
 			}