Merge pull request #3 from yushi/adjust-header-for-wide-character

Adjust header for wide characters.

Author: dmitshur

Godeps

@@ -7,6 +7,11 @@
 			"Comment": "null-125",
 			"Rev": "88fa3094706609347d6fa1e362d946bbc207fceb"
 		},
+		{
+			"ImportPath": "github.com/mattn/go-runewidth",
+			"Comment": "travisish-12-g39104c7",
+			"Rev": "39104c78546f11be4bbc161e39858258aac6d9b8"
+		},
 		{
 			"ImportPath": "github.com/russross/blackfriday",
 			"Comment": "v1.1-115-gf3ab184",

markdown/main.go

@@ -10,6 +10,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/mattn/go-runewidth"
 	"github.com/russross/blackfriday"
 )
 
@@ -100,9 +101,11 @@ func (_ *markdownRenderer) Header(out *bytes.Buffer, text func() bool, level int
 
 	switch level {
 	case 1:
-		fmt.Fprint(out, "\n", strings.Repeat("=", out.Len()-textMarker))
+		len := runewidth.StringWidth(out.String()[textMarker:])
+		fmt.Fprint(out, "\n", strings.Repeat("=", len))
 	case 2:
-		fmt.Fprint(out, "\n", strings.Repeat("-", out.Len()-textMarker))
+		len := runewidth.StringWidth(out.String()[textMarker:])
+		fmt.Fprint(out, "\n", strings.Repeat("-", len))
 	}
 	out.WriteString("\n")
 }

markdown/main_test.go

@@ -191,6 +191,42 @@ func Test(t *testing.T) {
 	}
 }
 
+func TestWideChar(t *testing.T) {
+	input := []byte(`タイトル
+==
+
+サブタイトル
+---
+
+aaa/あああ
+----------
+`)
+
+	expected := []byte(`タイトル
+========
+
+サブタイトル
+------------
+
+aaa/あああ
+----------
+`)
+
+	output, err := markdown.Process("", input, nil)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	diff, err := diff(expected, output)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	if len(diff) != 0 {
+		t.Errorf("Difference of %d lines:\n%s", bytes.Count(diff, []byte("\n")), string(diff))
+	}
+}
+
 // TODO: Factor out.
 func diff(b1, b2 []byte) (data []byte, err error) {
 	f1, err := ioutil.TempFile("", "markdownfmt")