🎨 Improve HTML kbd clipping siyuan-note/siyuan#12027

88250 · Jul 28, 2024 · 062dc15 · 062dc15
1 parent ac4be43
commit 062dc15
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/h2m.go b/h2m.go
@@ -1030,6 +1030,17 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 			}
 			return
 		}
+	case atom.Kbd:
+		if nil != tree.Context.Tip.LastChild && ast.NodeKbd == tree.Context.Tip.LastChild.Type {
+			tree.Context.Tip.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: util.StrToBytes(editor.Zwsp)})
+		}
+
+		kbd := &ast.Node{Type: ast.NodeKbd}
+		kbd.AppendChild(&ast.Node{Type: ast.NodeKbdOpenMarker})
+		kbd.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: util.StrToBytes(util.DomText(n))})
+		kbd.AppendChild(&ast.Node{Type: ast.NodeKbdCloseMarker})
+		tree.Context.Tip.AppendChild(kbd)
+		return
 	case atom.Font:
 		node.Type = ast.NodeText
 		tokens := []byte(util.DomText(n))

diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/test/h2m_test.go b/test/h2m_test.go