@fiduswriter/editor 0.2.5 → 0.2.7

package/src/menus/headerbar/model.ts

@@ -14,7 +14,8 @@ import {
     LanguageDialog,
     PdfExportDialog,
     RevisionDialog,
-    HtmlExportDialog
+    HtmlExportDialog,
+    EpubExportDialog
 } from "../../dialogs/index.js"
 import {E2EEKeyManager} from "fwtoolkit/e2ee/key-manager"
 import {PassphraseManager} from "fwtoolkit/e2ee/passphrase-manager"
@@ -391,11 +392,11 @@ export const headerbarModel = () => ({
                     disabled: (editor: Editor) => editor.app.isOffline()
                 },
                 {
-                    title: gettext("Print/PDF"),
+                    title: gettext("Print"),
                     type: "action",
                     //icon: 'print',
                     tooltip: gettext(
-                        "Either print or create a PDF using your browser print dialog."
+                        "Print the document using your browser print dialog."
                     ),
                     order: 5,
                     keys: "Ctrl-p",
@@ -639,9 +640,20 @@ export const headerbarModel = () => ({
                             if (!options) {
                                 return
                             }
-                            const doc = getExportDoc(editor, {
-                                changes: "acceptAllNoInsertions"
-                            })
+                            const doc = getExportDoc(
+                                editor,
+                                options.resolveTrackChanges
+                                    ? {changes: "acceptAllNoInsertions"}
+                                    : undefined
+                            )
+                            const converterOptions: Record<string, unknown> = {}
+                            if (options.svgMath) {
+                                converterOptions.mathOutput = "svg"
+                            }
+                            if (!options.resolveTrackChanges) {
+                                // Keep the marks and render them in the output.
+                                converterOptions.trackChanges = true
+                            }
                             const exporter = new HTMLExporter(
                                 doc,
                                 db.bibDB,
@@ -649,7 +661,7 @@ export const headerbarModel = () => ({
                                 editor.app.csl,
                                 editor.docInfo.updated as Date,
                                 getDocumentTemplate(editor).documentStyles,
-                                options.svgMath ? {mathOutput: "svg"} : {}
+                                converterOptions
                             )
                             exporter.progressCallback = exportProgress(doc)
                             exporter.init()
@@ -732,18 +744,35 @@ export const headerbarModel = () => ({
                     action: (editor: Editor) => {
                         import(
                             "@fiduswriter/document/exporter/epub/index"
-                        ).then(({EpubExporter}) => {
+                        ).then(async ({EpubExporter}) => {
                             const db = getDB(editor)
-                            const doc = getExportDoc(editor, {
-                                changes: "acceptAllNoInsertions"
-                            })
+                            const dialog = new EpubExportDialog()
+                            const options = await dialog.init()
+                            if (!options) {
+                                return
+                            }
+                            const doc = getExportDoc(
+                                editor,
+                                options.resolveTrackChanges
+                                    ? {changes: "acceptAllNoInsertions"}
+                                    : undefined
+                            )
+                            const converterOptions: Record<string, unknown> = {}
+                            if (options.svgMath) {
+                                converterOptions.mathOutput = "svg"
+                            }
+                            if (!options.resolveTrackChanges) {
+                                // Keep the marks and render them in the output.
+                                converterOptions.trackChanges = true
+                            }
                             const exporter = new EpubExporter(
                                 doc,
                                 db.bibDB,
                                 db.imageDB,
                                 editor.app.csl,
                                 editor.docInfo.updated as Date,
-                                getDocumentTemplate(editor).documentStyles
+                                getDocumentTemplate(editor).documentStyles,
+                                converterOptions
                             )
                             exporter.progressCallback = exportProgress(doc)
                             exporter.init()