aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-10-24 10:16:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream main a930276 into feat/ime: this branch's IME model replaces text.compose

Browse Source 
#84 landed on main squashed (0f4f382b0), so the merge was resolved against #84's
tip as the base: main's version of #84 stands and only this branch's IME changes
are applied on top.

Conflicts and how each was resolved:
- crates/engine/src/cmd/text.rs: removed main's text.compose command, compose_text
  and its compose_tests; text.insert keeps main's reset of the typing format after a
  successful edit, skipped while an IME preview is open; reselection bumps the
  revision.
- crates/engine/src/lib.rs: removed Session.composition and the hook that ended it
  in execute_unguarded; set_active/add_document end the composition and reset the
  Find scope; both test modules kept.
- crates/engine/src/tooling.rs: removed main's composition() and its
  end_composition (the opposite semantics); begin_interaction no longer ends a
  composition.
- crates/engine/src/cmd/edit.rs, file.rs, guard.rs, recovery.rs: main's code with
  bump_revision in place of revision arithmetic; Revert takes the fresh state's
  revision.
- crates/ui-egui/src/canvas.rs: removed main's IME block, composition highlight and
  remembered caret rect; this branch's ime_event/ime_output stay. Main's dead-key
  test is ported to these events (the accent stays as typed when the caret moves).
- crates/ui-egui/src/lib.rs, menus.rs: both sides' fields and checks.
- apps/designcraft/src/main.rs, apps/designcraft-web/src/web.rs: both sides.
- docs/control-protocol.md: ui.ime row plus main's ui.click/ui.drag params.

Also: the remaining `revision += 1` sites on main use bump_revision, and two tests
compare revisions with `>`; the IME candidate window follows the caret on type on a
path; IME status lines in ROADMAP.md, gaps, ui-, localization- and target-app-parity
docs and roadmap.md.
This commit is contained in:
aiongg
2026-10-15 06:23:59 +00:00
parent 7eed1dffe1 a930276fd7
commit 06892bbc7e
257 changed files with 44669 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+73 -47
View File
@@ -796,6 +796,15 @@ dependencies = [
"libm",
]
[[package]]
name = "craft-pdf"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=c3487320b2d1de657b860b3c8abb44e1f2b32bd8#c3487320b2d1de657b860b3c8abb44e1f2b32bd8"
dependencies = [
"krilla",
"thiserror 2.0.21",
]
[[package]]
name = "craft-print"
version = "0.1.0"
@@ -887,7 +896,7 @@ dependencies = [
[[package]]
name = "designcraft"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"arboard",
"designcraft-engine",
@@ -907,7 +916,7 @@ dependencies = [
[[package]]
name = "designcraft-cli"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-compose",
@@ -923,7 +932,7 @@ dependencies = [
[[package]]
name = "designcraft-color"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"kurbo",
"moxcms",
@@ -935,7 +944,7 @@ dependencies = [
[[package]]
name = "designcraft-compose"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-doc",
@@ -953,7 +962,7 @@ dependencies = [
[[package]]
name = "designcraft-doc"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-geom",
@@ -965,7 +974,7 @@ dependencies = [
[[package]]
name = "designcraft-engine"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"caseless",
"craft-print",
@@ -979,6 +988,7 @@ dependencies = [
"designcraft-idml",
"designcraft-images",
"designcraft-pdf",
"designcraft-pptx",
"designcraft-render",
"designcraft-textimport",
"designcraft-tools",
@@ -987,7 +997,7 @@ dependencies = [
"hayro-syntax",
"kurbo",
"log",
"quick-xml 0.38.4",
"quick-xml",
"regex",
"serde",
"serde_json",
@@ -1000,7 +1010,7 @@ dependencies = [
[[package]]
name = "designcraft-epub"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-doc",
@@ -1009,7 +1019,7 @@ dependencies = [
[[package]]
name = "designcraft-fonts"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"harfrust 0.13.3",
"kurbo",
@@ -1021,7 +1031,7 @@ dependencies = [
[[package]]
name = "designcraft-format"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-doc",
"serde",
@@ -1032,7 +1042,7 @@ dependencies = [
[[package]]
name = "designcraft-geom"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"flo_curves",
"kurbo",
@@ -1045,20 +1055,20 @@ dependencies = [
[[package]]
name = "designcraft-idml"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-compose",
"designcraft-doc",
"designcraft-geom",
"quick-xml 0.38.4",
"quick-xml",
"thiserror 2.0.21",
"zip",
]
[[package]]
name = "designcraft-images"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-fonts",
@@ -1069,7 +1079,7 @@ dependencies = [
[[package]]
name = "designcraft-mcp"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-engine",
"designcraft-geom",
@@ -1082,8 +1092,9 @@ dependencies = [
[[package]]
name = "designcraft-pdf"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"craft-pdf",
"designcraft-color",
"designcraft-compose",
"designcraft-doc",
@@ -1094,7 +1105,6 @@ dependencies = [
"hayro-interpret",
"hayro-syntax",
"image",
"krilla",
"krilla-svg",
"kurbo",
"log",
@@ -1102,9 +1112,26 @@ dependencies = [
"tiff",
]
[[package]]
name = "designcraft-pptx"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-compose",
"designcraft-doc",
"designcraft-fonts",
"designcraft-geom",
"designcraft-images",
"image",
"quick-xml",
"skrifa 0.47.0",
"thiserror 2.0.21",
"zip",
]
[[package]]
name = "designcraft-render"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-compose",
@@ -1122,16 +1149,16 @@ dependencies = [
[[package]]
name = "designcraft-textimport"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-doc",
"quick-xml 0.38.4",
"quick-xml",
"zip",
]
[[package]]
name = "designcraft-tools"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-color",
"designcraft-compose",
@@ -1143,7 +1170,7 @@ dependencies = [
[[package]]
name = "designcraft-ui-egui"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"craft-ui",
"designcraft-color",
@@ -1161,6 +1188,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
"tempfile",
"toml",
"unicode-bidi",
"unicode-bidi-mirroring",
@@ -1170,7 +1198,7 @@ dependencies = [
[[package]]
name = "designcraft-web"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"designcraft-engine",
"designcraft-format",
@@ -2008,13 +2036,13 @@ dependencies = [
[[package]]
name = "hayro"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4caa128ab87fd48ffb7490617cf93f77f606820dffbc9fd9ef6ab0ed077f56d"
source = "git+https://github.com/storytold/pdfcraft?rev=b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9#b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9"
dependencies = [
"bytemuck",
"hayro-interpret",
"image",
"kurbo",
"log",
"pic-scale",
"vello_cpu 0.0.8",
]
@@ -2038,8 +2066,7 @@ dependencies = [
[[package]]
name = "hayro-interpret"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2613d0406898995042d0794c4245b2f2fba1246490c8ac593769bba6551129d"
source = "git+https://github.com/storytold/pdfcraft?rev=b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9#b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9"
dependencies = [
"bitflags 2.13.2",
"hayro-cmap",
@@ -2049,7 +2076,7 @@ dependencies = [
"phf",
"rustc-hash 2.1.3",
"siphasher",
"skrifa 0.42.1",
"skrifa 0.47.0",
"smallvec",
"yoke",
]
@@ -2057,8 +2084,7 @@ dependencies = [
[[package]]
name = "hayro-jbig2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69374b3668dd45aeb3d3145cda68f2c7b4f223aaa2511e67d076f1c7d741388d"
source = "git+https://github.com/storytold/pdfcraft?rev=b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9#b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9"
dependencies = [
"fearless_simd",
"hayro-ccitt",
@@ -2082,8 +2108,7 @@ checksum = "885c5ef0654933139a9b9546fc2c69e18d37f38aa2520f079092b1be18f1fcaa"
[[package]]
name = "hayro-syntax"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0edeafd70aa2db743de8ede8637d07ec87db05efe69cde371d03f1b185fcef27"
source = "git+https://github.com/storytold/pdfcraft?rev=b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9#b5467d93a0ffaa5e5e6658bccdf8655a3ba689c9"
dependencies = [
"flate2",
"hayro-ccitt",
@@ -2092,6 +2117,7 @@ dependencies = [
"memchr",
"rustc-hash 2.1.3",
"smallvec",
"stringprep",
"zune-jpeg",
]
@@ -2441,8 +2467,7 @@ dependencies = [
[[package]]
name = "krilla"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27da593198b20eeba65caeb73c2bbeec3e53ab08fa549898312ce81c4fce5e33"
source = "git+https://github.com/storytold/craft-libs?rev=c3487320b2d1de657b860b3c8abb44e1f2b32bd8#c3487320b2d1de657b860b3c8abb44e1f2b32bd8"
dependencies = [
"base64",
"bumpalo",
@@ -3509,15 +3534,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
dependencies = [
"memchr",
]
[[package]]
name = "quick-xml"
version = "0.41.0"
@@ -4203,6 +4219,17 @@ dependencies = [
"float-cmp",
]
[[package]]
name = "stringprep"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
dependencies = [
"unicode-bidi",
"unicode-normalization",
"unicode-properties",
]
[[package]]
name = "subsetter"
version = "0.2.6"
@@ -4993,7 +5020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
dependencies = [
"proc-macro2",
"quick-xml 0.41.0",
"quick-xml",
"quote",
]
@@ -5521,8 +5548,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winit"
version = "0.30.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
source = "git+https://github.com/skylartaylor/winit.git?rev=3d51077fd1a966f84df9ef287839dc84fd5b4ca7#3d51077fd1a966f84df9ef287839dc84fd5b4ca7"
dependencies = [
"ahash",
"android-activity",
@@ -5690,7 +5716,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
[[package]]
name = "xtask"
version = "0.6.0"
version = "0.8.0"
dependencies = [
"serde_json",
]