mirror of
https://github.com/storytold/wordcraft.git
synced 2026-11-10 12:20:12 -06:00
Claude
078945e10c
Word's Font › Emphasis mark (a mark over or under each character, used
to stress East Asian text) wasn't modelled. DOCX `w:em` and ODT
`style:text-emphasize` were dropped.
- Model: `CharProps::emphasis` (dot, comma, circle, dot below, or none
to turn off a style's).
- Layout: a mark is drawn over (or under) each character, and the line
is made taller to fit it.
- `format.emphasisMark {"mark": …}` sets it, and Format state reports
it. The catalog lists it under Home › Font.
- DOCX: `w:em` is read, and written in its place in `w:rPr` (after
`w:cs`, before `w:lang`).
- ODT: `style:text-emphasize` maps to it: an accent is the comma, a
disc the dot, a dot below the under-dot.
Also fixes two problems from the previous commit (ODT variables):
- Field updates blanked a SET field's stored result. The layout
already draws nothing for SET, so its result stays as it was, as
`ask_and_set_fields_draw_nothing` pins.
- A clippy lint (manual char comparison) failed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GBVQLyDnrG8Tn1yDQcUabC
49 lines
2.5 KiB
Rust
49 lines
2.5 KiB
Rust
//! Emphasis marks (`w:em`, ISO/IEC 29500-1 §17.3.2.12: Font › Emphasis mark) are read and
|
||
//! saved again, in their place in `w:rPr`. Fixtures are hand-written from the spec.
|
||
|
||
use std::io::{Read, Write};
|
||
|
||
use wordcraft_doc::props::EmphasisMark;
|
||
|
||
fn docx(body: &str) -> Vec<u8> {
|
||
let root = r#"<?xml version="1.0" encoding="UTF-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/></Relationships>"#;
|
||
let doc = format!(
|
||
r#"<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>{body}</w:body></w:document>"#
|
||
);
|
||
let mut zw = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
|
||
for (name, xml) in [("_rels/.rels", root.to_string()), ("word/document.xml", doc)] {
|
||
zw.start_file(name, zip::write::SimpleFileOptions::default()).unwrap();
|
||
zw.write_all(xml.as_bytes()).unwrap();
|
||
}
|
||
zw.finish().unwrap().into_inner()
|
||
}
|
||
|
||
fn marks(d: &wordcraft_doc::Document) -> Vec<Option<EmphasisMark>> {
|
||
d.body[0].as_para().unwrap().runs.iter().map(|r| r.props.emphasis).collect()
|
||
}
|
||
|
||
#[test]
|
||
fn emphasis_marks_are_read_and_saved() {
|
||
let run = |t: &str, em: &str| format!(r#"<w:r><w:rPr><w:cs/>{em}<w:lang w:val="ja-JP"/></w:rPr><w:t>{t}</w:t></w:r>"#);
|
||
let body = format!(
|
||
"<w:p>{}{}{}{}{}{}</w:p>",
|
||
run("a", r#"<w:em w:val="dot"/>"#),
|
||
run("b", r#"<w:em w:val="comma"/>"#),
|
||
run("c", r#"<w:em w:val="circle"/>"#),
|
||
run("d", r#"<w:em w:val="underDot"/>"#),
|
||
run("e", r#"<w:em w:val="none"/>"#),
|
||
run("f", r#"<w:em w:val="sparkle"/>"#),
|
||
);
|
||
let d = wordcraft_docx::read(&docx(&body)).unwrap();
|
||
// An unknown mark is none (and the run with it joins the one before, now alike).
|
||
let want = [EmphasisMark::Dot, EmphasisMark::Comma, EmphasisMark::Circle, EmphasisMark::UnderDot, EmphasisMark::None].map(Some);
|
||
assert_eq!(marks(&d), want);
|
||
let saved = wordcraft_docx::write(&d).unwrap();
|
||
let mut z = zip::ZipArchive::new(std::io::Cursor::new(&saved)).unwrap();
|
||
let mut xml = String::new();
|
||
z.by_name("word/document.xml").unwrap().read_to_string(&mut xml).unwrap();
|
||
// In its place: after w:cs, before w:lang.
|
||
assert!(xml.contains(r#"<w:cs/><w:em w:val="underDot"/><w:lang"#), "{xml}");
|
||
assert_eq!(marks(&wordcraft_docx::read(&saved).unwrap()), want);
|
||
}
|