6e012049e4
Design-MD panel — closes the last TS-vs-Rust parity gap: - New floating op-editor-ui design_md_panel + design_md_markdown renderer: collapsible theme/colour/typography/component/layout/ notes sections, colour swatches, inline markdown highlighting. - op-editor-core: parse_design_md parser + panel UI state. - Host: View-menu toggle, top-most paint + hit-test, drag, .md import/export; bumps the vendor/jian DesignMdSpec pointer. i18n coverage: - Git panel, merge/conflict/error dialogs and GitError messages routed through op-i18n; git locale tables split into <base>_git.rs under the 800-line cap. - Closed 10 app-wide hardcoded-string gaps (AI chat, Figma import, file menu, layer context menu, property-panel fill, update / file-picker / load-error dialogs, accesskit labels).
17 lines
622 B
TOML
17 lines
622 B
TOML
[package]
|
|
name = "op-opmerge"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
rust-version.workspace = true
|
|
license.workspace = true
|
|
description = "Node-level three-way merge for OpenPencil .op documents"
|
|
|
|
# Pure, platform-free: a structured 3-way merge over the `.op`
|
|
# document JSON, keyed by node `id`. Used by the in-app Git merge
|
|
# orchestrator so a conflicting `.op` merge resolves per PenNode
|
|
# instead of as opaque text. No git / IO dependency — it takes the
|
|
# three document texts and returns the merged tree + node conflicts.
|
|
[dependencies]
|
|
thiserror = { workspace = true }
|
|
serde_json = { workspace = true }
|