From 8c67863b4cbffbeacfa92480719c255a4f9f8608 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 20 Apr 2025 17:42:57 +0800 Subject: [PATCH] :art: Supports configuration of whether to export inline memos https://github.com/siyuan-note/siyuan/issues/14605 --- app/appearance/langs/ar_SA.json | 2 ++ app/appearance/langs/de_DE.json | 2 ++ app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/he_IL.json | 2 ++ app/appearance/langs/it_IT.json | 2 ++ app/appearance/langs/ja_JP.json | 2 ++ app/appearance/langs/pl_PL.json | 2 ++ app/appearance/langs/ru_RU.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/config/exportConfig.ts | 9 +++++++++ app/src/types/config.d.ts | 4 ++++ kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- 16 files changed, 40 insertions(+), 3 deletions(-) diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index 91c98aa4a..fc6cf0415 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -1111,6 +1111,8 @@ "export28": "نص العلامة المائية المخصصة أو مسار ملف العلامة المائية", "export29": "موقع العلامة المائية، حجمها وأسلوبها، إلخ", "export30": "صورة العلامة المائية للملف المصدّر", + "export31": "تصدير تعليقات السطر", + "export32": "عند التمكين، سيتم تصدير تعليقات السطر كحروف مرتفعة", "theme11": "استخدام السمة في الوضع الفاتح", "theme12": "استخدام السمة في الوضع الداكن", "theme2": "تحديد الرموز المستخدمة في واجهة المستخدم", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 67fcfa55a..e80f59264 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1111,6 +1111,8 @@ "export28": "Wasserzeichentext oder Wasserzeichen-Dateipfad", "export29": "Wasserzeichenposition, Größe und Stil usw.", "export30": "Exportieren Sie Bildwasserzeichen", + "export31": "Zeilenkommentare exportieren", + "export32": "Wenn aktiviert, werden Zeilenkommentare als Hochgestellt exportiert", "theme11": "Verwenden Sie das Thema im Hellmodus", "theme12": "Verwenden Sie das Thema im Dunkelmodus", "theme2": "Wählen Sie die in der Benutzeroberfläche verwendeten Icons aus", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 240ec4032..55e6d90f1 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1111,6 +1111,8 @@ "export28": "Watermark text or watermark file path", "export29": "Watermark position, size and style, etc.", "export30": "Export image watermark", + "export31": "Export inline memos", + "export32": "When enabled, inline memos will be exported as superscript", "theme11": "Use theme in light mode", "theme12": "Use theme in dark mode", "theme2": "Select the icons used in the user interface", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 68a331c5b..a9df0c2c3 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1111,6 +1111,8 @@ "export28": "Texto de marca de agua o ruta del archivo de marca de agua", "export29": "Posición, tamaño y estilo de la marca de agua, etc.", "export30": "Exportar marca de agua de imagen", + "export31": "Exportar anotaciones de línea", + "export32": "Cuando esté habilitado, las anotaciones de línea se exportarán como superíndice", "theme11": "Usar tema en modo claro", "theme12": "Usar tema en modo oscuro", "theme2": "Selecciona los iconos utilizados en la interfaz de usuario", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 6ac5baf04..062e60eee 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1111,6 +1111,8 @@ "export28": "Texte du filigrane ou chemin du fichier de filigrane", "export29": "Position, taille et style du filigrane, etc.", "export30": "Exporter le filigrane de l'image", + "export31": "Exporter les annotations de ligne", + "export32": "Une fois activé, les annotations de ligne seront exportées en exposant", "theme11": "Utiliser le thème en mode Clair", "theme12": "Utiliser le thème en mode sombre", "theme2": "Sélectionnez les icônes utilisées dans l'interface utilisateur", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 08d10b7a3..16521492a 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1111,6 +1111,8 @@ "export28": "טקסט סימן מים או נתיב קובץ סימן מים", "export29": "מיקום סימן מים, גודל וסגנון, וכו'", "export30": "ייצוא סימן מים לתמונה", + "export31": "ייצוא הערות שורה", + "export32": "כאשר מופעל, הערות השורה ייוצאו ככתב עילי", "theme11": "שימוש בנושא במצב בהיר", "theme12": "שימוש בנושא במצב כהה", "theme2": "בחר את האייקונים בשימוש בממשק המשתמש", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 117baffc3..9bc95ce26 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1111,6 +1111,8 @@ "export28": "Testo della filigrana o percorso del file della filigrana", "export29": "Posizione, dimensione e stile della filigrana", "export30": "Esporta filigrana immagine", + "export31": "Esporta annotazioni di riga", + "export32": "Quando abilitato, le annotazioni di riga verranno esportate come apice", "theme11": "Usa il tema in modalità chiara", "theme12": "Usa il tema in modalità scura", "theme2": "Seleziona le icone utilizzate nell'interfaccia utente", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index db380b960..ad483c808 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1111,6 +1111,8 @@ "export28": "透かしテキストまたは透かし画像ファイルのパス", "export29": "透かしの位置、サイズ、スタイルなど", "export30": "画像に透かしを書き出す", + "export31": "行レベルの注釈をエクスポート", + "export32": "有効化すると、行レベルの注釈が上付き文字としてエクスポートされます", "theme11": "ライトモードで使われるテーマ", "theme12": "ダークモードで使われるテーマ", "theme2": "ユーザーインターフェースで使用するアイコン", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 83ff3f010..69efb6acf 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1111,6 +1111,8 @@ "export28": "Tekst znaku wodnego lub ścieżka pliku znaku wodnego", "export29": "Pozycja znaku wodnego, rozmiar i styl itp.", "export30": "Eksportuj obraz znak wodny", + "export31": "Eksportuj przypisy wierszowe", + "export32": "Po włączeniu przypisy wierszowe będą eksportowane jako indeks górny", "theme11": "Użyj motywu w trybie jasnym", "theme12": "Użyj motywu w trybie ciemnym", "theme2": "Wybierz ikony używane w interfejsie użytkownika", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 7db3560b9..199e4d0dc 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1111,6 +1111,8 @@ "export28": "Текст водяного знака или путь к файлу водяного знака", "export29": "Положение, размер и стиль водяного знака и т. д.", "export30": "Экспорт изображения водяного знака", + "export31": "Экспорт строковых примечаний", + "export32": "После включения строковые примечания будут экспортироваться в виде верхнего индекса", "theme11": "Использовать тему в светлом режиме", "theme12": "Использовать тему в темном режиме", "theme2": "Выберите значки, используемые в интерфейсе", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 41610c985..4d7b274c8 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1111,6 +1111,8 @@ "export28": "浮水印文字或浮水印檔案路徑", "export29": "浮水印位置、大小和樣式等", "export30": "匯出圖片浮水印", + "export31": "導出行級備註", + "export32": "啟用後行級備註將會導出為上標內容", "theme11": "淺色模式下使用主題", "theme12": "深色模式下使用主題", "theme2": "選擇外觀使用的圖示", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index b7ef19415..b8e5576f3 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1111,6 +1111,8 @@ "export28": "水印文本或水印文件路径", "export29": "水印位置、大小和样式等", "export30": "导出图片水印", + "export31": "导出行级备注", + "export32": "启用后行级备注将会导出为上标内容", "theme11": "明亮模式下使用主题", "theme12": "暗黑模式下使用主题", "theme2": "选择外观使用的图标", diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index 6cc1b3b4c..85b78e292 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -39,6 +39,14 @@ export const exportConfig = { +
${window.siyuan.languages.ref} @@ -200,6 +208,7 @@ export const exportConfig = { paragraphBeginningSpace: (exportConfig.element.querySelector("#paragraphBeginningSpace") as HTMLInputElement).checked, addTitle: (exportConfig.element.querySelector("#addTitle") as HTMLInputElement).checked, markdownYFM: (exportConfig.element.querySelector("#markdownYFM") as HTMLInputElement).checked, + inlineMemo: (exportConfig.element.querySelector("#inlineMemo") as HTMLInputElement).checked, blockRefMode: parseInt((exportConfig.element.querySelector("#blockRefMode") as HTMLSelectElement).value, 10), blockEmbedMode: parseInt((exportConfig.element.querySelector("#blockEmbedMode") as HTMLSelectElement).value, 10), fileAnnotationRefMode: parseInt((exportConfig.element.querySelector("#fileAnnotationRefMode") as HTMLSelectElement).value, 10), diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts index be656bd5a..ff24807d5 100644 --- a/app/src/types/config.d.ts +++ b/app/src/types/config.d.ts @@ -539,6 +539,10 @@ declare namespace Config { * Whether to add YAML Front Matter when exporting to Markdown */ markdownYFM: boolean; + /** + * Whether to export the inline memo + */ + inlineMemo: boolean; /** * Pandoc executable file path */ diff --git a/kernel/go.mod b/kernel/go.mod index e4a7d250c..c53834337 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -10,7 +10,7 @@ require ( github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7 github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 - github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf + github.com/88250/lute v1.7.7-0.20250420093953-252318b54969 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4 github.com/ConradIrwin/font v0.2.1 diff --git a/kernel/go.sum b/kernel/go.sum index 206a387ae..9fd9afd29 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY= github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU= -github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf h1:C03hzF6fv8ZGDqxmfKpT3MoR3XD2yjXBEU1ZIFb49mE= -github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o= +github.com/88250/lute v1.7.7-0.20250420093953-252318b54969 h1:bfdOJtvkkHDIWZKYDDPvzTwXFsntn2CKeDlkP6MiErs= +github.com/88250/lute v1.7.7-0.20250420093953-252318b54969/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o= github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM= github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=