daniel543x/designcraft
1
0 Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-14 14:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use shared cell and table style decorations

Browse Source
This commit is contained in:
Dylan M. Taylor committed 2026-11-13 09:13:02 -05:00
1 parent 61f6a83de5
commit c74cf007d0
3 files changed
+42 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+26 -26
View File
@@ -1242,10 +1242,10 @@ dependencies = [
[[package]]
name = "craft-idml"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=1999b1f99#1999b1f99dc5f5432896bdf6806635a3de0bfb43"
source = "git+https://github.com/storytold/craft-libs?rev=d695aa6ff#d695aa6fff542586d49d50e406bceb5b6e5f3452"
dependencies = [
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1999b1f99)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=1999b1f99)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"thiserror 2.0.21",
]
@@ -1644,15 +1644,6 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "craft-xml"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=1999b1f99#1999b1f99dc5f5432896bdf6806635a3de0bfb43"
dependencies = [
"quick-xml 0.41.0",
"thiserror 2.0.21",
]
[[package]]
name = "craft-xml"
version = "0.1.0"
@@ -1689,6 +1680,15 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "craft-xml"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=d695aa6ff#d695aa6fff542586d49d50e406bceb5b6e5f3452"
dependencies = [
"quick-xml 0.41.0",
"thiserror 2.0.21",
]
[[package]]
name = "craft-xml"
version = "0.1.0"
@@ -1717,16 +1717,6 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "craft-zip"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=1999b1f99#1999b1f99dc5f5432896bdf6806635a3de0bfb43"
dependencies = [
"flate2",
"thiserror 2.0.21",
"zip 9.1.1",
]
[[package]]
name = "craft-zip"
version = "0.1.0"
@@ -1757,6 +1747,16 @@ dependencies = [
"zip 9.1.1",
]
[[package]]
name = "craft-zip"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=d695aa6ff#d695aa6fff542586d49d50e406bceb5b6e5f3452"
dependencies = [
"flate2",
"thiserror 2.0.21",
"zip 9.1.1",
]
[[package]]
name = "craft-zip"
version = "0.1.0"
@@ -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=1999b1f99)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"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=1999b1f99)",
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"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=1999b1f99)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"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=1999b1f99)",
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=d695aa6ff)",
"craft-rtf",
"craft-wordmodel",
"craft-xlsx",
Cargo.toml
+2 -2
View File
@@ -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 = "93d0998383aa150fa50a2ffbf49ef37786e37eca", 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 = "1999b1f99", version = "=0.1.0" }
craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "d695aa6ff", 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 = "1999b1f99", version = "=0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "d695aa6ff", 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" }
crates/idml/src/import/styles.rs
+14 -11
View File
@@ -123,7 +123,7 @@ impl<'r> Importer<'r> {
cs.vj = values.vertical_justification.as_deref().map(names::vj_in);
cs.first_baseline = values.first_baseline.as_deref().map(names::first_baseline_in);
cs.first_baseline_min = values.first_baseline_min;
cs.strokes = ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].map(|side| self.cell_stroke_attrs(e, side));
cs.strokes = values.edge_strokes.map(|stroke| self.map_stroke_values(stroke));
if let Some(stroke) = uniform_cell_stroke(&cs.strokes) {
cs.stroke = Some(stroke);
cs.strokes = Default::default();
@@ -152,15 +152,15 @@ impl<'r> Importer<'r> {
ts.footer_same_as_body = values.footer_same_as_body;
ts.left_column_same_as_body = values.left_column_same_as_body;
ts.right_column_same_as_body = values.right_column_same_as_body;
ts.borders = ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].map(|side| self.cell_stroke_attrs(e, side));
ts.borders = values.border_strokes.map(|stroke| self.map_stroke_values(stroke));
if let Some(border) = uniform_cell_stroke(&ts.borders) {
ts.border = Some(border);
ts.borders = Default::default();
}
ts.row_fills = self.alt_fill_attrs(e, "Row");
ts.column_fills = self.alt_fill_attrs(e, "Column");
ts.row_strokes = self.alt_stroke_attrs(e, "Row");
ts.column_strokes = self.alt_stroke_attrs(e, "Column");
ts.row_fills = self.map_alt_fill_values(values.row_fills);
ts.column_fills = self.map_alt_fill_values(values.column_fills);
ts.row_strokes = self.map_alt_stroke_values(values.row_strokes);
ts.column_strokes = self.map_alt_stroke_values(values.column_strokes);
ts.space_before = values.space_before;
ts.space_after = values.space_after;
match self.styles.table.iter_mut().find(|c| c.name == name) {
@@ -343,11 +343,6 @@ impl<'r> Importer<'r> {
.unwrap_or_else(|| names::style_name_in(names::TABLE_BUILTINS, &unescape_id(reference.trim_start_matches("TableStyle/"))))
}
pub(super) fn cell_stroke_attrs(&mut self, el: &El, prefix: &str) -> designcraft_doc::CellStrokeAttrs {
let values = craft_idml::model::Values::of(&crate::xml::to_craft(el)).stroke_values(prefix);
self.map_stroke_values(values)
}
pub(super) fn map_stroke_values(&mut self, values: craft_idml::model::StrokeValues) -> designcraft_doc::CellStrokeAttrs {
designcraft_doc::CellStrokeAttrs {
weight: values.weight,
@@ -361,6 +356,10 @@ impl<'r> Importer<'r> {
pub(super) fn alt_fill_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltFillsAttrs {
let values = craft_idml::model::Values::of(&crate::xml::to_craft(el)).alternating_fill_values(kind);
self.map_alt_fill_values(values)
}
fn map_alt_fill_values(&mut self, values: craft_idml::model::AlternatingFillValues) -> designcraft_doc::AltFillsAttrs {
designcraft_doc::AltFillsAttrs {
first: values.first_count.map(|v| v as u32),
first_color: values.first_color.map(|v| self.swatch_ref(&v)),
@@ -375,6 +374,10 @@ impl<'r> Importer<'r> {
pub(super) fn alt_stroke_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltStrokesAttrs {
let values = craft_idml::model::Values::of(&crate::xml::to_craft(el)).alternating_stroke_values(kind);
self.map_alt_stroke_values(values)
}
fn map_alt_stroke_values(&mut self, values: craft_idml::model::AlternatingStrokeValues) -> designcraft_doc::AltStrokesAttrs {
let first_stroke = self.map_stroke_values(values.first);
let next_stroke = self.map_stroke_values(values.next);
designcraft_doc::AltStrokesAttrs {