mirror of
https://github.com/storytold/wordcraft.git
synced 2026-11-07 19:23:35 +00:00
Conflicts kept both sides. Where the two branches met: - Para.mark: both added it. It stays CharProps (ODT needs it); HTML's `<p> </p>` converts its Fmt, and to_doc reads it in one place. - Arrowheads: the PR's line ends (top left to bottom right) with main's arrowhead styles. - inline_rect: the PR's depth below the baseline with main's rule room. - Spacing and Cell literals take main's new fields. - The zip entry guard (#3660) also covers the encrypted ODT paths, which parsed a package before it; regression test in tests_more/encryption.rs. - chunks_exact to as_chunks in odt/frames.rs and odt/path.rs (clippy). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>