fixed word export

b-rodrigues · b-rodrigues · commit e7a360c86ec6 · 2025-12-13T16:09:03.000+01:00
diff --git a/src-tauri/src/kmd.rs b/src-tauri/src/kmd.rs
@@ -517,6 +517,7 @@ fn get_reference_text(label: &str, registry: &CrossRefRegistry) -> String {
 /// - Replaces @tbl:label with "Table N"
 /// - Removes {#sec:label} from headings
 /// - Removes {#tbl:label} from after tables
+/// - Converts ![caption](url){#fig:label} to standard ![caption](url)
 fn preprocess_markdown_for_docx(markdown: &str, registry: &CrossRefRegistry) -> String {
     let mut result = markdown.to_string();
 
@@ -529,6 +530,11 @@ fn preprocess_markdown_for_docx(markdown: &str, registry: &CrossRefRegistry) ->
         })
         .to_string();
 
+    // Convert figure syntax: ![caption](url){#fig:label} -> ![caption](url)
+    // This allows pandoc to properly embed the image
+    let fig_re = Regex::new(r"!\[([^\]]*)\]\(([^)]+)\)\{#fig:[^}]+\}").unwrap();
+    result = fig_re.replace_all(&result, "![$1]($2)").to_string();
+
     // Remove {#sec:label} from headings (keep the heading text)
     let sec_label_re = Regex::new(r"(\s*)\{#sec:[^}]+\}").unwrap();
     result = sec_label_re.replace_all(&result, "").to_string();
@@ -934,9 +940,85 @@ fn markdown_to_docx(markdown: &str) -> Result<Docx, String> {
     Ok(docx)
 }
 
+/// Check if pandoc is available on the system
+fn is_pandoc_available() -> bool {
+    use std::process::Command;
+    Command::new("pandoc")
+        .arg("--version")
+        .output()
+        .map(|o| o.status.success())
+        .unwrap_or(false)
+}
+
+/// Export markdown to DOCX using pandoc
+fn export_with_pandoc(path: &str, content: &str) -> Result<(), String> {
+    use std::process::{Command, Stdio};
+    use std::io::Write;
+    
+    // Preprocess the markdown to convert custom syntax to standard markdown
+    let crossref_registry = build_crossref_registry(content);
+    let mut processed_content = preprocess_markdown_for_docx(content, &crossref_registry);
+    
+    // Convert Tauri asset:// URLs back to absolute paths for pandoc
+    // asset://localhost/%2Fpath%2Fto%2Ffile -> /path/to/file
+    let asset_url_re = Regex::new(r"asset://localhost/(%[0-9A-Fa-f]{2}[^)\s]*)").unwrap();
+    processed_content = asset_url_re.replace_all(&processed_content, |caps: &regex::Captures| {
+        let encoded_path = caps.get(1).map(|m| m.as_str()).unwrap_or("");
+        // Simple percent-decoding
+        let mut decoded = String::new();
+        let mut chars = encoded_path.chars().peekable();
+        while let Some(c) = chars.next() {
+            if c == '%' {
+                let hex: String = chars.by_ref().take(2).collect();
+                if let Ok(byte) = u8::from_str_radix(&hex, 16) {
+                    decoded.push(byte as char);
+                } else {
+                    decoded.push('%');
+                    decoded.push_str(&hex);
+                }
+            } else {
+                decoded.push(c);
+            }
+        }
+        decoded
+    }).to_string();
+    
+    let mut child = Command::new("pandoc")
+        .arg("-f")
+        .arg("markdown")
+        .arg("-t")
+        .arg("docx")
+        .arg("-o")
+        .arg(path)
+        .stdin(Stdio::piped())
+        .spawn()
+        .map_err(|e| format!("Failed to start pandoc: {}", e))?;
+    
+    if let Some(mut stdin) = child.stdin.take() {
+        stdin.write_all(processed_content.as_bytes())
+            .map_err(|e| format!("Failed to write to pandoc stdin: {}", e))?;
+    }
+    
+    let status = child.wait()
+        .map_err(|e| format!("Failed to wait for pandoc: {}", e))?;
+    
+    if !status.success() {
+        return Err("Pandoc conversion failed".to_string());
+    }
+    
+    Ok(())
+}
+
 /// Export markdown content as a DOCX file
+/// Uses pandoc if available for better quality output, falls back to docx_rs library
 #[tauri::command]
 pub fn export_docx(path: String, content: String) -> Result<(), String> {
+    // Try pandoc first for better quality output
+    if is_pandoc_available() {
+        return export_with_pandoc(&path, &content);
+    }
+    
+    // Fallback to Rust docx_rs library
     let docx = markdown_to_docx(&content)?;
 
     let file = File::create(&path).map_err(|e| format!("Failed to create file: {}", e))?;
diff --git a/src/components/formatting-toolbar.js b/src/components/formatting-toolbar.js
@@ -101,7 +101,7 @@ export function initFormattingToolbar(editor) {
 
     // Listen for insert requests from context menu
     window.addEventListener('insert-table-request', () => insertTableCommand());
-    window.addEventListener('insert-image-request', () => insertImageCommand());
+    window.addEventListener('insert-image-request', () => insertFigureCommand());
 }
 
 /**
@@ -264,39 +264,6 @@ function insertLinkCommand() {
     });
 }
 
-/**
- * Insert image - prompts for URL and alt text
- */
-function insertImageCommand() {
-    if (!editorInstance) return;
-
-    editorInstance.action((ctx) => {
-        const view = ctx.get(editorViewCtx);
-        const { state, dispatch } = view;
-
-        const url = prompt("Enter image URL:");
-        if (!url) {
-            view.focus();
-            return;
-        }
-
-        const alt = prompt("Enter alt text (optional):", "") || "";
-
-        const imageType = state.schema.nodes.image;
-        if (!imageType) {
-            console.warn("Image node type not found in schema");
-            view.focus();
-            return;
-        }
-
-        const { from } = state.selection;
-        const imageNode = imageType.create({ src: url, alt: alt });
-        const tr = state.tr.insert(from, imageNode);
-        dispatch(tr);
-        view.focus();
-    });
-}
-
 /**
  * Insert a table - shows dialog for rows/columns/caption/label
  */
@@ -828,39 +795,6 @@ function showCrossRefDialog(refs, callback) {
     });
 }
 
-/**
- * Insert a table label
- */
-function insertTableLabelCommand() {
-    if (!editorInstance) return;
-
-    const nextNum = tableRegistry.size + 1;
-    const suggestedLabel = `tbl:table${nextNum}`;
-
-    const label = prompt(`Enter table label (for cross-references):\n\nSuggested: ${suggestedLabel}\n\nUsage: Place {#tbl:label} on a new line after your table`, suggestedLabel);
-
-    if (!label) return;
-
-    let finalLabel = label.trim();
-    if (!finalLabel.startsWith('tbl:')) {
-        finalLabel = 'tbl:' + finalLabel;
-    }
-
-    editorInstance.action((ctx) => {
-        const view = ctx.get(editorViewCtx);
-        const { state, dispatch } = view;
-        const { from } = state.selection;
-
-        // Insert the table label syntax
-        const labelText = `\n\n{#${finalLabel}}`;
-        const tr = state.tr.insertText(labelText, from);
-        dispatch(tr);
-        view.focus();
-
-        // Register the table
-        registerFigure(finalLabel);
-    });
-}
 
 /**
  * Insert hard break (line break within paragraph)
diff --git a/src/editor.js b/src/editor.js
@@ -55,9 +55,7 @@ export function getMarkdown() {
             editor.action((ctx) => {
                 const view = ctx.get(editorViewCtx);
                 const serializer = ctx.get(serializerCtx);
-                console.log("[DEBUG] getMarkdown - doc:", JSON.stringify(view.state.doc.toJSON(), null, 2));
                 markdown = serializer(view.state.doc);
-                console.log("[DEBUG] getMarkdown - result:", markdown);
             });
         } catch (err) {
             console.error("[ERROR] getMarkdown serialization failed:", err);
diff --git a/src/kmd-service.js b/src/kmd-service.js
@@ -14,7 +14,7 @@ export async function exportDocument() {
         filters: [{ name: 'Korppi Document', extensions: ['kmd'] }],
         defaultPath: 'document.kmd'
     });
-    
+
     if (path) {
         const meta = await invoke("export_kmd", { path });
         return { path, meta };
@@ -32,7 +32,7 @@ export async function importDocument() {
         filters: [{ name: 'Korppi Document', extensions: ['kmd'] }],
         multiple: false
     });
-    
+
     if (path) {
         const meta = await invoke("import_kmd", { path });
         return meta;
@@ -51,7 +51,7 @@ export async function exportAsMarkdown(markdownContent) {
         filters: [{ name: 'Markdown', extensions: ['md'] }],
         defaultPath: 'document.md'
     });
-    
+
     if (path) {
         await invoke("export_markdown", { path, content: markdownContent });
         return path;
@@ -62,22 +62,104 @@ export async function exportAsMarkdown(markdownContent) {
 /**
  * Export the document as a DOCX file.
  * Gets the current editor content and converts it to DOCX format.
+ * Requires pandoc for proper conversion - shows warning if not available.
  * @param {string} markdownContent - The markdown content to export
  * @returns {Promise<string|null>} Export path or null if cancelled
  */
 export async function exportAsDocx(markdownContent) {
+    // Check if pandoc is available
+    const hasPandoc = await invoke("check_pandoc_available");
+
+    if (!hasPandoc) {
+        // Show warning dialog about pandoc requirement
+        const shouldContinue = await showPandocWarningDialog();
+        if (!shouldContinue) {
+            return null;
+        }
+    }
+
     const path = await save({
         filters: [{ name: 'Word Document', extensions: ['docx'] }],
         defaultPath: 'document.docx'
     });
-    
+
     if (path) {
         await invoke("export_docx", { path, content: markdownContent });
         return path;
     }
     return null;
 }
 
+/**
+ * Show a warning dialog when pandoc is not installed.
+ * Provides link to download pandoc.
+ * @returns {Promise<boolean>} true if user wants to continue without pandoc, false to cancel
+ */
+async function showPandocWarningDialog() {
+    return new Promise((resolve) => {
+        const overlay = document.createElement('div');
+        overlay.className = 'modal';
+        overlay.style.display = 'flex';
+        overlay.innerHTML = `
+            <div class="modal-content" style="max-width: 450px;">
+                <div class="modal-header">
+                    <h2>⚠️ Pandoc Not Found</h2>
+                </div>
+                <div class="modal-body">
+                    <p><strong>Pandoc</strong> is required for exporting documents with proper formatting.</p>
+                    <p>Without Pandoc, the export will contain only plain text without formatting, images, or tables.</p>
+                    <p style="margin-top: 12px;">
+                        <a href="#" id="pandoc-download-link" style="color: var(--accent-color); text-decoration: underline;">
+                            📥 Download Pandoc from pandoc.org
+                        </a>
+                    </p>
+                </div>
+                <div class="modal-footer">
+                    <button id="pandoc-cancel" class="btn-secondary">Cancel Export</button>
+                    <button id="pandoc-continue" class="btn-primary">Export Anyway</button>
+                </div>
+            </div>
+        `;
+        document.body.appendChild(overlay);
+
+        const downloadLink = overlay.querySelector('#pandoc-download-link');
+        const cancelBtn = overlay.querySelector('#pandoc-cancel');
+        const continueBtn = overlay.querySelector('#pandoc-continue');
+
+        const cleanup = () => document.body.removeChild(overlay);
+
+        downloadLink.addEventListener('click', async (e) => {
+            e.preventDefault();
+            // Open the pandoc installation page in the default browser
+            await invoke("open_url", { url: "https://pandoc.org/installing.html" });
+        });
+
+        continueBtn.addEventListener('click', () => {
+            cleanup();
+            resolve(true);
+        });
+
+        cancelBtn.addEventListener('click', () => {
+            cleanup();
+            resolve(false);
+        });
+
+        overlay.addEventListener('click', (e) => {
+            if (e.target === overlay) {
+                cleanup();
+                resolve(false);
+            }
+        });
+
+        overlay.addEventListener('keydown', (e) => {
+            if (e.key === 'Escape') {
+                cleanup();
+                resolve(false);
+            }
+        });
+    });
+}
+
 /**
  * Get current document metadata.
  * @returns {Promise<Object>} Document metadata
diff --git a/src/main.js b/src/main.js
diff --git a/src/timeline.js b/src/timeline.js
