mirror of
https://github.com/storytold/wordcraft.git
synced 2026-11-19 08:55:26 +00:00
* Dependencies: take craft-libs main at 3af2280ee3 Every craft-libs git dependency (the workspace's 25, ui-egui's 3, the app's craft-print, the web build's 2 and the krilla patch) moves to craft-libs main at 3af2280ee3 from the 8 revisions they were pinned at. Cargo.lock changes those sources, moves winprint and craft-winprint-gdi with craft-print, drops the second craft-tiff, and adds cap-primitives and its dependencies, which craft-font-store's Language pack recovery uses on native builds. - craft_print::Job has two new fields. WordCraft sets grey_pages to false, since it does not turn the spooled pages gray, and driver_settings to None. - DOCX text boxes, rectangles, rounded rectangles and ellipses are now written in mc:AlternateContent with a VML fallback that repeats the text box's text. Two tests that counted w:txbxContent elements, or the story text, now count the fallback copy as well. * Printing: the isolated print helper keeps the job's grey pages and driver settings The Windows print helper process rebuilt each job with grey_pages off and no driver settings, whatever the job carried. Its request now carries both: the driver settings travel as the printer's name and the DEVMODE in hex, and damaged settings are an error. The request file may now be up to 2 MiB larger, the size of the largest driver settings craft-print accepts, written as hex. Comments in Cargo.toml and apps/wordcraft/Cargo.toml now describe the shared craft-libs commit, and the shared-story text box test says where its two copies are written. * DOCX: open picture frame shapes and keep chart formatting from craft-libs At this craft-libs commit the DOCX reader returns a picture frame shape (`frame` preset) as its own shape kind, and charts carry series formatting and axis settings. WordCraft's model had neither: - A document with a picture frame shape failed to open with "unknown variant `frame`". The model bridge now reads it as a rectangle, as the earlier reader did. - The chart model drops nothing the shared chart model holds: series fill, line width, line and fill off, markers, smooth lines, data labels and number format, and the category and value axes. Before, saving a chart with any of these wrote the chart again without them. - A new scatter series is drawn as markers without a line, as before. Change Chart Type sets this when a chart becomes a scatter chart or stops being one, Edit Data keeps each replaced series' formatting, and Data Labels replaces each series' own label setting. * Charts: draw turned axis titles and keep stored scatter charts without lines At this craft-libs commit a chart's vertical axis title is a text item turned -90°. WordCraft's graphic text item now carries that angle, and the text is laid out along its box and drawn turned about the box's center. Scatter series saved in a .json document or a recovery snapshot before series formatting existed have no `noLine` value. They now read as markers without a line, as they were drawn when saved. * Charts: draw opened ODT scatter charts without lines The ODF reader at this craft-libs commit does not read a scatter chart's line setting, so a scatter chart saved as ODT and opened again was drawn with lines between its points. The ODF writer writes every scatter series as markers without a line, and the opened chart is now drawn that way. * Charts: set scatter series to markers only for opened ODF files alone Opened ODT, OTT and FODT files set their scatter series to markers without a line, since the ODF reader does not read a series' line setting. Other formats that go through the same import path keep their series as read. A series that arrives with its markers turned off gets them back, as Change Chart Type does, so it is still drawn. The test for an opened scatter chart now also covers flat ODT, checks the drawn items against the markers-only drawing, and checks that the chart's paragraph is still written as read. * Dependencies: take craft-libs main at 453b0da782 Every craft-libs dependency, and the craft-proof note in Cargo.toml, moves from 3af2280ee3 to 453b0da782. Cargo.lock adds craft-dds, which craft-image-codecs now uses; no crates.io version changes. - craft-xls builds its test fixtures only for tests and its test-support feature, and they return a Result. wordcraft-formats gets a test-support feature that turns it on; sheet::xls_fixture is behind it and returns Result, and wordcraft-engine's tests enable it. - craft_metafile::Picture has new report fields; the render tests' literals fill them with Default. - The docx tests follow the writer: the font table is kept as read, the flat OPC comparison allows a kept part without its XML declaration, and the bibliography store is related from the main part, once, after a second save too. * DOCX: gutter position Top is kept when a document is opened and saved craft-libs now reads w:gutterAtTop into its settings model instead of keeping it as unread XML, and WordCraft's settings had no field for it, so opening and saving a document dropped the setting. Settings gets gutter_at_top (off by default), which the document bridge carries both ways. Layout still puts the gutter on the left. * Charts: Change Chart Type gives a pie chart's value axis the new type's gridlines A pie or doughnut chart keeps a plain value axis (no gridlines, axis line on), and a new chart of any other type has gridlines and no axis line. Change Chart Type kept the old axis, so a pie chart changed to a column chart was drawn and saved without gridlines and with an axis line. Change Chart Type between a round chart and another type now sets the value axis to the new type's when it is still the old type's; an axis that was changed stays as it is. The progress log gets a line for the chart formatting, turned axis titles, picture frame shapes and gutter position this branch brings. The gutter_at_top doc comment states only what the field holds.
172 lines
10 KiB
TOML
172 lines
10 KiB
TOML
[workspace]
|
||
resolver = "3"
|
||
members = ["crates/*", "apps/*", "xtask"]
|
||
default-members = ["crates/*", "apps/wordcraft", "apps/wordcraft-cli", "xtask"]
|
||
|
||
[workspace.package]
|
||
version = "0.18.1"
|
||
edition = "2024"
|
||
license = "MIT OR Apache-2.0"
|
||
rust-version = "1.95"
|
||
repository = "https://github.com/storytold/wordcraft"
|
||
|
||
[workspace.dependencies]
|
||
# internal
|
||
wordcraft-geom = { path = "crates/geom" }
|
||
wordcraft-doc = { path = "crates/doc" }
|
||
wordcraft-fonts = { path = "crates/fonts" }
|
||
wordcraft-layout = { path = "crates/layout" }
|
||
wordcraft-docx = { path = "crates/docx" }
|
||
wordcraft-docbin = { path = "crates/docbin" }
|
||
wordcraft-formats = { path = "crates/formats" }
|
||
wordcraft-render = { path = "crates/render" }
|
||
wordcraft-pdf = { path = "crates/pdf" }
|
||
# Proofing is craft-libs' craft-proof (it was crates/proof); its Language data is craft-i18n's
|
||
# language-data/, embedded from CRAFT_I18N_DIR (craft-i18n.rev). The package keeps the
|
||
# `wordcraft-proof` name here so `wordcraft_proof::` paths are unchanged.
|
||
# craft-proof is storytold/craft-libs main at 453b0da782. That commit has #590 (ca-ES-valencia
|
||
# reads the ca-valencia pack), #589 (French elision suggestions first), #497 (flag-based
|
||
# compounding), #496 (review follow-ups, en-AU) and the merged #482–#490/#495 stack; the font
|
||
# store's `language-pack` kind is #486 (CP4.1).
|
||
wordcraft-proof = { package = "craft-proof", git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-font-store = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
wordcraft-engine = { path = "crates/engine" }
|
||
wordcraft-mcp = { path = "crates/mcp" }
|
||
wordcraft-zotero = { path = "crates/zotero" }
|
||
wordcraft-control-key = { path = "crates/control-key" }
|
||
wordcraft-ui-egui = { path = "crates/ui-egui" }
|
||
craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
|
||
# foundation
|
||
kurbo = { version = "0.13", features = ["serde"] }
|
||
thiserror = "2"
|
||
serde = { version = "1", features = ["derive", "rc"] }
|
||
serde_json = { version = "1", features = ["float_roundtrip"] }
|
||
log = "0.4"
|
||
# All date/time conversion goes through chrono (no hand-rolled calendar code beyond the 400-year range extension; AGENTS.md).
|
||
chrono = { version = "0.4.45", default-features = false, features = ["std"] }
|
||
proptest = "1"
|
||
rayon = "1"
|
||
unicode-bidi = "0.3"
|
||
unicode-segmentation = "1"
|
||
unicode-linebreak = "0.1"
|
||
unicode-script = "0.5"
|
||
regex = { version = "1", default-features = false, features = ["std", "unicode", "perf"] }
|
||
regex-automata = { version = "0.4", default-features = false, features = ["std", "syntax", "meta", "nfa-pikevm", "unicode"] }
|
||
|
||
# text / rendering / formats
|
||
skrifa = "0.47"
|
||
harfrust = "0.13"
|
||
# WOFF / WOFF2 web fonts added by the user (#582): pure Rust (MIT); its brotli and zlib decoders
|
||
# (brotli-decompressor, flate2) are already in the tree.
|
||
wuff = "0.2.9"
|
||
# WOFF2's brotli stream, decoded ahead of wuff so its glyph point counts are checked first (#3703).
|
||
# The same crate and version wuff already decodes it with (no new code in the build): pure Rust,
|
||
# `forbid(unsafe_code)` in its default build, no_std-capable (builds for wasm), BSD-3-Clause/MIT.
|
||
brotli-decompressor = "5"
|
||
vello_cpu = "0.2"
|
||
image = { version = "0.25", default-features = false }
|
||
craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0", default-features = false, features = ["write"] }
|
||
# craft-update: app-specific pretend versions apply to startup and manual checks.
|
||
craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["egui"] }
|
||
craft-wordmodel = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-docx = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-rtf = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0", features = ["doc"] }
|
||
craft-doc-binary = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-flow = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-odf = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0", features = ["text"] }
|
||
craft-markdown = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-html = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0", features = ["flow"] }
|
||
craft-latex = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-math = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0", features = ["detect"] }
|
||
craft-sheet = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-ods = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
craft-zip = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "=0.1.0" }
|
||
# zlib streams (compressed metafile pictures in `.doc` drawings); already in the lock as a dependency of other crates.
|
||
miniz_oxide = "0.9"
|
||
cfb = "0.15"
|
||
# Legacy text encodings (GBK/GB18030, Big5, Shift_JIS, EUC-KR, single-byte code pages) for plain
|
||
# text and CSV recipient lists (#778): encoding_rs ((Apache-2.0 OR MIT) AND BSD-3-Clause) and its
|
||
# detector chardetng (Apache-2.0 OR MIT), both pure Rust (Firefox's).
|
||
encoding_rs = "0.8"
|
||
chardetng = "1"
|
||
# Password-protected (agile-encrypted) Word documents: pure-Rust RustCrypto primitives.
|
||
aes = "0.9"
|
||
sha1 = "0.11"
|
||
sha2 = "0.11"
|
||
hmac = "0.13"
|
||
base64 = "0.23"
|
||
getrandom = "0.3"
|
||
zeroize = "1"
|
||
# Unix open flags (O_NONBLOCK for the engine's checked file reads, #3666); already in the lock as a
|
||
# dependency of other crates.
|
||
libc = "0.2"
|
||
|
||
# time
|
||
|
||
# ui
|
||
egui = "0.37"
|
||
egui_extras = { version = "0.37", default-features = false }
|
||
eframe = { version = "0.37", default-features = false }
|
||
egui_kittest = "0.37"
|
||
# A monotonic clock that works on native and in the browser (`performance.now()`).
|
||
web-time = "1.1"
|
||
rfd = "0.17"
|
||
arboard = { version = "3.7", default-features = false, features = ["wayland-data-control"] }
|
||
|
||
[workspace.lints.rust]
|
||
unsafe_code = "forbid"
|
||
# cargo llvm-cov sets `--cfg coverage`; timing tests skip themselves under its instrumentation.
|
||
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(coverage)"] }
|
||
|
||
[workspace.lints.clippy]
|
||
cognitive_complexity = "deny"
|
||
wildcard_imports = "deny"
|
||
dbg_macro = "warn"
|
||
todo = "warn"
|
||
too_many_arguments = "deny"
|
||
type_complexity = "allow"
|
||
|
||
# Line tables keep file and line in panics and backtraces; full debug info
|
||
# for every test binary and dependency would multiply the target dir size.
|
||
# The test profile inherits both settings.
|
||
[profile.dev.package."*"]
|
||
opt-level = 2
|
||
debug = false
|
||
|
||
[profile.dev]
|
||
opt-level = 1
|
||
debug = "line-tables-only"
|
||
|
||
[profile.release]
|
||
opt-level = 3
|
||
lto = "thin"
|
||
codegen-units = 16
|
||
debug = 0
|
||
|
||
# Required by craft-pdf: the backend rejects writers that failed during unwinding.
|
||
[patch.crates-io]
|
||
krilla = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
|
||
ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
|
||
winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
|