Skip to content

Commit 8c67863

Browse files
committed
🎨 Supports configuration of whether to export inline memos #14605
1 parent bf20b47 commit 8c67863

16 files changed

+40
-3
lines changed

app/appearance/langs/ar_SA.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "نص العلامة المائية المخصصة أو مسار ملف العلامة المائية",
11121112
"export29": "موقع العلامة المائية، حجمها وأسلوبها، إلخ",
11131113
"export30": "صورة العلامة المائية للملف المصدّر",
1114+
"export31": "تصدير تعليقات السطر",
1115+
"export32": "عند التمكين، سيتم تصدير تعليقات السطر كحروف مرتفعة",
11141116
"theme11": "استخدام السمة في الوضع الفاتح",
11151117
"theme12": "استخدام السمة في الوضع الداكن",
11161118
"theme2": "تحديد الرموز المستخدمة في واجهة المستخدم",

app/appearance/langs/de_DE.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Wasserzeichentext oder Wasserzeichen-Dateipfad",
11121112
"export29": "Wasserzeichenposition, Größe und Stil usw.",
11131113
"export30": "Exportieren Sie Bildwasserzeichen",
1114+
"export31": "Zeilenkommentare exportieren",
1115+
"export32": "Wenn aktiviert, werden Zeilenkommentare als Hochgestellt exportiert",
11141116
"theme11": "Verwenden Sie das Thema im Hellmodus",
11151117
"theme12": "Verwenden Sie das Thema im Dunkelmodus",
11161118
"theme2": "Wählen Sie die in der Benutzeroberfläche verwendeten Icons aus",

app/appearance/langs/en_US.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Watermark text or watermark file path",
11121112
"export29": "Watermark position, size and style, etc.",
11131113
"export30": "Export image watermark",
1114+
"export31": "Export inline memos",
1115+
"export32": "When enabled, inline memos will be exported as superscript",
11141116
"theme11": "Use theme in light mode",
11151117
"theme12": "Use theme in dark mode",
11161118
"theme2": "Select the icons used in the user interface",

app/appearance/langs/es_ES.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Texto de marca de agua o ruta del archivo de marca de agua",
11121112
"export29": "Posición, tamaño y estilo de la marca de agua, etc.",
11131113
"export30": "Exportar marca de agua de imagen",
1114+
"export31": "Exportar anotaciones de línea",
1115+
"export32": "Cuando esté habilitado, las anotaciones de línea se exportarán como superíndice",
11141116
"theme11": "Usar tema en modo claro",
11151117
"theme12": "Usar tema en modo oscuro",
11161118
"theme2": "Selecciona los iconos utilizados en la interfaz de usuario",

app/appearance/langs/fr_FR.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Texte du filigrane ou chemin du fichier de filigrane",
11121112
"export29": "Position, taille et style du filigrane, etc.",
11131113
"export30": "Exporter le filigrane de l'image",
1114+
"export31": "Exporter les annotations de ligne",
1115+
"export32": "Une fois activé, les annotations de ligne seront exportées en exposant",
11141116
"theme11": "Utiliser le thème en mode Clair",
11151117
"theme12": "Utiliser le thème en mode sombre",
11161118
"theme2": "Sélectionnez les icônes utilisées dans l'interface utilisateur",

app/appearance/langs/he_IL.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "טקסט סימן מים או נתיב קובץ סימן מים",
11121112
"export29": "מיקום סימן מים, גודל וסגנון, וכו'",
11131113
"export30": "ייצוא סימן מים לתמונה",
1114+
"export31": "ייצוא הערות שורה",
1115+
"export32": "כאשר מופעל, הערות השורה ייוצאו ככתב עילי",
11141116
"theme11": "שימוש בנושא במצב בהיר",
11151117
"theme12": "שימוש בנושא במצב כהה",
11161118
"theme2": "בחר את האייקונים בשימוש בממשק המשתמש",

app/appearance/langs/it_IT.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Testo della filigrana o percorso del file della filigrana",
11121112
"export29": "Posizione, dimensione e stile della filigrana",
11131113
"export30": "Esporta filigrana immagine",
1114+
"export31": "Esporta annotazioni di riga",
1115+
"export32": "Quando abilitato, le annotazioni di riga verranno esportate come apice",
11141116
"theme11": "Usa il tema in modalità chiara",
11151117
"theme12": "Usa il tema in modalità scura",
11161118
"theme2": "Seleziona le icone utilizzate nell'interfaccia utente",

app/appearance/langs/ja_JP.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "透かしテキストまたは透かし画像ファイルのパス",
11121112
"export29": "透かしの位置、サイズ、スタイルなど",
11131113
"export30": "画像に透かしを書き出す",
1114+
"export31": "行レベルの注釈をエクスポート",
1115+
"export32": "有効化すると、行レベルの注釈が上付き文字としてエクスポートされます",
11141116
"theme11": "ライトモードで使われるテーマ",
11151117
"theme12": "ダークモードで使われるテーマ",
11161118
"theme2": "ユーザーインターフェースで使用するアイコン",

app/appearance/langs/pl_PL.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Tekst znaku wodnego lub ścieżka pliku znaku wodnego",
11121112
"export29": "Pozycja znaku wodnego, rozmiar i styl itp.",
11131113
"export30": "Eksportuj obraz znak wodny",
1114+
"export31": "Eksportuj przypisy wierszowe",
1115+
"export32": "Po włączeniu przypisy wierszowe będą eksportowane jako indeks górny",
11141116
"theme11": "Użyj motywu w trybie jasnym",
11151117
"theme12": "Użyj motywu w trybie ciemnym",
11161118
"theme2": "Wybierz ikony używane w interfejsie użytkownika",

app/appearance/langs/ru_RU.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "Текст водяного знака или путь к файлу водяного знака",
11121112
"export29": "Положение, размер и стиль водяного знака и т. д.",
11131113
"export30": "Экспорт изображения водяного знака",
1114+
"export31": "Экспорт строковых примечаний",
1115+
"export32": "После включения строковые примечания будут экспортироваться в виде верхнего индекса",
11141116
"theme11": "Использовать тему в светлом режиме",
11151117
"theme12": "Использовать тему в темном режиме",
11161118
"theme2": "Выберите значки, используемые в интерфейсе",

app/appearance/langs/zh_CHT.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "浮水印文字或浮水印檔案路徑",
11121112
"export29": "浮水印位置、大小和樣式等",
11131113
"export30": "匯出圖片浮水印",
1114+
"export31": "導出行級備註",
1115+
"export32": "啟用後行級備註將會導出為上標內容",
11141116
"theme11": "淺色模式下使用主題",
11151117
"theme12": "深色模式下使用主題",
11161118
"theme2": "選擇外觀使用的圖示",

app/appearance/langs/zh_CN.json

+2
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,8 @@
11111111
"export28": "水印文本或水印文件路径",
11121112
"export29": "水印位置、大小和样式等",
11131113
"export30": "导出图片水印",
1114+
"export31": "导出行级备注",
1115+
"export32": "启用后行级备注将会导出为上标内容",
11141116
"theme11": "明亮模式下使用主题",
11151117
"theme12": "暗黑模式下使用主题",
11161118
"theme2": "选择外观使用的图标",

app/src/config/exportConfig.ts

+9
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ export const exportConfig = {
3939
<span class="fn__space"></span>
4040
<input class="b3-switch fn__flex-center" id="markdownYFM" type="checkbox"${window.siyuan.config.export.markdownYFM ? " checked" : ""}/>
4141
</label>
42+
<label class="fn__flex b3-label">
43+
<div class="fn__flex-1">
44+
${window.siyuan.languages.export31}
45+
<div class="b3-label__text">${window.siyuan.languages.export32}</div>
46+
</div>
47+
<span class="fn__space"></span>
48+
<input class="b3-switch fn__flex-center" id="inlineMemo" type="checkbox"${window.siyuan.config.export.inlineMemo ? " checked" : ""}/>
49+
</label>
4250
<div class="fn__flex b3-label config__item">
4351
<div class="fn__flex-1">
4452
${window.siyuan.languages.ref}
@@ -200,6 +208,7 @@ export const exportConfig = {
200208
paragraphBeginningSpace: (exportConfig.element.querySelector("#paragraphBeginningSpace") as HTMLInputElement).checked,
201209
addTitle: (exportConfig.element.querySelector("#addTitle") as HTMLInputElement).checked,
202210
markdownYFM: (exportConfig.element.querySelector("#markdownYFM") as HTMLInputElement).checked,
211+
inlineMemo: (exportConfig.element.querySelector("#inlineMemo") as HTMLInputElement).checked,
203212
blockRefMode: parseInt((exportConfig.element.querySelector("#blockRefMode") as HTMLSelectElement).value, 10),
204213
blockEmbedMode: parseInt((exportConfig.element.querySelector("#blockEmbedMode") as HTMLSelectElement).value, 10),
205214
fileAnnotationRefMode: parseInt((exportConfig.element.querySelector("#fileAnnotationRefMode") as HTMLSelectElement).value, 10),

app/src/types/config.d.ts

+4
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,10 @@ declare namespace Config {
539539
* Whether to add YAML Front Matter when exporting to Markdown
540540
*/
541541
markdownYFM: boolean;
542+
/**
543+
* Whether to export the inline memo
544+
*/
545+
inlineMemo: boolean;
542546
/**
543547
* Pandoc executable file path
544548
*/

kernel/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
1111
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
1212
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689
13-
github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf
13+
github.com/88250/lute v1.7.7-0.20250420093953-252318b54969
1414
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
1515
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
1616
github.com/ConradIrwin/font v0.2.1

kernel/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
1414
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
1515
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
1616
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
17-
github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf h1:C03hzF6fv8ZGDqxmfKpT3MoR3XD2yjXBEU1ZIFb49mE=
18-
github.com/88250/lute v1.7.7-0.20250420092320-5ed83adb65cf/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
17+
github.com/88250/lute v1.7.7-0.20250420093953-252318b54969 h1:bfdOJtvkkHDIWZKYDDPvzTwXFsntn2CKeDlkP6MiErs=
18+
github.com/88250/lute v1.7.7-0.20250420093953-252318b54969/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
1919
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
2020
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
2121
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

0 commit comments

Comments
 (0)