🎨 脚注编号

88250 · Nov 10, 2020 · 4d689c1 · 4d689c1
1 parent 76771b7
commit 4d689c1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
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/parse/footnotes.go b/parse/footnotes.go
@@ -38,8 +38,8 @@ func (t *Tree) FindFootnotesDef(label []byte) (pos int, def *ast.Node) {
 		if !entering || ast.NodeFootnotesDef != n.Type {
 			return ast.WalkContinue
 		}
+		pos++
 		if bytes.EqualFold(n.Tokens, label) {
-			pos++
 			def = n
 			return ast.WalkStop
 		}

diff --git a/parse/heading_id.go b/parse/heading_id.go
@@ -52,6 +52,8 @@ func (t *Tree) parseHeadingID(block *ast.Node, ctx *InlineContext) (ret *ast.Nod
 	}
 	id := content[curlyBracesStart+1 : curlyBracesEnd]
 	ctx.pos += curlyBracesEnd + 1
-	block.LastChild.Tokens = bytes.TrimRight(block.LastChild.Tokens, " ")
+	if nil != block.LastChild {
+		block.LastChild.Tokens = bytes.TrimRight(block.LastChild.Tokens, " ")
+	}
 	return &ast.Node{Type: ast.NodeHeadingID, Tokens: id}
 }
diff --git a/test/spinv_ir_block_test.go b/test/spinv_ir_block_test.go
@@ -19,6 +19,7 @@ import (
 
 var spinVditorIRBlockDOMTests = []*parseTest{
 
+	{"67", "<p data-block=\"0\" data-node-id=\"20201110191959-wa2a6vh\" data-type=\"p\">foo<sup data-type=\"footnotes-ref\" class=\"vditor-ir__node b3-tooltips b3-tooltips__s\" aria-label=\"foo\" data-footnotes-label=\"^foo\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">^foo</span><span class=\"vditor-ir__marker--hide\" data-render=\"1\">1</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span></sup>bar<wbr><sup data-type=\"footnotes-ref\" class=\"vditor-ir__node b3-tooltips b3-tooltips__s\" aria-label=\"bar\" data-footnotes-label=\"^bar\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">^bar</span><span class=\"vditor-ir__marker--hide\" data-render=\"1\">1</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span></sup></p><div data-block=\"0\" data-type=\"footnotes-block\"><div data-type=\"footnotes-def\"><span>[^foo]: </span><p data-block=\"0\" data-node-id=\"20201110192017-qlemz3m\" data-type=\"p\">foo</p></div><div data-type=\"footnotes-def\"><span>[^bar]: </span><p data-block=\"0\" data-node-id=\"20201110192024-ggll80x\" data-type=\"p\">bar</p></div></div>", "<p data-block=\"0\" data-node-id=\"20201110191959-wa2a6vh\" data-type=\"p\">foo<sup data-type=\"footnotes-ref\" class=\"vditor-ir__node b3-tooltips b3-tooltips__s\" aria-label=\"foo\" data-footnotes-label=\"^foo\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">^foo</span><span class=\"vditor-ir__marker--hide\" data-render=\"1\">1</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span></sup>\u200bbar<wbr><sup data-type=\"footnotes-ref\" class=\"vditor-ir__node b3-tooltips b3-tooltips__s\" aria-label=\"bar\" data-footnotes-label=\"^bar\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">^bar</span><span class=\"vditor-ir__marker--hide\" data-render=\"1\">2</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span></sup>\u200b</p><div data-block=\"0\" data-type=\"footnotes-block\"><div data-type=\"footnotes-def\"><span>[^foo]: </span><p data-block=\"0\" data-node-id=\"20201110192017-qlemz3m\" data-type=\"p\">foo</p></div><div data-type=\"footnotes-def\"><span>[^bar]: </span><p data-block=\"0\" data-node-id=\"20201110192024-ggll80x\" data-type=\"p\">bar</p></div></div>"},
 	{"66", "<div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span><wbr>[foo]: </span>foo\n</span></div><div data-block=\"0\" data-type=\"link-ref-defs-block\" data-node-id=\"20201110155655-mv5bu2e\"><span><span><br></span></span></div>", "<p data-block=\"0\" data-node-id=\"20060102150405-1a2b3c4\" data-type=\"p\"><wbr>[foo]: foo</p>"},
 	{"65", "<p data-block=\"0\" data-node-id=\"20201110153540-4tmm5s4\" data-type=\"p\">[foo<wbr>]</p><div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[foo]: </span>foo\n</span><span><span>[bar]: </span>bar\n</span></div>", "<p data-block=\"0\" data-node-id=\"20201110153540-4tmm5s4\" data-type=\"p\"><span data-type=\"link-ref\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span>foo<wbr></span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span></span></p><div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[foo]: </span>foo\n</span></div><div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[bar]: </span>bar\n</span></div>"},
 	{"64", "<div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[bar]: </span>bar<wbr>\n</span><span><span>[foo]: </span>foo\n</span></div>", "<div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[bar]: </span>bar<wbr>\n</span></div><div data-block=\"0\" data-type=\"link-ref-defs-block\"><span><span>[foo]: </span>foo\n</span></div>"},