From 8bf4e29ad89f241beb259fe9716f92dbfd744131 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 13 Nov 2026 06:32:26 -0500 Subject: [PATCH] Use shared IDML package constants in writer --- crates/idml/src/export.rs | 1 - crates/idml/src/export/designmap.rs | 6 +++--- crates/idml/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/idml/src/export.rs b/crates/idml/src/export.rs index 5d7d15e9f..567b901f7 100644 --- a/crates/idml/src/export.rs +++ b/crates/idml/src/export.rs @@ -31,7 +31,6 @@ pub(crate) use item::corner_names; #[cfg(test)] pub(crate) use item::path_to_uri; -const PKG_NS: &str = "http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging"; const NO_PARA_ID: &str = "ParagraphStyle/$ID/[No paragraph style]"; const TOC_STYLE_ID: &str = "TOCStyle/Table of Contents"; const TOC_STYLE_NAME: &str = "Table of Contents"; diff --git a/crates/idml/src/export/designmap.rs b/crates/idml/src/export/designmap.rs index bc1533e4c..a1077eb30 100644 --- a/crates/idml/src/export/designmap.rs +++ b/crates/idml/src/export/designmap.rs @@ -1,5 +1,5 @@ use super::common::{anchor_self, bool_s, p, uid, with_props, xref_format_self}; -use super::{CHAR_BUILTINS, DOM_VERSION, Document, El, Ex, HashSet, PARA_BUILTINS, PKG_NS, escape_id, names, num}; +use super::{CHAR_BUILTINS, DOM_VERSION, Document, El, Ex, HashSet, PARA_BUILTINS, escape_id, names, num}; impl<'a> Ex<'a> { // ---------- designmap ---------- @@ -8,7 +8,7 @@ impl<'a> Ex<'a> { let d = self.d; let story_list: Vec = d.stories.keys().map(|k| uid(k.0)).collect(); let mut root = El::new("Document") - .attr("xmlns:idPkg", PKG_NS) + .attr("xmlns:idPkg", craft_idml::PACKAGING_NS) .attr("DOMVersion", DOM_VERSION) .attr("Self", "d") .attr("StoryList", story_list.join(" ")) @@ -261,7 +261,7 @@ impl<'a> Ex<'a> { } } -pub(super) const CONTAINER: &str = "\n\n\t\n\t\t\n\t\n\n"; +pub(super) const CONTAINER: &str = craft_idml::CONTAINER_XML; /// A cross-reference format as InDesign building blocks. fn xref_format_el(i: usize, f: &designcraft_doc::XrefFormat) -> El { diff --git a/crates/idml/src/lib.rs b/crates/idml/src/lib.rs index 26290fb69..ca9bf1fc4 100644 --- a/crates/idml/src/lib.rs +++ b/crates/idml/src/lib.rs @@ -65,7 +65,7 @@ pub use import::{Imported, import_idml, import_idml_report, import_idml_report_w /// The IDML package mimetype (content of the first, stored `mimetype` entry). pub const MIMETYPE: &str = craft_idml::MIMETYPE; /// The DOM version written to every part. -pub const DOM_VERSION: &str = "16.0"; +pub const DOM_VERSION: &str = craft_idml::DOM_VERSION; #[derive(Debug, thiserror::Error)] pub enum IdmlError {