- ${window.siyuan.languages.export9}
+ ${window.siyuan.languages.export30}
${window.siyuan.languages.export28}
diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts
index 1f0de91d0..3697c4544 100644
--- a/app/src/protyle/export/util.ts
+++ b/app/src/protyle/export/util.ts
@@ -42,7 +42,7 @@ export const exportImage = (id: string) => {
diff --git a/kernel/api/router.go b/kernel/api/router.go
index 0be3f8526..271f30306 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -317,6 +317,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/setting/addVirtualBlockRefInclude", model.CheckAuth, model.CheckReadonly, addVirtualBlockRefInclude)
ginServer.Handle("POST", "/api/setting/addVirtualBlockRefExclude", model.CheckAuth, model.CheckReadonly, addVirtualBlockRefExclude)
ginServer.Handle("POST", "/api/setting/setSnippet", model.CheckAuth, model.CheckReadonly, setConfSnippet)
+ ginServer.Handle("POST", "/api/setting/setEditorReadOnly", model.CheckAuth, model.CheckReadonly, setEditorReadOnly)
ginServer.Handle("POST", "/api/graph/resetGraph", model.CheckAuth, model.CheckReadonly, resetGraph)
ginServer.Handle("POST", "/api/graph/resetLocalGraph", model.CheckAuth, model.CheckReadonly, resetLocalGraph)
diff --git a/kernel/api/setting.go b/kernel/api/setting.go
index e9c9c9d33..126966952 100644
--- a/kernel/api/setting.go
+++ b/kernel/api/setting.go
@@ -29,6 +29,27 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
+func setEditorReadOnly(c *gin.Context) {
+ ret := gulu.Ret.NewResult()
+ defer c.JSON(http.StatusOK, ret)
+
+ arg, ok := util.JsonArg(c, ret)
+ if !ok {
+ return
+ }
+
+ readOnly := arg["readonly"].(bool)
+
+ oldReadOnly := model.Conf.Editor.ReadOnly
+ model.Conf.Editor.ReadOnly = readOnly
+ model.Conf.Save()
+
+ if oldReadOnly != model.Conf.Editor.ReadOnly {
+ util.BroadcastByType("protyle", "readonly", 0, "", model.Conf.Editor.ReadOnly)
+ util.BroadcastByType("main", "readonly", 0, "", model.Conf.Editor.ReadOnly)
+ }
+}
+
func setConfSnippet(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/conf/export.go b/kernel/conf/export.go
index 0bfbf1962..38012b671 100644
--- a/kernel/conf/export.go
+++ b/kernel/conf/export.go
@@ -17,23 +17,29 @@
package conf
type Export struct {
- ParagraphBeginningSpace bool `json:"paragraphBeginningSpace"` // 是否使用中文排版段落开头空两格
- AddTitle bool `json:"addTitle"` // 是否添加标题
- BlockRefMode int `json:"blockRefMode"` // 内容块引用导出模式，2：锚文本块链，3：仅锚文本，4：块引转脚注，（0：使用原始文本，1：使用 Blockquote。0 和 1 都已经废弃 https://github.com/siyuan-note/siyuan/issues/3155）
- BlockEmbedMode int `json:"blockEmbedMode"` // 内容块引用导出模式，0：使用原始文本，1：使用 Blockquote
- BlockRefTextLeft string `json:"blockRefTextLeft"` // 内容块引用导出锚文本左侧符号，默认留空
- BlockRefTextRight string `json:"blockRefTextRight"` // 内容块引用导出锚文本右侧符号，默认留空
- TagOpenMarker string `json:"tagOpenMarker"` // 标签开始标记符，默认是 #
- TagCloseMarker string `json:"tagCloseMarker"` // 标签结束标记符，默认是 #
- FileAnnotationRefMode int `json:"fileAnnotationRefMode"` // 文件标注引用导出模式，0：文件名 - 页码 - 锚文本，1：仅锚文本
- PandocBin string `json:"pandocBin"` // Pandoc 可执行文件路径
- MarkdownYFM bool `json:"markdownYFM"` // Markdown 导出时是否添加 YAML Front Matter https://github.com/siyuan-note/siyuan/issues/7727
- PDFFooter string `json:"pdfFooter"` // PDF 导出时页脚内容
- DocxTemplate string `json:"docxTemplate"` // Docx 导出时模板文件路径
- PDFWatermarkStr string `json:"pdfWatermarkStr"` // PDF 导出时水印文本或水印文件路径
- PDFWatermarkDesc string `json:"pdfWatermarkDesc"` // PDF 导出时水印位置、大小和样式等
- ImageWatermarkStr string `json:"imageWatermarkStr"` // 图片导出时水印文本或水印文件路径
- ImageWatermarkDesc string `json:"imageWatermarkDesc"` // 图片导出时水印位置、大小和样式等
+ ParagraphBeginningSpace bool `json:"paragraphBeginningSpace"` // 是否使用中文排版段落开头空两格
+ AddTitle bool `json:"addTitle"` // 是否添加标题
+ // 内容块引用导出模式
+ // 2：锚文本块链
+ // 3：仅锚文本
+ // 4：块引转脚注
+ // 5：锚点哈希 https://github.com/siyuan-note/siyuan/issues/10265
+ // （0：使用原始文本，1：使用 Blockquote。0 和 1 都已经废弃 https://github.com/siyuan-note/siyuan/issues/3155）
+ BlockRefMode int `json:"blockRefMode"`
+ BlockEmbedMode int `json:"blockEmbedMode"` // 内容块引用导出模式，0：使用原始文本，1：使用 Blockquote
+ BlockRefTextLeft string `json:"blockRefTextLeft"` // 内容块引用导出锚文本左侧符号，默认留空
+ BlockRefTextRight string `json:"blockRefTextRight"` // 内容块引用导出锚文本右侧符号，默认留空
+ TagOpenMarker string `json:"tagOpenMarker"` // 标签开始标记符，默认是 #
+ TagCloseMarker string `json:"tagCloseMarker"` // 标签结束标记符，默认是 #
+ FileAnnotationRefMode int `json:"fileAnnotationRefMode"` // 文件标注引用导出模式，0：文件名 - 页码 - 锚文本，1：仅锚文本
+ PandocBin string `json:"pandocBin"` // Pandoc 可执行文件路径
+ MarkdownYFM bool `json:"markdownYFM"` // Markdown 导出时是否添加 YAML Front Matter https://github.com/siyuan-note/siyuan/issues/7727
+ PDFFooter string `json:"pdfFooter"` // PDF 导出时页脚内容
+ DocxTemplate string `json:"docxTemplate"` // Docx 导出时模板文件路径
+ PDFWatermarkStr string `json:"pdfWatermarkStr"` // PDF 导出时水印文本或水印文件路径
+ PDFWatermarkDesc string `json:"pdfWatermarkDesc"` // PDF 导出时水印位置、大小和样式等
+ ImageWatermarkStr string `json:"imageWatermarkStr"` // 图片导出时水印文本或水印文件路径
+ ImageWatermarkDesc string `json:"imageWatermarkDesc"` // 图片导出时水印位置、大小和样式等
}
func NewExport() *Export {
diff --git a/kernel/model/export.go b/kernel/model/export.go
index 8d1cb113b..d34a64b24 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -248,7 +248,7 @@ func Export2Liandi(id string) (err error) {
4, 1, 0,
"#", "#",
"", "",
- false)
+ false, nil)
result := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s()
request = request.
@@ -1316,7 +1316,7 @@ func ExportStdMarkdown(id string) string {
Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
- Conf.Export.AddTitle)
+ Conf.Export.AddTitle, nil)
}
func ExportPandocConvertZip(id, pandocTo, ext string) (name, zipPath string) {
@@ -1338,7 +1338,7 @@ func ExportPandocConvertZip(id, pandocTo, ext string) (name, zipPath string) {
docPaths = append(docPaths, docFile.path)
}
- zipPath = exportPandocConvertZip(boxID, baseFolderName, docPaths, "gfm+footnotes+hard_line_breaks", pandocTo, ext)
+ zipPath = exportPandocConvertZip(false, boxID, baseFolderName, docPaths, "gfm+footnotes+hard_line_breaks", pandocTo, ext)
name = strings.TrimSuffix(filepath.Base(block.Path), ".sy")
return
}
@@ -1366,7 +1366,7 @@ func BatchExportMarkdown(boxID, folderPath string) (zipPath string) {
for _, docFile := range docFiles {
docPaths = append(docPaths, docFile.path)
}
- zipPath = exportPandocConvertZip(boxID, baseFolderName, docPaths, "", "", ".md")
+ zipPath = exportPandocConvertZip(true, boxID, baseFolderName, docPaths, "", "", ".md")
return
}
@@ -1762,10 +1762,10 @@ func walkRelationAvs(avID string, exportAvIDs *hashset.Set) {
}
func ExportMarkdownContent(id string) (hPath, exportedMd string) {
- return exportMarkdownContent(id)
+ return exportMarkdownContent(id, Conf.Export.BlockRefMode, nil)
}
-func exportMarkdownContent(id string) (hPath, exportedMd string) {
+func exportMarkdownContent(id string, exportRefMode int, defBlockIDs []string) (hPath, exportedMd string) {
tree, err := loadTreeByBlockID(id)
if nil != err {
logging.LogErrorf("load tree by block id [%s] failed: %s", id, err)
@@ -1773,10 +1773,10 @@ func exportMarkdownContent(id string) (hPath, exportedMd string) {
}
hPath = tree.HPath
exportedMd = exportMarkdownContent0(tree, "", false,
- Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
+ exportRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
- Conf.Export.AddTitle)
+ Conf.Export.AddTitle, defBlockIDs)
docIAL := parse.IAL2Map(tree.Root.KramdownIAL)
exportedMd = yfm(docIAL) + exportedMd
return
@@ -1786,7 +1786,8 @@ func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string, assetsDest
blockRefMode, blockEmbedMode, fileAnnotationRefMode int,
tagOpenMarker, tagCloseMarker string,
blockRefTextLeft, blockRefTextRight string,
- addTitle bool) (ret string) {
+ addTitle bool,
+ defBlockIDs []string) (ret string) {
tree = exportTree(tree, false, true, false,
blockRefMode, blockEmbedMode, fileAnnotationRefMode,
tagOpenMarker, tagCloseMarker,
@@ -1818,7 +1819,6 @@ func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string, assetsDest
})
}
- // When exporting Markdown, `
` nodes in non-tables are replaced with `\n` text nodes https://github.com/siyuan-note/siyuan/issues/9509
var unlinks []*ast.Node
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
@@ -1827,10 +1827,45 @@ func exportMarkdownContent0(tree *parse.Tree, cloudAssetsBase string, assetsDest
if ast.NodeBr == n.Type {
if !n.ParentIs(ast.NodeTableCell) {
+ // When exporting Markdown, `
` nodes in non-tables are replaced with `\n` text nodes https://github.com/siyuan-note/siyuan/issues/9509
n.InsertBefore(&ast.Node{Type: ast.NodeText, Tokens: []byte("\n")})
unlinks = append(unlinks, n)
}
}
+
+ if 5 == blockRefMode { // 锚点哈希
+ if n.IsBlock() && gulu.Str.Contains(n.ID, defBlockIDs) {
+ // 如果是定义块，则在开头处添加锚点
+ anchorSpan := &ast.Node{Type: ast.NodeInlineHTML, Tokens: []byte("
")}
+ if ast.NodeDocument != n.Type {
+ firstLeaf := treenode.FirstLeafBlock(n)
+ if nil != firstLeaf && nil != firstLeaf.FirstChild {
+ firstLeaf.FirstChild.InsertBefore(anchorSpan)
+ } else {
+ n.AppendChild(anchorSpan)
+ }
+ }
+ }
+
+ if treenode.IsBlockRef(n) {
+ // 如果是引用元素，则将其转换为超链接，指向 xxx.md#block-id
+ defID, linkText := getExportBlockRefLinkText(n, blockRefTextLeft, blockRefTextRight)
+ if gulu.Str.Contains(defID, defBlockIDs) {
+ var href string
+ bt := treenode.GetBlockTree(defID)
+ if nil != bt {
+ href += strings.TrimPrefix(bt.HPath, "/") + ".md"
+ if "d" != bt.Type {
+ href += "#" + defID
+ }
+ }
+ blockRefLink := &ast.Node{Type: ast.NodeTextMark, TextMarkType: "a", TextMarkTextContent: linkText, TextMarkAHref: href}
+ blockRefLink.KramdownIAL = n.KramdownIAL
+ n.InsertBefore(blockRefLink)
+ unlinks = append(unlinks, n)
+ }
+ }
+ }
return ast.WalkContinue
})
for _, unlink := range unlinks {
@@ -2017,16 +2052,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
// 处理引用节点
- defID, linkText, _ := treenode.GetBlockRef(n)
- if "" == linkText {
- linkText = sql.GetRefText(defID)
- }
- linkText = html.UnescapeHTMLStr(linkText) // 块引锚文本导出时 `&` 变为实体 `&` https://github.com/siyuan-note/siyuan/issues/7659
- if Conf.Editor.BlockRefDynamicAnchorTextMaxLen < utf8.RuneCountInString(linkText) {
- linkText = gulu.Str.SubStr(linkText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen) + "..."
- }
- linkText = blockRefTextLeft + linkText + blockRefTextRight
-
+ defID, linkText := getExportBlockRefLinkText(n, blockRefTextLeft, blockRefTextRight)
defTree, _ := loadTreeByBlockID(defID)
if nil == defTree {
return ast.WalkContinue
@@ -2034,21 +2060,24 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
switch blockRefMode {
case 2: // 锚文本块链
- var blockRefLink *ast.Node
- blockRefLink = &ast.Node{Type: ast.NodeTextMark, TextMarkType: "a", TextMarkTextContent: linkText, TextMarkAHref: "siyuan://blocks/" + defID}
+ blockRefLink := &ast.Node{Type: ast.NodeTextMark, TextMarkType: "a", TextMarkTextContent: linkText, TextMarkAHref: "siyuan://blocks/" + defID}
blockRefLink.KramdownIAL = n.KramdownIAL
n.InsertBefore(blockRefLink)
+ unlinks = append(unlinks, n)
case 3: // 仅锚文本
- var blockRefLink *ast.Node
- blockRefLink = &ast.Node{Type: ast.NodeTextMark, TextMarkType: "text", TextMarkTextContent: linkText}
+ blockRefLink := &ast.Node{Type: ast.NodeTextMark, TextMarkType: "text", TextMarkTextContent: linkText}
blockRefLink.KramdownIAL = n.KramdownIAL
n.InsertBefore(blockRefLink)
+ unlinks = append(unlinks, n)
case 4: // 脚注
refFoot := getRefAsFootnotes(defID, &refFootnotes)
n.InsertBefore(&ast.Node{Type: ast.NodeText, Tokens: []byte(linkText)})
n.InsertBefore(&ast.Node{Type: ast.NodeFootnotesRef, Tokens: []byte("^" + refFoot.refNum), FootnotesRefId: refFoot.refNum, FootnotesRefLabel: []byte("^" + refFoot.refNum)})
+ unlinks = append(unlinks, n)
+ case 5: // 锚点哈希
+ // 此处不做任何处理
}
- unlinks = append(unlinks, n)
+
if nil != n.Next && ast.NodeKramdownSpanIAL == n.Next.Type {
// 引用加排版标记（比如颜色）重叠时丢弃后面的排版属性节点
unlinks = append(unlinks, n.Next)
@@ -2555,7 +2584,7 @@ func processFileAnnotationRef(refID string, n *ast.Node, fileAnnotationRefMode i
return ast.WalkSkipChildren
}
-func exportPandocConvertZip(boxID, baseFolderName string, docPaths []string,
+func exportPandocConvertZip(exportNotebook bool, boxID, baseFolderName string, docPaths []string,
pandocFrom, pandocTo, ext string) (zipPath string) {
dir, name := path.Split(baseFolderName)
name = util.FilterFileName(name)
@@ -2574,6 +2603,41 @@ func exportPandocConvertZip(boxID, baseFolderName string, docPaths []string,
return
}
+ exportRefMode := Conf.Export.BlockRefMode
+ if !exportNotebook && 5 == exportRefMode {
+ // 非笔记本导出不支持锚点哈希，将其切换为锚文本块链
+ exportRefMode = 2
+ }
+
+ var defBlockIDs []string
+ if exportNotebook && 5 == exportRefMode {
+ // Add a Ref export mode `Anchor hash` for notebook Markdown exporting https://github.com/siyuan-note/siyuan/issues/10265
+ // 导出笔记本时导出锚点哈希，这里先记录下所有定义块的 ID
+ for _, p := range docPaths {
+ docIAL := box.docIAL(p)
+ if nil == docIAL {
+ continue
+ }
+ id := docIAL["id"]
+ tree, err := loadTreeByBlockID(id)
+ if nil != err {
+ continue
+ }
+ ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
+ if !entering {
+ return ast.WalkContinue
+ }
+
+ if treenode.IsBlockRef(n) {
+ defID, _, _ := treenode.GetBlockRef(n)
+ defBlockIDs = append(defBlockIDs, defID)
+ }
+ return ast.WalkContinue
+ })
+ }
+ defBlockIDs = gulu.Str.RemoveDuplicatedElem(defBlockIDs)
+ }
+
luteEngine := util.NewLute()
for _, p := range docPaths {
docIAL := box.docIAL(p)
@@ -2582,7 +2646,7 @@ func exportPandocConvertZip(boxID, baseFolderName string, docPaths []string,
}
id := docIAL["id"]
- hPath, md := exportMarkdownContent(id)
+ hPath, md := exportMarkdownContent(id, exportRefMode, defBlockIDs)
dir, name = path.Split(hPath)
dir = util.FilterFilePath(dir) // 导出文档时未移除不支持的文件名符号 https://github.com/siyuan-note/siyuan/issues/4590
name = util.FilterFileName(name)
@@ -2610,6 +2674,10 @@ func exportPandocConvertZip(boxID, baseFolderName string, docPaths []string,
asset = asset[:strings.LastIndex(asset, "?")]
}
+ if !strings.HasPrefix(asset, "assets/") {
+ continue
+ }
+
srcPath, err := GetAssetAbsPath(asset)
if nil != err {
logging.LogWarnf("get asset [%s] abs path failed: %s", asset, err)
@@ -2666,3 +2734,16 @@ func exportPandocConvertZip(boxID, baseFolderName string, docPaths []string,
zipPath = "/export/" + url.PathEscape(filepath.Base(zipPath))
return
}
+
+func getExportBlockRefLinkText(blockRef *ast.Node, blockRefTextLeft, blockRefTextRight string) (defID, linkText string) {
+ defID, linkText, _ = treenode.GetBlockRef(blockRef)
+ if "" == linkText {
+ linkText = sql.GetRefText(defID)
+ }
+ linkText = html.UnescapeHTMLStr(linkText) // 块引锚文本导出时 `&` 变为实体 `&` https://github.com/siyuan-note/siyuan/issues/7659
+ if Conf.Editor.BlockRefDynamicAnchorTextMaxLen < utf8.RuneCountInString(linkText) {
+ linkText = gulu.Str.SubStr(linkText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen) + "..."
+ }
+ linkText = blockRefTextLeft + linkText + blockRefTextRight
+ return
+}
diff --git a/kernel/treenode/tree.go b/kernel/treenode/tree.go
index 324ea87d3..154a37f6f 100644
--- a/kernel/treenode/tree.go
+++ b/kernel/treenode/tree.go
@@ -28,7 +28,6 @@ import (
"github.com/88250/gulu"
"github.com/88250/lute"
"github.com/88250/lute/ast"
- "github.com/88250/lute/html"
"github.com/88250/lute/parse"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/siyuan/kernel/util"
@@ -88,7 +87,9 @@ func IALStr(n *ast.Node) string {
if 1 > len(n.KramdownIAL) {
return ""
}
- return html.UnescapeString(string(parse.IAL2Tokens(n.KramdownIAL)))
+ // 这里不能进行转义，否则会导致从数据库中读取后转换为 IAL 时解析错误
+ // 所以 Some symbols should not be escaped to avoid inaccurate searches https://github.com/siyuan-note/siyuan/issues/10185 无法被修复了
+ return string(parse.IAL2Tokens(n.KramdownIAL))
}
func RootChildIDs(rootID string) (ret []string) {