From cb4295cd5ae40f456848d0a7c8f75ce59ceed8f7 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 13 Nov 2026 07:37:24 -0500 Subject: [PATCH] Write text frame preferences through shared IDML model --- Cargo.lock | 20 +++++------ Cargo.toml | 4 +-- crates/idml/src/export/item.rs | 66 ++++++++++++++++------------------ 3 files changed, 43 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6536b145..839f5837b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1242,10 +1242,10 @@ dependencies = [ [[package]] name = "craft-idml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71#76d9d83769d2a53cf801b659e361c5d35d928e71" +source = "git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8#2dc9cd407b240fb405eb5acbff88d6f81cec5eb8" dependencies = [ - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", - "craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", + "craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", "thiserror 2.0.21", ] @@ -1647,7 +1647,7 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=40525913633942f84b06d4837a8d90534a55d63f#40525913633942f84b06d4837a8d90534a55d63f" +source = "git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8#2dc9cd407b240fb405eb5acbff88d6f81cec5eb8" dependencies = [ "quick-xml 0.41.0", "thiserror 2.0.21", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71#76d9d83769d2a53cf801b659e361c5d35d928e71" +source = "git+https://github.com/storytold/craft-libs?rev=40525913633942f84b06d4837a8d90534a55d63f#40525913633942f84b06d4837a8d90534a55d63f" dependencies = [ "quick-xml 0.41.0", "thiserror 2.0.21", @@ -1730,7 +1730,7 @@ dependencies = [ [[package]] name = "craft-zip" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71#76d9d83769d2a53cf801b659e361c5d35d928e71" +source = "git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8#2dc9cd407b240fb405eb5acbff88d6f81cec5eb8" dependencies = [ "flate2", "thiserror 2.0.21", @@ -2021,7 +2021,7 @@ dependencies = [ "craft-prepress", "craft-print", "craft-svg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=cc23ffd4d26f3074808e2187d332564817624f8f)", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f23b0f33f0d00b157476533a43cbbcfd901aa1f1)", "designcraft-color", "designcraft-compose", @@ -2103,9 +2103,9 @@ name = "designcraft-idml" version = "0.20.1" dependencies = [ "craft-file-formats", - "craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", + "craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", "craft-svg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=cc23ffd4d26f3074808e2187d332564817624f8f)", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", "designcraft-color", "designcraft-compose", "designcraft-doc", @@ -2222,7 +2222,7 @@ version = "0.20.1" dependencies = [ "craft-docx", "craft-file-formats", - "craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=76d9d83769d2a53cf801b659e361c5d35d928e71)", + "craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=2dc9cd407b240fb405eb5acbff88d6f81cec5eb8)", "craft-rtf", "craft-wordmodel", "craft-xlsx", diff --git a/Cargo.toml b/Cargo.toml index d9eae6fd8..d4f605861 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,10 +16,10 @@ craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "4052591363 craft-designcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "19692b6190465671e41967c75d0cd4c439d0c84c", version = "=0.1.0" } craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" } craft-epub = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" } -craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "76d9d83769d2a53cf801b659e361c5d35d928e71", version = "=0.1.0" } +craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "2dc9cd407b240fb405eb5acbff88d6f81cec5eb8", version = "=0.1.0" } craft-indd = { git = "https://github.com/storytold/craft-libs", rev = "47bf5650b0d503b97bfb5e841746c4957897d11f", version = "=0.1.0" } craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "cc23ffd4d26f3074808e2187d332564817624f8f", version = "=0.1.0", features = ["tree-render", "tree-text"] } -craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "76d9d83769d2a53cf801b659e361c5d35d928e71", version = "=0.1.0" } +craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "2dc9cd407b240fb405eb5acbff88d6f81cec5eb8", version = "=0.1.0" } craft-xml-dtd = { package = "craft-xml", git = "https://github.com/storytold/craft-libs", rev = "f23b0f33f0d00b157476533a43cbbcfd901aa1f1", version = "=0.1.0" } craft-rtf = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" } craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" } diff --git a/crates/idml/src/export/item.rs b/crates/idml/src/export/item.rs index 4fde416a4..464703d9c 100644 --- a/crates/idml/src/export/item.rs +++ b/crates/idml/src/export/item.rs @@ -1,4 +1,4 @@ -use super::common::{affine_s, bool_s, p, pct, uid, with_props}; +use super::common::{affine_s, bool_s, pct, uid, with_props}; use super::{ Affine, ColumnsKind, Content, El, Ex, HashSet, Item, Node, OBJECT_BUILTINS, PathData, Shape, TextFrameOptions, base64_encode, names, num, pt, }; @@ -347,40 +347,36 @@ fn text_wrap_pref(w: &designcraft_doc::TextWrap) -> El { } pub(super) fn text_frame_pref(o: &TextFrameOptions, rule_color: &str) -> El { - let mut inset = El::new("InsetSpacing").attr("type", "list"); - for v in o.inset { - inset.push(p("ListItem", "unit", num(v))); - } - let el = El::new("TextFramePreference") - .attr("TextColumnCount", o.columns.max(1)) - .attr("TextColumnGutter", num(o.gutter)) - .attr("UseFixedColumnWidth", bool_s(o.columns_kind == ColumnsKind::FixedWidth)) - .attr("UseFlexibleColumnWidth", bool_s(o.columns_kind == ColumnsKind::FlexibleWidth)) - .attr("VerticalBalanceColumns", bool_s(o.balance_columns)) - .attr("FirstBaselineOffset", names::first_baseline_out(o.first_baseline)) - .attr("MinimumFirstBaselineOffset", num(o.first_baseline_min)) - .attr("VerticalJustification", names::vj_out(o.vertical_justification)) - .attr("VerticalThreshold", num(o.vj_paragraph_spacing_limit)) - .attr("IgnoreWrap", bool_s(o.ignore_wrap)) - .attr("AutoSizingType", names::auto_size_out(o.auto_size)) - .attr("AutoSizingReferencePoint", names::REF_POINTS[(o.auto_size_ref as usize).min(8)]) - .attr("UseMinimumHeightForAutoSizing", bool_s(o.auto_size_use_min_height)) - .attr("MinimumHeightForAutoSizing", num(o.auto_size_min_height)) - .attr("UseMinimumWidthForAutoSizing", bool_s(o.auto_size_use_min_width)) - .attr("MinimumWidthForAutoSizing", num(o.auto_size_min_width)) - .attr("UseNoLineBreaksForAutoSizing", bool_s(o.auto_size_no_line_breaks)); - let el = if o.column_width > 0.0 { el.attr("TextColumnFixedWidth", num(o.column_width)) } else { el }; - // Written on every frame: on import a frame takes any value it lacks from its object style. - let el = el - .attr("ColumnRuleOverride", bool_s(o.column_rule)) - .attr("ColumnRuleStrokeWidth", num(o.column_rule_weight)) - .attr("ColumnRuleStrokeColor", rule_color) - .attr("ColumnRuleStrokeTint", num(f64::from(o.column_rule_tint) * 100.0)) - .attr("ColumnRuleOffset", num(o.column_rule_offset)) - .attr("ColumnRuleTopInset", num(o.column_rule_top_inset)) - .attr("ColumnRuleBottomInset", num(o.column_rule_bottom_inset)) - .attr("ColumnRuleInsetChainOverride", bool_s(o.column_rule_top_inset == o.column_rule_bottom_inset)); - with_props(el, vec![inset]) + crate::xml::from_craft( + craft_idml::model::TextFramePreferences { + column_count: Some(f64::from(o.columns.max(1))), + column_gutter: Some(o.gutter), + fixed_column_width: (o.column_width > 0.0).then_some(o.column_width), + fixed_width: o.columns_kind == ColumnsKind::FixedWidth, + flexible_width: o.columns_kind == ColumnsKind::FlexibleWidth, + balance_columns: o.balance_columns, + inset: Some(o.inset), + vertical_justification: Some(names::vj_out(o.vertical_justification).into()), + vertical_threshold: Some(o.vj_paragraph_spacing_limit), + first_baseline: Some(names::first_baseline_out(o.first_baseline).into()), + minimum_first_baseline: Some(o.first_baseline_min), + ignore_wrap: o.ignore_wrap, + auto_sizing_type: Some(names::auto_size_out(o.auto_size).into()), + auto_sizing_reference: Some(names::REF_POINTS[(o.auto_size_ref as usize).min(8)].into()), + use_minimum_height: o.auto_size_use_min_height, + minimum_height: Some(o.auto_size_min_height), + use_minimum_width: o.auto_size_use_min_width, + minimum_width: Some(o.auto_size_min_width), + no_line_breaks: o.auto_size_no_line_breaks, + column_rule_override: o.column_rule, + column_rule_width: Some(o.column_rule_weight), + column_rule_tint: Some(f64::from(o.column_rule_tint) * 100.0), + column_rule_offset: Some(o.column_rule_offset), + column_rule_top_inset: Some(o.column_rule_top_inset), + column_rule_bottom_inset: Some(o.column_rule_bottom_inset), + } + .to_el(rule_color), + ) } /// `` with the outline (graphic space is the image's inner space, whose