From 2f7a4aa9c409f6b129e908ed8b2f9b83acb096a6 Mon Sep 17 00:00:00 2001
From: jkboxomine <28672313+jkboxomine@users.noreply.github.com>
Date: Fri, 6 Dec 2019 00:07:40 +0900
Subject: [PATCH] Change auto heading ID generation logic - expand to
 international characters - change one or more consecutive spaces to hyphen -
 change period, hyphen, and underscore to hyphen

---
 parser/parser.go | 48 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/parser/parser.go b/parser/parser.go
index 2a5538a..5738d97 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"strings"
 	"sync"
+	"unicode"
+	"unicode/utf8"
 
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/text"
@@ -76,21 +78,41 @@ func (s *ids) Generate(value []byte, kind ast.NodeKind) []byte {
 	value = util.TrimLeftSpace(value)
 	value = util.TrimRightSpace(value)
 	result := []byte{}
-	for i := 0; i < len(value); {
-		v := value[i]
-		l := util.UTF8Len(v)
-		i += int(l)
-		if l != 1 {
+	for len(value) > 0 {
+		r, size := utf8.DecodeRune(value)
+		if unicode.IsLetter(r) {
+			if unicode.IsUpper(r) {
+				r = unicode.ToLower(r)
+			}
+			buf := make([]byte, size)
+			utf8.EncodeRune(buf, r)
+			for i := 0; i < size; i++ {
+				result = append(result, buf[i])
+			}
+		} else if unicode.IsNumber(r) || unicode.IsSymbol(r) {
+			buf := make([]byte, size)
+			utf8.EncodeRune(buf, r)
+			for i := 0; i < size; i++ {
+				result = append(result, buf[i])
+			}
+		} else if unicode.IsSpace(r) {
+			nr, nsize := utf8.DecodeRune(value[size:])
+			_ = nsize
+			if unicode.IsSpace(nr) {
+				value = value[size:]
+				continue
+			} else {
+				result = append(result, '-')
+			}
+		} else if unicode.IsPunct(r) {
+			if r == '.' || r == '-' || r == '_' {
+				result = append(result, '-')
+			}
+		} else {
+			value = value[size:]
 			continue
 		}
-		if util.IsAlphaNumeric(v) {
-			if 'A' <= v && v <= 'Z' {
-				v += 'a' - 'A'
-			}
-			result = append(result, v)
-		} else if util.IsSpace(v) || v == '-' || v == '_' {
-			result = append(result, '-')
-		}
+		value = value[size:]
 	}
 	if len(result) == 0 {
 		if kind == ast.KindHeading {