961 upstream commits since 7bb6c900. Resolutions:
- Test-only conflicts: upstream tests from before the base that our side
cut stay cut; tests new upstream are kept (audio aac/config, layout,
encode_format; cms lutfile; media mux; print windows_native, ticket;
update self_update; xml hostile).
- Code our side moved, with upstream's change carried to the new place:
craft-media mux roll sample groups (mux/boxes.rs) and writer-start
offsets with overflow checks (mux/progressive.rs); craft-print's
shrink-to-fit scale guard (sheets/plan.rs); craft-update's nextest
archive detection (self_update/detect.rs); craft-vectorcraft-format's
Tail::write_to_with (container.rs); craft-i18n's pedantic fixes
(bidi.rs, negotiation.rs).
- craft-ui: the old crate's modules stay removed; gpu_test_lock guarded
their per-test wgpu renderers, which the snapshot kit does not have.
- New upstream tests in crates that build their integration tests into
the library's test executable are modules of tests/main.rs (audio
flac_decode and qoa_oracle, cms, docpath, pcraft-format,
vectorcraft-format).
- The 22 new crates are optional members of the craft facade.
craft-docx
DOCX (ECMA-376 / ISO/IEC 29500 WordprocessingML) read and written, on the craft-wordmodel
document model. Also Word XML Documents (Flat OPC, one .xml file holding the whole package)
and Word 2003 XML, password-protected packages and Restrict Editing password hashes.
It is WordCraft's DOCX crate, moved onto the shared crates: craft-opc for the package,
craft-xml for parsing, craft-offcrypto for encryption, craft-wordmodel for the model.
use craft_wordmodel::Document;
let doc = Document::from_text("Hello\nWorld");
let bytes = craft_docx::write(&doc).unwrap();
let back = craft_docx::read(&bytes).unwrap();
assert_eq!(back.plain_text(craft_wordmodel::StoryRef::Body), doc.plain_text(craft_wordmodel::StoryRef::Body));
Reading
read(bytes),read_with(bytes, &ReadOptions { password, chunks }),read_with_password.read_xml(bytes): a Word XML Document or a Word 2003 XML Document, told apart by its root.package_title(reader, max_part): the title indocProps/core.xml, inflating only that part.
The reader is lenient (unknown markup is skipped, bad numbers fall back to defaults) and bounded:
| Limit | Value |
|---|---|
| ZIP entries | 20,000 (checked before the archive is indexed) |
| One part | 256 MiB |
| All parts | 512 MiB, counting entries that fail their checksum |
| XML nesting | 256 open elements |
| XML elements | 8,000,000 in one part |
| Attributes | 1,024 on one element |
| Word XML file | 1 GiB |
Markup the model does not hold is kept in Document::passthrough and the kept markup, and
written back as it was read.
Writing
write(doc), write_as(doc, Flavor) for .docx, .docm, .dotx and .dotm; write_flat
and write_wordml2003 for the XML forms; encrypt for a password.
Equations (OMML) are read and written by craft_math::omml.
Not here yet
- DrawingML (
a:) shape fills, lines, custom geometry and colours are still read with this crate's own code; they move tocraft-drawingml.