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

Write paragraph alignment through shared IDML model

Browse Source
This commit is contained in:
Dylan M. Taylor committed 2026-11-13 07:51:20 -05:00
1 parent d91fa12aa7
commit 9bd0c4f0e0
3 files changed
+74 -87
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=16de952845b5b959e462012fc4298d18cd9a91cf#16de952845b5b959e462012fc4298d18cd9a91cf"
source = "git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643#e46323abda807099981c0ea6eae7311a9c11b643"
dependencies = [
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"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=16de952845b5b959e462012fc4298d18cd9a91cf#16de952845b5b959e462012fc4298d18cd9a91cf"
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=e46323abda807099981c0ea6eae7311a9c11b643#e46323abda807099981c0ea6eae7311a9c11b643"
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=16de952845b5b959e462012fc4298d18cd9a91cf#16de952845b5b959e462012fc4298d18cd9a91cf"
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=e46323abda807099981c0ea6eae7311a9c11b643#e46323abda807099981c0ea6eae7311a9c11b643"
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=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"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=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"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=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"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=16de952845b5b959e462012fc4298d18cd9a91cf)",
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e46323abda807099981c0ea6eae7311a9c11b643)",
"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 = "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 = "16de952845b5b959e462012fc4298d18cd9a91cf", version = "=0.1.0" }
craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "e46323abda807099981c0ea6eae7311a9c11b643", 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 = "16de952845b5b959e462012fc4298d18cd9a91cf", version = "=0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "e46323abda807099981c0ea6eae7311a9c11b643", 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/export/text_attrs.rs
+46 -59
View File
@@ -303,70 +303,57 @@ impl<'a> Ex<'a> {
}
fn para_alignment_attrs(&self, el: &mut El, a: &ParaAttrs, parent: Option<&str>) {
if let Some(v) = a.align {
el.set("Justification", names::align_out(v));
}
if let Some(v) = a.direction {
el.set(
"ParagraphDirection",
if v == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
);
}
if let Some(v) = a.kashidas {
el.set("Kashidas", if v { "DefaultKashidas" } else { "KashidasOff" });
}
if let Some(v) = &a.arabic_justification {
el.set("ParagraphJustification", v);
}
if let Some(Some(v)) = a.paragraph_kashida_width {
el.set("ParagraphKashidaWidth", num(v));
}
n!(a, el, left_indent, "LeftIndent");
n!(a, el, right_indent, "RightIndent");
n!(a, el, first_line_indent, "FirstLineIndent");
n!(a, el, last_line_indent, "LastLineIndent");
n!(a, el, space_before, "SpaceBefore");
n!(a, el, space_after, "SpaceAfter");
match a.same_para_style_spacing {
Some(Some(v)) => el.set("SameParaStyleSpacing", num(v)),
// Explicit Ignore: must be written so it still overrides a based-on style's value.
Some(None) => el.set("SameParaStyleSpacing", "Nothing"),
None => {}
}
n!(a, el, drop_cap_lines, "DropCapLines");
n!(a, el, drop_cap_chars, "DropCapCharacters");
if a.drop_cap_align_left.is_some() || a.drop_cap_scale_descenders.is_some() {
let d = parent.map(|name| self.d.styles.resolve_para_style(name).0).unwrap_or_default();
let bits = u32::from(a.drop_cap_align_left.unwrap_or(d.drop_cap_align_left))
| u32::from(a.drop_cap_scale_descenders.unwrap_or(d.drop_cap_scale_descenders)) << 1;
el.set("DropcapDetail", bits);
}
if let Some(g) = a.grid_align {
// IDML has one attribute for on/off and the reference: a reference set without
// `grid_align` isn't written.
let reference = crate::cjk::grid_reference_out(a.grid_reference.unwrap_or_default());
match g {
designcraft_doc::GridAlign::None => el.set("GridAlignment", "None"),
designcraft_doc::GridAlign::AllLines => {
el.set("GridAlignment", reference);
el.set("GridAlignFirstLineOnly", "false");
}
designcraft_doc::GridAlign::FirstLineOnly => {
el.set("GridAlignment", reference);
el.set("GridAlignFirstLineOnly", "true");
}
let detail = if a.drop_cap_align_left.is_some() || a.drop_cap_scale_descenders.is_some() {
let defaults = parent.map(|name| self.d.styles.resolve_para_style(name).0).unwrap_or_default();
Some(
u32::from(a.drop_cap_align_left.unwrap_or(defaults.drop_cap_align_left))
| u32::from(a.drop_cap_scale_descenders.unwrap_or(defaults.drop_cap_scale_descenders)) << 1,
)
} else {
None
};
let (grid_alignment, grid_align_first_line_only) = match a.grid_align {
Some(designcraft_doc::GridAlign::None) => (Some("None".to_string()), None),
Some(designcraft_doc::GridAlign::AllLines) => {
(Some(crate::cjk::grid_reference_out(a.grid_reference.unwrap_or_default()).into()), Some(false))
}
}
if let Some(c) = a.composer {
el.set(
"Composer",
match c {
Some(designcraft_doc::GridAlign::FirstLineOnly) => {
(Some(crate::cjk::grid_reference_out(a.grid_reference.unwrap_or_default()).into()), Some(true))
}
None => (None, None),
};
let values = craft_idml::model::ParagraphAlignmentValues {
justification: a.align.map(|value| names::align_out(value).into()),
direction: a.direction.map(|value| {
if value == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" }.into()
}),
kashidas: a.kashidas.map(|value| if value { "DefaultKashidas" } else { "KashidasOff" }.into()),
paragraph_justification: a.arabic_justification.clone(),
paragraph_kashida_width: a.paragraph_kashida_width.flatten(),
left_indent: a.left_indent,
right_indent: a.right_indent,
first_line_indent: a.first_line_indent,
last_line_indent: a.last_line_indent,
space_before: a.space_before,
space_after: a.space_after,
same_para_style_spacing: a.same_para_style_spacing,
drop_cap_lines: a.drop_cap_lines.map(f64::from),
drop_cap_chars: a.drop_cap_chars.map(f64::from),
dropcap_detail: detail,
grid_alignment,
grid_align_first_line_only,
composer: a.composer.map(|value| {
match value {
designcraft_doc::Composer::Paragraph => "HL Composer",
designcraft_doc::Composer::SingleLine => "HL Single",
designcraft_doc::Composer::Japanese => "HL Composer J",
designcraft_doc::Composer::JapaneseSingleLine => "HL Single J",
},
);
}
.into()
}),
};
for (key, value) in values.to_attrs() {
el.set(&key, value);
}
}