Brandon ThomasandClaude Opus 5.5 48dfbcfd19 Merge origin/main into data-merge ...

Resolve conflicts keeping both sides: doc gains both `cjk` and
`datamerge` modules; file.open resolves data-merge sources and loads the
document's fonts; DocState keeps preview_stash/preview_record and fonts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

2026-10-07 22:28:15 -04:00

..

brand

Licensing: standard LICENSE files, NOTICE, ArtCraft brand terms

2026-10-04 10:04:24 -04:00

images

Sample: fit cover title, higher-res cover art; refreshed README screenshots and feature list

2026-10-01 12:13:03 -04:00

agents.md

Data merge: review fixes (bounded reads, no truncation, safe links, docs)

2026-10-07 21:54:38 -04:00

arabic-typography.md

TYPE1: Reapply Chinese and Arabic typesetting rules on main

2026-10-07 18:16:32 +08:00

cjk-typography.md

TYPE1: Reapply Chinese and Arabic typesetting rules on main

2026-10-07 18:16:32 +08:00

cjk.md

Text: locale-coded language names (de_DE_2006) get their language

2026-10-07 10:44:46 -04:00

contributors.md

About: contributor and model credits compiled in (grab bag + table, self-submitted names) (#108)

2026-10-07 21:16:42 -04:00

control-protocol.md

Merge origin/main into data-merge

2026-10-07 22:28:15 -04:00

mcp.md

About: contributor and model credits compiled in (grab bag + table, self-submitted names) (#108)

2026-10-07 21:16:42 -04:00

parity.md

E: CMYK transparency blend space on screen

2026-10-04 02:09:26 -04:00