mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-17 19:39:57 -06:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab65ee8eb8 | ||
|
|
9b9c956068 | ||
|
|
476448d7d9 | ||
|
|
26f9783d11 | ||
|
|
b7cb2c97dd | ||
|
|
fd10b86cc2 | ||
|
|
17cb3c83d9 |
@@ -1,29 +0,0 @@
|
||||
# This file is machine-generated by `gh actions-lock`.
|
||||
# Do not edit by hand; run `gh actions-lock` to update.
|
||||
# Docs: https://gh.io/actions-lockfile
|
||||
version: 'v0.0.3'
|
||||
workflows:
|
||||
'.github/workflows/ci.yml': []
|
||||
'.github/workflows/freebsd.yml': []
|
||||
'.github/workflows/house-rules.yml': []
|
||||
'.github/workflows/lockfile.yml':
|
||||
- 'actions/checkout@v7.0.1'
|
||||
- 'step-security/harden-runner@v2.22.4'
|
||||
'.github/workflows/nix.yml': []
|
||||
'.github/workflows/packaging-lint.yml':
|
||||
- 'actions/checkout@v7.0.1'
|
||||
- 'step-security/harden-runner@v2.22.4'
|
||||
'.github/workflows/release.yml': []
|
||||
'.github/workflows/sonarcloud.yml': []
|
||||
'.github/workflows/windows-arm64.yml': []
|
||||
dependencies:
|
||||
'actions/checkout@v7.0.1':
|
||||
ref: 'v7.0.1'
|
||||
commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
|
||||
owner_id: 44036562
|
||||
repo_id: 197814629
|
||||
'step-security/harden-runner@v2.22.4':
|
||||
ref: 'v2.22.4'
|
||||
commit: 'sha1-1d88384fd173af6ecb012dfd0264a306b711241a'
|
||||
owner_id: 88700172
|
||||
repo_id: 422287306
|
||||
@@ -1,34 +0,0 @@
|
||||
name: Lockfile
|
||||
|
||||
# Fails when .github/workflows/actions.lock is out of sync with the workflows, or when a locked pin
|
||||
# no longer verifies upstream, so a moved tag cannot slip a different commit into a run.
|
||||
# Docs: https://gh.io/actions-lockfile
|
||||
on:
|
||||
pull_request:
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
|
||||
jobs:
|
||||
lockfile:
|
||||
name: Lockfile is in sync
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- name: Harden runner
|
||||
uses: step-security/harden-runner@v2.22.4
|
||||
with:
|
||||
egress-policy: audit
|
||||
- uses: actions/checkout@v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Install gh-actions-lock
|
||||
run: gh extension install github/gh-actions-lock --pin v0.4.1
|
||||
- name: Verify the lockfile
|
||||
run: gh actions-lock --verify
|
||||
@@ -28,10 +28,10 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Harden runner
|
||||
uses: step-security/harden-runner@v2.22.4
|
||||
uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
|
||||
with:
|
||||
egress-policy: audit
|
||||
- uses: actions/checkout@v7.0.1
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Install the pinned packaging toolchain
|
||||
|
||||
@@ -18,7 +18,4 @@ jobs:
|
||||
sonarcloud:
|
||||
# Tracked at @main so org-wide CI improvements propagate without PR churn.
|
||||
uses: storytold/craft-common-actions/.github/workflows/sonarcloud.yml@main
|
||||
with:
|
||||
# Match the main CI gate so coverage exercises every glyph-sensitive UI case.
|
||||
fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
|
||||
secrets: inherit
|
||||
|
||||
@@ -121,7 +121,3 @@ People trust GridCraft with their numbers; a crash loses their work. **This outr
|
||||
- Some workflow files here still run their own jobs. Don't add to them. Moving a job into craft-common-actions is its own task, never part of another PR, and the job stays here until a shared workflow runs it.
|
||||
|
||||
New workspace crates include `workspace = true` under `[lints]` in `Cargo.toml`. Production crate roots declare the crate-level lint attributes before modules; crate-level `//!` documentation may precede them.
|
||||
|
||||
## Shared libraries
|
||||
|
||||
Before adding or changing file-format, codec, protocol, or reusable UI code, check `storytold/craft-libs` and its open PRs first; reuse or extend the shared library rather than duplicating it locally, keep app-specific policy and model mapping in the app, and preserve behavior, security/resource limits, attribution, and regression coverage during cutovers.
|
||||
|
||||
+1
-3
@@ -47,7 +47,5 @@ Generated-in-code art is original and has no file to list: the UI icon set (`cra
|
||||
| `docs/images/pivot.png` | GridCraft contributors | screenshot of GridCraft rendered offscreen (`crates/ui-egui/examples/snapshot.rs`) showing an original sample workbook | MIT OR Apache-2.0 | README screenshot; no third-party content |
|
||||
| `docs/images/format-chart.png` | GridCraft contributors | screenshot of GridCraft rendered offscreen (`crates/ui-egui/examples/snapshot.rs`) showing an original sample workbook | MIT OR Apache-2.0 | README screenshot; no third-party content |
|
||||
| `docs/images/page-break.png` | GridCraft contributors | screenshot of GridCraft rendered offscreen (`crates/ui-egui/examples/snapshot.rs`) showing an original sample workbook | MIT OR Apache-2.0 | README screenshot; no third-party content |
|
||||
| Core 14 AFM metric numbers in `crates/pdf/src/symbol.rs` (Symbol: character codes and advance widths) and `crates/pdf/src/metrics.rs` (Helvetica, Times and Courier advance widths); no font file | Adobe Systems Incorporated | Adobe's Core 14 AFM font metrics files (`Symbol.afm` 001.008 and the Helvetica, Times and Courier AFMs) | Adobe's Core 14 metrics notice: the files may be used, copied and distributed for any purpose and without charge, provided the notice is kept (quoted in `crates/pdf/src/metrics.rs`) | Numbers only, typed in from the public metrics. PDF export embeds none of these fonts: Symbol and the Times faces are base-14 fonts every PDF reader supplies, and non-Arabic text outside WinAnsiEncoding is set in a predefined, non-embedded Adobe-GB1 CID font |
|
||||
| Core 14 AFM metric numbers in `crates/pdf/src/symbol.rs` (Symbol: character codes and advance widths) and `crates/pdf/src/metrics.rs` (Helvetica, Times and Courier advance widths); no font file | Adobe Systems Incorporated | Adobe's Core 14 AFM font metrics files (`Symbol.afm` 001.008 and the Helvetica, Times and Courier AFMs) | Adobe's Core 14 metrics notice: the files may be used, copied and distributed for any purpose and without charge, provided the notice is kept (quoted in `crates/pdf/src/metrics.rs`) | Numbers only, typed in from the public metrics. PDF export embeds no font: Symbol and the Times faces are base-14 fonts every PDF reader supplies, and text outside WinAnsiEncoding is set in a predefined, non-embedded Adobe-GB1 CID font |
|
||||
| Unicode values of the Symbol encoding in `crates/pdf/src/symbol.rs` (the code-to-character map; numbers only, no file copied) | Unicode, Inc. | `symbol.txt`, "Adobe Symbol Encoding to Unicode", table version 1.0 (2011-07-12), at unicode.org/Public/MAPPINGS/VENDORS/ADOBE/ | Unicode, Inc.'s notice in the file: "Unicode, Inc. hereby grants the right to freely use the information supplied in this file in the creation of products supporting the Unicode Standard, and to make copies of this file in any form for internal or external distribution as long as this notice remains attached." The file is provided as-is, without warranties | Separate from Adobe's Core 14 notice (previous row), which covers the character codes and widths; the Unicode values come from this table |
|
||||
|
||||
Arabic PDF text uses Noto Sans Arabic from the optional [craft-fonts build input](https://github.com/storytold/craft-fonts), pinned by the release workflow. Author: The Noto Project Authors. Licence: SIL Open Font License 1.1. Native unbundled export uses an installed Noto Sans Arabic face. No new asset file is committed.
|
||||
|
||||
Generated
+18
-93
@@ -932,32 +932,11 @@ dependencies = [
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-drawingml"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=bb57d422d0bc842cbde430955825553ab7b976f4#bb57d422d0bc842cbde430955825553ab7b976f4"
|
||||
dependencies = [
|
||||
"craft-xml",
|
||||
"kurbo",
|
||||
"log",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-fonts-build"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=aa84415bae3b765fef6b7ef42404f66ad1cff9d9#aa84415bae3b765fef6b7ef42404f66ad1cff9d9"
|
||||
|
||||
[[package]]
|
||||
name = "craft-gridcraft-format"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=9a6d894200221fcfedc274870c30394d404f859d#9a6d894200221fcfedc274870c30394d404f859d"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-i18n"
|
||||
version = "0.1.0"
|
||||
@@ -1009,11 +988,6 @@ dependencies = [
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-pdf"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=ff142b3ad58aa7306676749428f4f2f9b277b5dd#ff142b3ad58aa7306676749428f4f2f9b277b5dd"
|
||||
|
||||
[[package]]
|
||||
name = "craft-print"
|
||||
version = "0.1.0"
|
||||
@@ -1033,17 +1007,6 @@ name = "craft-sheet"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=bb57d422d0bc842cbde430955825553ab7b976f4#bb57d422d0bc842cbde430955825553ab7b976f4"
|
||||
|
||||
[[package]]
|
||||
name = "craft-stream-codecs"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=f7e0d7fd5577e102b4634bcbe062e649eb68165f#f7e0d7fd5577e102b4634bcbe062e649eb68165f"
|
||||
dependencies = [
|
||||
"fax",
|
||||
"hayro-ccitt",
|
||||
"hayro-jbig2",
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-ui"
|
||||
version = "0.1.0"
|
||||
@@ -1143,18 +1106,6 @@ dependencies = [
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-xlsx"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=bb57d422d0bc842cbde430955825553ab7b976f4#bb57d422d0bc842cbde430955825553ab7b976f4"
|
||||
dependencies = [
|
||||
"craft-drawingml",
|
||||
"craft-opc",
|
||||
"craft-sheet",
|
||||
"craft-xml",
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-xml"
|
||||
version = "0.1.0"
|
||||
@@ -2175,7 +2126,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"arboard",
|
||||
"chrono",
|
||||
@@ -2203,7 +2154,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-calc"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-core",
|
||||
"gridcraft-formula",
|
||||
@@ -2215,7 +2166,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-chart"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-calc",
|
||||
"gridcraft-core",
|
||||
@@ -2226,7 +2177,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-cli"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-engine",
|
||||
"gridcraft-mcp",
|
||||
@@ -2239,7 +2190,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-core"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"js-sys",
|
||||
@@ -2250,10 +2201,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-engine"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"craft-csv",
|
||||
"craft-gridcraft-format",
|
||||
"gridcraft-calc",
|
||||
"gridcraft-chart",
|
||||
"gridcraft-core",
|
||||
@@ -2269,14 +2219,13 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 2.0.21",
|
||||
"unicode-segmentation",
|
||||
"web-time",
|
||||
"zip 3.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-formula"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-core",
|
||||
"serde",
|
||||
@@ -2285,7 +2234,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-functions"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-core",
|
||||
"regex",
|
||||
@@ -2293,7 +2242,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-math"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"ratex-font",
|
||||
"ratex-layout",
|
||||
@@ -2303,7 +2252,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-mcp"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-engine",
|
||||
"log",
|
||||
@@ -2312,7 +2261,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-model"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-core",
|
||||
"gridcraft-formula",
|
||||
@@ -2325,26 +2274,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-numfmt"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-pdf"
|
||||
version = "0.19.1"
|
||||
dependencies = [
|
||||
"craft-pdf",
|
||||
"craft-stream-codecs",
|
||||
"harfrust",
|
||||
"sha2 0.11.1",
|
||||
"skrifa",
|
||||
"unicode-bidi",
|
||||
]
|
||||
version = "0.20.0"
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-sandbox"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"landlock",
|
||||
"libc",
|
||||
@@ -2355,7 +2296,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-ui-egui"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"craft-ui",
|
||||
"craft-update",
|
||||
@@ -2382,7 +2323,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-web"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"craft-web-api",
|
||||
"craft-web-host",
|
||||
@@ -2401,15 +2342,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gridcraft-xlsx"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"craft-cfb",
|
||||
"craft-csv",
|
||||
"craft-offcrypto",
|
||||
"craft-opc",
|
||||
"craft-xls",
|
||||
"craft-xlsx",
|
||||
"craft-xml",
|
||||
"gridcraft-core",
|
||||
"gridcraft-formula",
|
||||
"gridcraft-functions",
|
||||
@@ -2502,20 +2441,6 @@ dependencies = [
|
||||
"foldhash 0.2.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hayro-ccitt"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a"
|
||||
|
||||
[[package]]
|
||||
name = "hayro-jbig2"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=f7e0d7fd5577e102b4634bcbe062e649eb68165f#f7e0d7fd5577e102b4634bcbe062e649eb68165f"
|
||||
dependencies = [
|
||||
"hayro-ccitt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
@@ -6911,7 +6836,7 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
dependencies = [
|
||||
"gridcraft-engine",
|
||||
"serde_json",
|
||||
|
||||
+1
-9
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
|
||||
default-members = ["crates/*", "apps/gridcraft", "apps/gridcraft-cli", "xtask"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.19.1"
|
||||
version = "0.20.0"
|
||||
edition = "2024"
|
||||
license = "MIT OR Apache-2.0"
|
||||
rust-version = "1.95"
|
||||
@@ -31,9 +31,6 @@ gridcraft-math = { path = "crates/math" }
|
||||
# craft-libs revision.
|
||||
# craft-update: app-specific pretend versions apply to startup and manual checks.
|
||||
craft-update = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "=0.1.0", features = ["egui"] }
|
||||
# PDF RunLength encoding; this revision also fixes the vendored JBIG2 dependency for Git consumers.
|
||||
craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "ff142b3ad58aa7306676749428f4f2f9b277b5dd", version = "0.1.0", default-features = false }
|
||||
craft-stream-codecs = { git = "https://github.com/storytold/craft-libs", rev = "f7e0d7fd5577e102b4634bcbe062e649eb68165f", version = "0.1.0" }
|
||||
# Compound files ([MS-CFB]) and password-encrypted OOXML packages ([MS-OFFCRYPTO]).
|
||||
craft-cfb = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
craft-offcrypto = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
@@ -42,12 +39,7 @@ craft-opc = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0
|
||||
# Delimited text (CSV, TSV) and SYLK; `crates/xlsx/src/csv.rs` and `crates/engine/src/io/sylk.rs`
|
||||
# turn them into workbooks.
|
||||
craft-csv = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
# The native JSON workbook (`.json`, `.scjson`): read, written, and kept newer macros written back.
|
||||
craft-gridcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "9a6d894200221fcfedc274870c30394d404f859d", version = "0.1.0" }
|
||||
# Excel 97-2003 (.xls, BIFF8) workbooks; `crates/xlsx/src/xls.rs` maps them onto the model.
|
||||
# SpreadsheetML string encoding/decoding; workbook model mapping stays in gridcraft-xlsx.
|
||||
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "bb57d422d0bc842cbde430955825553ab7b976f4", version = "0.1.0" }
|
||||
|
||||
# foundation
|
||||
|
||||
@@ -205,7 +205,7 @@ egui frontend is a separate crate, so the UI can be swapped without touching the
|
||||
|
||||
GridCraft is in **alpha**: the core workflow works end to end, but depth, fidelity and file
|
||||
compatibility are still rough. It covers 89% of standard ribbon commands in our catalog
|
||||
([`docs/parity-checklist.md`](docs/parity-checklist.md)) and 514 standard worksheet functions
|
||||
([`docs/parity-checklist.md`](docs/parity-checklist.md)) and 513 standard worksheet functions
|
||||
([`docs/function-parity.md`](docs/function-parity.md)); this is a parity inventory, not a count of working implementations. Weighted by what spreadsheet users rely on, we
|
||||
estimate it is about 50% ready for real work. Next up: XLSX fidelity on real-world files, very large
|
||||
workbooks and multi-threaded recalc, chart depth, text in every script, and `.xls` import. Stage,
|
||||
|
||||
+4
-9
@@ -2,7 +2,6 @@
|
||||
|
||||
**Stage: alpha** · next: beta, ~25 points of "ready for real work" and ~160–240 h away
|
||||
|
||||
> **Last reviewed:** 2026-11-15 · **Last updated:** 2026-11-15 · **Change:** minor (performance: formula entry and XLSX save win back time lost since 23829d8c (#2654), 465 → 420 ms and 540 → 488 ms on the 100k-row benchmark; Sandbox refuses fcntl's asynchronous notification and the socket ioctls that notify another process on Linux (#3846); CI provisions pinned fonts for coverage tests; the oversized pivot-cache warning's test names the part limit; readiness estimates unchanged) · **Target:** Microsoft Excel (Microsoft 365)
|
||||
> **Last reviewed:** 2026-11-01 · **Last updated:** 2026-11-05 · **Change:** minor (CJK fallback text shares the Latin baseline; earlier: form controls: buttons, sliders and spin buttons; earlier: RefEdit reference boxes in dialogs: Goal Seek, Solver and Data Analysis take ranges by selection on the grid; earlier: Python mode in the formula bar; earlier: Python cells stored and kept in files; earlier: equations: Insert › Equation, editor, gridcraft-math; earlier: What-if and analysis: Solver Sensitivity report for Simplex LP and GRG Nonlinear; earlier: floating objects: one selection, eight resize handles, keyboard delete; earlier: Chart data tables: live source values beneath column, bar, line, area and compatible combo charts; legend keys and borders; XLSX round-trip and print/PDF; earlier: Formulas › Function Library as labelled buttons with category menus; Recently Used and Insert Function categories; XLSX workbook-view selection, bounded tab ratios and sheet-edit regressions; readiness estimates unchanged; earlier: CSV and text open detects each column's date order, so day-first dates are not silently swapped) · **Target:** Microsoft Excel (Microsoft 365)
|
||||
|
||||
GridCraft aims at full Microsoft Excel parity, and at being better in places: faster, open (XLSX
|
||||
@@ -23,7 +22,7 @@ This page is the summary. The detail is in:
|
||||
| Number | Value | Kind |
|
||||
|---|---|---|
|
||||
| 2026-10-14 | Editing a cell with text that would read back as a number, boolean, date or formula (entered with a leading apostrophe) shows the apostrophe in the editor and formula bar, so Enter unchanged keeps it text (#1362) |
|
||||
| **Feature breadth** (weighted) | **~75%** | estimated, anchored on two measurements: ribbon catalog 281 / 296 (94.9%), worksheet functions 514 / 523 (98.3%; 505 working, 96.6%) |
|
||||
| **Feature breadth** (weighted) | **~75%** | estimated, anchored on two measurements: ribbon catalog 281 / 296 (94.9%), worksheet functions 513 / 523 (98.1%; 504 working, 96.4%) |
|
||||
| **Ready for real work** | **~50%** | estimated from written weights (51.6); [target-app-parity.md](docs/target-app-parity.md) |
|
||||
| **Mainstream practitioner** | **~50%** | estimated: typical analyst/finance user, weekly features, × 0.90 interaction × 0.92 stability × 0.88 file exchange; [method](docs/target-app-parity.md#mainstream-practitioner) |
|
||||
| **Essentials user** | **~63%** | estimated: core features only, × 0.92 launch/stability × 0.95 clarity × 0.90 opening sent files; [method](docs/target-app-parity.md#essentials-user) |
|
||||
@@ -75,7 +74,7 @@ collaboration, mobile, AI).
|
||||
| Area | Breadth | Ready | Hours | Doc |
|
||||
|---|---|---|---|---|
|
||||
| Formula language and calculation | ~92% | ~72% | 20–30 | [target-app-parity.md](docs/target-app-parity.md#feature-areas) |
|
||||
| Worksheet functions | 96.6% measured | ~82% | 15–25 | [function-parity.md](docs/function-parity.md) |
|
||||
| Worksheet functions | 96.6% measured | ~82% | 16–26 | [function-parity.md](docs/function-parity.md) |
|
||||
| Editing, navigation, clipboard, fill | ~90% | ~70% | 15–25 | [ui-parity.md](docs/ui-parity.md) |
|
||||
| Cell formatting, styles, conditional formatting | ~95% | ~80% | 8–14 | [target-app-parity.md](docs/target-app-parity.md#feature-areas) |
|
||||
| Sort, filter, tables, validation, outline | ~82% | ~70% | 10–16 | [target-app-parity.md](docs/target-app-parity.md#feature-areas) |
|
||||
@@ -150,8 +149,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-31 | Recently Used lists the functions most recently entered in a formula from any source (ribbon, control channel, MCP, scripts), kept with the preferences and returned by `formulas.recentlyUsed`; the Insert Function dialog takes Excel's title and a working category list (Most Recently Used, All, each category) |
|
||||
| 2026-10-31 | Formulas › Function Library as a big Insert Function button, the AutoSum split button and three columns of labelled small buttons, each category book in its own colour; category menus end with Insert Function… on that category; More Functions cascades into the remaining categories; Home › Editing shares the AutoSum menu; the MR key tip opens Recently Used |
|
||||
| 2026-10-31 | System and embedded CJK fallback text shares the Latin baseline in cells, editors and window titles (#1265, #2621). Symbol and emoji alignment, manual row heights and clipping are unchanged |
|
||||
| 2026-10-26 | PDF preserves Context/LTR/RTL reading direction through wrapping and drawing; RTL sheet cells, borders, headings, objects and sparklines mirror consistently |
|
||||
| 2026-10-26 | Arabic PDF export shapes licensed glyph outlines and preserves searchable logical text; characters the font lacks, or a missing Arabic font, fall back to the standard fonts instead of failing the export |
|
||||
| 2026-10-26 | Arabic bidi display/editing preserve logical source text; per-cell reading direction is editable and survives undo, XLSX and conditional-format priority |
|
||||
| 2026-10-26 | Arabic text shows in cells and the interface through a system, fontconfig or craft-fonts Arabic face; workbook fonts keep their script fallbacks |
|
||||
| 2026-10-25 | AutoSum over a selection does what Excel does: a selected row gets one total to its right (in its last cell if that is empty), not a one-cell total under each cell; a block whose last column is empty gets each row's total there, one whose last row is empty each column's, and with both the corner gets the total of the block; otherwise totals go under each column as before |
|
||||
@@ -183,6 +180,7 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-15 | File › Options › Formulas: Maximum Iterations and Maximum Change fields for iterative calculation, disabled while it is off, with Excel's limits (1 to 32767, 0 or more) |
|
||||
| 2026-10-15 | Function help follows the interface language: argument hints, autocomplete, Insert Function (search and readable categories) and the Formulas-tab menus read per-language tables of descriptions and argument names; Spanish keeps its 10 functions in the new format |
|
||||
| 2026-10-15 | Row auto-fit counts a cell's line breaks only when the cell wraps, as Excel does: a file whose unwrapped cells hold multi-line text no longer opens with tall rows (typing a break still turns wrap on and grows the row) |
|
||||
| 2026-10-14 | XLSX import warns when a pivot cache is missing, malformed or too large, naming the cache and saying its PivotTable was kept as plain cells, instead of dropping the PivotTable silently (#1039) |
|
||||
| 2026-10-14 | Set precision as displayed is applied: with the option on, formula results, spills and numbers typed or reformatted are stored as their number format shows them and formulas calculate from those values; `formulas.calculationOptions` gains `precisionAsDisplayed` (turning it on rounds existing constants; locked constants on a protected sheet keep their value; numbers written to a new sheet are rounded too) (#1343) |
|
||||
| 2026-10-14 | Lookups (MATCH, XMATCH, VLOOKUP, HLOOKUP, XLOOKUP, LOOKUP) compare numbers exactly like Excel, so a computed key such as `=0.1+0.2` no longer finds 0.3; `=` and COUNTIF/SUMIF keep their 15-digit comparison |
|
||||
| 2026-10-14 | Functions: EOMONTH, EDATE, WORKDAY, NETWORKDAYS, YEARFRAC, WEEKNUM, the bond and coupon functions, DISC, BIN2DEC, IM* and the other Analysis ToolPak functions give `#VALUE!` for a reference to more than one cell in a value argument, as Excel 365 does, instead of spilling; array constants and computed arrays still lift |
|
||||
@@ -203,7 +201,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-13 | Conditional formatting: a rule gathers range statistics only when it reads them (top/bottom, above average, duplicates, scales, bars, icons) and borrows them instead of copying them per cell, so the per-frame lookup of an expression or cell-value rule no longer visits its whole range (#1098, part 1) |
|
||||
| 2026-10-13 | Grid: resizing several selected columns or rows previews on the dragged one and applies the size to all on release; Esc cancels (#1082) |
|
||||
| 2026-10-12 | Next/previous sheet navigation stops at the first/last visible worksheet instead of activating a hidden boundary sheet; the current selection is retained |
|
||||
| 2026-10-12 | GETPIVOTDATA reads PivotTable values by field and items (#284) |
|
||||
| 2026-10-12 | PDF writer: objects are written straight to the output, identical pictures are stored once, style operators are emitted only when they change, `q` nesting is limited to 28 and polyline joins no longer leak into later strokes (#816) |
|
||||
| 2026-10-12 | Insert › Text › WordArt (`insert.wordArt`, `wordArt.set`): floating decorative text with 10 original styles, outline and shadow, in-place editing, XLSX and print (#784) |
|
||||
| 2026-10-12 | Number formatting: one table of built-in formats (xlsx); numbers, dates and General render with one scratch buffer instead of per-token strings; output unchanged, checked against digests recorded from the old code (#817) |
|
||||
@@ -289,8 +286,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-31 | minor | Progress log: Recently Used and Insert Function categories |
|
||||
| 2026-10-31 | minor | Progress log: Function Library |
|
||||
| 2026-10-31 | minor | Progress log: shared CJK/Latin baselines in cells, editors and window titles |
|
||||
| 2026-10-26 | minor | Progress log: PDF reading direction and RTL sheets |
|
||||
| 2026-10-26 | minor | Progress log: Arabic PDF text |
|
||||
| 2026-10-26 | minor | Progress log: Arabic bidi display and editing |
|
||||
| 2026-10-26 | minor | Progress log: Arabic font fallback |
|
||||
| 2026-10-25 | minor | Progress log: AutoSum over a selected row, and a selection's empty last row and column |
|
||||
@@ -311,6 +306,7 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-16 | minor | Progress log: floating pictures' textures bounded and kept per workbook |
|
||||
| 2026-10-16 | trivial | Progress log: web preferences kept between visits (#1562) |
|
||||
| 2026-10-16 | minor | Progress log: interface fonts held once instead of twice |
|
||||
| 2026-10-14 | trivial | Progress log: pivot cache import warnings (#1039) |
|
||||
| 2026-10-14 | minor | Progress log: Set precision as displayed applied in calculation (#1343) |
|
||||
| 2026-10-14 | minor | Progress log: `.xls` import reads cell formatting |
|
||||
| 2026-10-14 | minor | Progress log: lookups compare numbers exactly |
|
||||
@@ -323,7 +319,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in
|
||||
| 2026-10-13 | trivial | Progress log: shared pictures written once on XLSX export (#985) |
|
||||
| 2026-10-13 | minor | Progress log: conditional-format lookups no longer scan the range for rules without statistics (#1098) |
|
||||
| 2026-10-12 | minor | Progress log: hidden-sheet navigation at workbook boundaries |
|
||||
| 2026-10-12 | minor | Worksheet functions 514 / 523 (GETPIVOTDATA); progress log row |
|
||||
| 2026-10-13 | trivial | Progress log: charts cached between frames (#1139) |
|
||||
| 2026-10-12 | minor | Progress log: PDF writer cleanup (#816) |
|
||||
| 2026-10-12 | minor | Catalog 276 → 277 / 292: Insert › WordArt (#784) |
|
||||
|
||||
@@ -368,8 +368,6 @@ pub fn check_bytes(path: &str, bytes: &[u8], opts: &Options) -> FileReport {
|
||||
}
|
||||
|
||||
fn check_inner(path: &str, bytes: &[u8], opts: &Options) -> FileReport {
|
||||
// GETPIVOTDATA needs the engine's pivot indexer; without it every such cell reads #REF!.
|
||||
let _ = gridcraft_engine::model::PIVOT_INDEXER.set(gridcraft_engine::pivot::index_cells);
|
||||
let mut report = FileReport { path: path.to_string(), ..Default::default() };
|
||||
let (cached, warnings) = match gridcraft_engine::io::open_bytes(path, bytes) {
|
||||
Ok(x) => x,
|
||||
|
||||
@@ -78,8 +78,6 @@ fn the_self_test_finds_every_denial() {
|
||||
] {
|
||||
assert!(out.contains(line), "missing `{line}` in:\n{out}");
|
||||
}
|
||||
#[cfg(target_os = "linux")]
|
||||
assert!(out.contains("denied: switch a descriptor's notifications on"), "missing the notification switch in:\n{out}");
|
||||
std::fs::remove_dir_all(home).unwrap();
|
||||
}
|
||||
|
||||
@@ -183,9 +181,7 @@ fn system_python() -> Option<(String, String)> {
|
||||
/// Confined, a program can't signal another process (this test, signal 0 delivering nothing), but can
|
||||
/// still signal itself and its own threads. On Linux, where the filter names them, it also can't
|
||||
/// change another process's limits or priority, or type into a terminal: no call here reaches a real
|
||||
/// terminal, since its standard input isn't one. Linux also refuses the `fcntl` commands that would
|
||||
/// have the kernel signal a process for it: naming the owner, choosing the signal, or switching the
|
||||
/// notification on.
|
||||
/// terminal, since its standard input isn't one.
|
||||
#[test]
|
||||
fn a_confined_program_leaves_other_processes_alone() {
|
||||
if !confines() {
|
||||
@@ -230,13 +226,6 @@ if sys.platform == "linux":
|
||||
assert refused(os.setpriority, os.PRIO_USER, 0, 0), "every process's priority"
|
||||
assert refused(os.sched_setaffinity, other, {0}), "another process's processors"
|
||||
assert refused(os.pidfd_open, other), "a handle on another process"
|
||||
read, write = os.pipe()
|
||||
assert refused(fcntl.fcntl, write, fcntl.F_SETOWN, other), "giving a descriptor's notifications to another process"
|
||||
# 15 is F_SETOWN_EX and 10 is F_SETSIG, which Python's fcntl doesn't name; the filter refuses
|
||||
# them whatever owner or signal they name, so the argument doesn't matter.
|
||||
assert refused(fcntl.fcntl, write, 15), "naming a descriptor's owner the extended way"
|
||||
assert refused(fcntl.fcntl, write, 10), "choosing a descriptor's notification signal"
|
||||
assert refused(fcntl.fcntl, write, fcntl.F_SETFL, fcntl.fcntl(write, fcntl.F_GETFL) | os.O_ASYNC), "switching a descriptor's notifications on"
|
||||
resource.prlimit(0, resource.RLIMIT_NOFILE)
|
||||
resource.prlimit(os.getpid(), resource.RLIMIT_NOFILE)
|
||||
os.setpriority(os.PRIO_PROCESS, 0, os.getpriority(os.PRIO_PROCESS, 0))
|
||||
@@ -251,101 +240,6 @@ print("left alone")
|
||||
assert!(String::from_utf8_lossy(&o.stdout).contains("left alone"), "{}", text(&o));
|
||||
}
|
||||
|
||||
/// A socket the parent made, which the program inherited as a standard stream, can't be pointed at
|
||||
/// another process through the ioctls that do what `fcntl`'s notification commands do: `FIOSETOWN`
|
||||
/// (0x8901) and `FIOASYNC` (0x5452), which Python's `fcntl` passes straight through. Linux only:
|
||||
/// macOS's profile has no rule for them, and its standard streams here are pipes.
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn a_confined_program_cant_point_an_inherited_socket_at_another_process() {
|
||||
if !confines() {
|
||||
return;
|
||||
}
|
||||
let Some((python, prefix)) = system_python() else {
|
||||
return;
|
||||
};
|
||||
let code = r#"
|
||||
import fcntl, sys
|
||||
other = int(sys.argv[1])
|
||||
def refused(call, *args):
|
||||
try:
|
||||
call(*args)
|
||||
except PermissionError:
|
||||
return True
|
||||
except OSError as e:
|
||||
print("other error", e)
|
||||
return False
|
||||
assert refused(fcntl.ioctl, 0, 0x8901, other), "giving a socket's notifications to another process"
|
||||
assert refused(fcntl.ioctl, 0, 0x5452, 1), "switching a socket's notifications on"
|
||||
print("socket quiet")
|
||||
"#;
|
||||
let (mine, _) = std::os::unix::net::UnixStream::pair().unwrap();
|
||||
let socket: std::os::fd::OwnedFd = mine.into();
|
||||
let me = std::process::id().to_string();
|
||||
let o = Command::new(env!("CARGO_BIN_EXE_gridcraft-cli"))
|
||||
.args(["sandbox-check", "--read", &prefix, "--", &python, "-I", "-c", code, &me])
|
||||
.stdin(std::process::Stdio::from(socket))
|
||||
.output()
|
||||
.unwrap();
|
||||
let out = text(&o);
|
||||
assert!(o.status.success(), "{out}");
|
||||
assert!(String::from_utf8_lossy(&o.stdout).contains("socket quiet"), "{out}");
|
||||
}
|
||||
|
||||
/// The same inherited socket, by both ioctls that name the process to notify, `FIOSETOWN` (0x8901)
|
||||
/// and `SIOCSPGRP` (0x8902), with the argument a real pointer. Named by value the kernel reads the
|
||||
/// number as an address and fails with `EFAULT` whether or not the filter refuses it, so that form
|
||||
/// shows only that a rule matched a request number; by pointer each call succeeds unconfined and is
|
||||
/// `EPERM` confined, which is the transition the page claims. Kept apart from the test above so a
|
||||
/// rule dropped for one request number fails for that request, not behind another. Linux only, as
|
||||
/// those rules are: macOS's profile has none, and its standard streams here are pipes.
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn a_confined_program_cant_point_an_inherited_socket_at_another_process_by_pointer() {
|
||||
if !confines() {
|
||||
return;
|
||||
}
|
||||
let Some((python, prefix)) = system_python() else {
|
||||
return;
|
||||
};
|
||||
let code = r#"
|
||||
import fcntl, socket, struct, sys
|
||||
other = int(sys.argv[1])
|
||||
def refused(call, *args):
|
||||
try:
|
||||
call(*args)
|
||||
except PermissionError:
|
||||
return True
|
||||
except OSError as e:
|
||||
print("other error", e)
|
||||
return False
|
||||
# Read first, so a standard stream that is not a socket can't pass for one: a pipe has no socket name.
|
||||
# Detached, not dropped: a socket object closes the descriptor it wrapped when it is collected, and then
|
||||
# the refusals below would be read off an invalid descriptor.
|
||||
wrapped = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, fileno=0)
|
||||
name = wrapped.getsockname()
|
||||
wrapped.detach()
|
||||
assert name == ""
|
||||
# The process group is a pointer, as a C caller passes it; naming it by value has the kernel read the
|
||||
# number as an address and fail with EFAULT, which would leave the refusal unexplained by the filter.
|
||||
group = bytearray(struct.pack("i", other))
|
||||
assert refused(fcntl.ioctl, 0, 0x8901, group), "giving a socket's notifications to another process"
|
||||
assert refused(fcntl.ioctl, 0, 0x8902, group), "giving a socket's notifications to another process's group"
|
||||
print("socket owner quiet")
|
||||
"#;
|
||||
let (mine, _) = std::os::unix::net::UnixStream::pair().unwrap();
|
||||
let socket: std::os::fd::OwnedFd = mine.into();
|
||||
let me = std::process::id().to_string();
|
||||
let o = Command::new(env!("CARGO_BIN_EXE_gridcraft-cli"))
|
||||
.args(["sandbox-check", "--read", &prefix, "--", &python, "-I", "-c", code, &me])
|
||||
.stdin(std::process::Stdio::from(socket))
|
||||
.output()
|
||||
.unwrap();
|
||||
let out = text(&o);
|
||||
assert!(o.status.success(), "{out}");
|
||||
assert!(String::from_utf8_lossy(&o.stdout).contains("socket owner quiet"), "{out}");
|
||||
}
|
||||
|
||||
/// Confined, a program changes no file, whether the policy lets it read that file or not, by path or
|
||||
/// by a descriptor: not its contents, permissions, owner, extended attributes, times or flags.
|
||||
/// Skipped when there is no `python3`.
|
||||
|
||||
@@ -72,7 +72,6 @@ impl<'h> Evaluator<'h> {
|
||||
"XLOOKUP" => self.xlookup(args),
|
||||
"CELL" => self.cell_info(args),
|
||||
"TRIMRANGE" => self.trimrange(args),
|
||||
"GETPIVOTDATA" => self.getpivotdata(args),
|
||||
"SUBTOTAL" | "AGGREGATE" => self.subtotal(name, args),
|
||||
"TEXT" => {
|
||||
if args.len() != 2 {
|
||||
|
||||
@@ -136,25 +136,6 @@ impl Precedents<'_> {
|
||||
(_, Some(Expr::Number(_) | Expr::Text(_) | Expr::Bool(_) | Expr::Error(_) | Expr::Array(_) | Expr::Missing)) => {}
|
||||
_ => self.dynamic = true,
|
||||
},
|
||||
// GETPIVOTDATA reads the report cells, so it depends on the whole report its reference
|
||||
// points into (pivot commands recalculate everything). Any other reference is dynamic.
|
||||
Expr::Call(n, args) if n == "GETPIVOTDATA" => match args.get(1) {
|
||||
Some(Expr::Ref(r)) => {
|
||||
let si = match &r.sheet {
|
||||
SheetSel::Current => Some(self.sheet),
|
||||
SheetSel::Named(name) => self.wb.sheet_index(name),
|
||||
SheetSel::Span(..) => None,
|
||||
};
|
||||
let report = si
|
||||
.and_then(|i| self.wb.sheet(i))
|
||||
.and_then(|sh| sh.pivots.iter().find_map(|p| p.last_range.filter(|lr| lr.intersects(&r.range()))));
|
||||
match report {
|
||||
Some(lr) => self.push(r, lr, boxes),
|
||||
None => self.dynamic = true,
|
||||
}
|
||||
}
|
||||
_ => self.dynamic = true,
|
||||
},
|
||||
Expr::Call(n, _)
|
||||
if matches!(n.as_str(), "INDIRECT" | "OFFSET" | "NOW" | "TODAY" | "RAND" | "RANDBETWEEN" | "RANDARRAY" | "CELL" | "INFO") =>
|
||||
{
|
||||
@@ -218,7 +199,6 @@ fn is_special(n: &str) -> bool {
|
||||
| "INDEX"
|
||||
| "CELL"
|
||||
| "TRIMRANGE"
|
||||
| "GETPIVOTDATA"
|
||||
| "SUBTOTAL"
|
||||
| "AGGREGATE"
|
||||
| "TEXT"
|
||||
@@ -257,7 +237,6 @@ pub const SPECIAL_FUNCTIONS: &[&str] = &[
|
||||
"INDEX",
|
||||
"CELL",
|
||||
"TRIMRANGE",
|
||||
"GETPIVOTDATA",
|
||||
"SUBTOTAL",
|
||||
"AGGREGATE",
|
||||
"TEXT",
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#![forbid(unsafe_code)]
|
||||
|
||||
pub mod eval;
|
||||
mod pivotdata;
|
||||
mod precision;
|
||||
pub mod recalc;
|
||||
mod spill_index;
|
||||
|
||||
@@ -1,149 +0,0 @@
|
||||
//! GETPIVOTDATA: a value from a PivotTable report, found by its value field and the row and
|
||||
//! column items that locate it (Excel's documented semantics). Each PivotTable's value cells are
|
||||
//! indexed in `PivotTable::data_index` (set on refresh and saved with the report; built on first
|
||||
//! use only for a pivot loaded without one, and only when it matches the stored report); the
|
||||
//! result is read from the report cell the sheet shows.
|
||||
|
||||
use gridcraft_core::{CellError, CellRef, Value};
|
||||
use gridcraft_formula::Expr;
|
||||
use gridcraft_model::{PIVOT_INDEXER, PivotDataCell, PivotItemRef, PivotLookup, PivotTable};
|
||||
|
||||
use crate::eval::{Ev, Evaluator};
|
||||
|
||||
/// Excel allows 126 field/item pairs.
|
||||
const MAX_PAIRS: usize = 126;
|
||||
|
||||
fn same_text(a: &str, b: &str) -> bool {
|
||||
a.trim().to_lowercase() == b.trim().to_lowercase()
|
||||
}
|
||||
|
||||
/// A number matches an item with that value (dates as serials) or with that label; anything
|
||||
/// else matches the label as text. With `exact`, a number matches only an item of that value.
|
||||
fn item_matches(item: &PivotItemRef, v: &Value, exact: bool) -> bool {
|
||||
if let Value::Number(n) = v {
|
||||
if let Value::Number(x) = &item.value
|
||||
&& n == x
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if exact {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if let Value::Bool(b) = v {
|
||||
return item.value == Value::Bool(*b);
|
||||
}
|
||||
v.to_text().is_ok_and(|t| same_text(&t, &item.label))
|
||||
}
|
||||
|
||||
/// Whether `cell` is the value field asked for with exactly these items.
|
||||
fn cell_matches(cell: &PivotDataCell, data_field: &str, pairs: &[(String, Value)], exact: bool) -> bool {
|
||||
(same_text(&cell.data_field, data_field) || same_text(&cell.source_col, data_field))
|
||||
&& cell.items.len() == pairs.len()
|
||||
&& pairs.iter().all(|(f, v)| cell.items.iter().any(|it| same_text(&it.field, f) && item_matches(it, v, exact)))
|
||||
}
|
||||
|
||||
fn is_axis_field(pt: &PivotTable, field: &str) -> bool {
|
||||
pt.rows.iter().chain(pt.columns.iter()).any(|f| same_text(&f.source_col, field))
|
||||
}
|
||||
|
||||
/// The value cell whose value field and items are exactly those asked for. Text items hit the
|
||||
/// hash index; numbers and booleans also match by value, which a miss falls back to scanning for.
|
||||
/// A number prefers the item of that value: two numeric items can show the same label (0.6 and 1
|
||||
/// formatted as `0`), so a label hit counts only when no item has the exact value.
|
||||
fn find<'a>(cells: &'a PivotLookup, data_field: &str, pairs: &[(String, Value)]) -> Option<&'a PivotDataCell> {
|
||||
let labels: Option<Vec<(&str, String, bool)>> =
|
||||
pairs.iter().map(|(f, v)| v.to_text().ok().map(|t| (f.as_str(), t, matches!(v, Value::Bool(_))))).collect();
|
||||
let hit = labels.as_ref().and_then(|labels| {
|
||||
let refs: Vec<(&str, &str, bool)> = labels.iter().map(|(f, t, b)| (*f, t.as_str(), *b)).collect();
|
||||
cells.find(data_field, &refs)
|
||||
});
|
||||
if pairs.iter().all(|(_, v)| matches!(v, Value::Text(_))) {
|
||||
return hit;
|
||||
}
|
||||
if let Some(c) = hit.filter(|c| cell_matches(c, data_field, pairs, true)) {
|
||||
return Some(c);
|
||||
}
|
||||
let all = cells.cells()?;
|
||||
all.iter()
|
||||
.find(|cell| cell_matches(cell, data_field, pairs, true))
|
||||
.or(hit)
|
||||
.or_else(|| all.iter().find(|cell| cell_matches(cell, data_field, pairs, false)))
|
||||
}
|
||||
|
||||
impl Evaluator<'_> {
|
||||
pub(crate) fn getpivotdata(&mut self, args: &[Expr]) -> Ev {
|
||||
match self.pivot_value(args) {
|
||||
Ok(v) => Ev::V(v),
|
||||
Err(e) => Ev::V(Value::Error(e)),
|
||||
}
|
||||
}
|
||||
|
||||
fn scalar_arg(&mut self, e: &Expr) -> Result<Value, CellError> {
|
||||
match self.value(e).scalar() {
|
||||
Value::Error(e) => Err(e),
|
||||
v => Ok(v),
|
||||
}
|
||||
}
|
||||
|
||||
fn pivot_value(&mut self, args: &[Expr]) -> Result<Value, CellError> {
|
||||
let (Some(field_expr), Some(table_expr)) = (args.first(), args.get(1)) else { return Err(CellError::Value) };
|
||||
let rest = args.get(2..).unwrap_or_default();
|
||||
if rest.len() % 2 != 0 || rest.len() / 2 > MAX_PAIRS {
|
||||
return Err(CellError::Ref);
|
||||
}
|
||||
let data_field = self.scalar_arg(field_expr)?.to_text()?;
|
||||
let area = match self.eval(table_expr) {
|
||||
Ev::R(areas) => areas.first().copied().ok_or(CellError::Ref)?,
|
||||
Ev::V(Value::Error(e)) => return Err(e),
|
||||
_ => return Err(CellError::Ref),
|
||||
};
|
||||
let mut pairs: Vec<(String, Value)> = Vec::with_capacity(rest.len() / 2);
|
||||
for pair in rest.chunks(2) {
|
||||
let (Some(f), Some(i)) = (pair.first(), pair.get(1)) else { return Err(CellError::Ref) };
|
||||
let field = self.scalar_arg(f)?.to_text()?;
|
||||
let item = self.scalar_arg(i)?;
|
||||
if pairs.iter().any(|(g, _)| same_text(g, &field)) {
|
||||
return Err(CellError::Ref);
|
||||
}
|
||||
pairs.push((field, item));
|
||||
}
|
||||
let wb = self.host.workbook();
|
||||
let sheet = wb.sheet(area.sheet).ok_or(CellError::Ref)?;
|
||||
let pt = sheet.pivots.iter().find(|p| p.last_range.is_some_and(|r| r.intersects(&area.range))).ok_or(CellError::Ref)?;
|
||||
// A report filter field may be named when the report shows exactly that one item.
|
||||
let mut axis_pairs = Vec::with_capacity(pairs.len());
|
||||
for (field, item) in pairs {
|
||||
if is_axis_field(pt, &field) {
|
||||
axis_pairs.push((field, item));
|
||||
continue;
|
||||
}
|
||||
let filter = pt.filters.iter().find(|f| same_text(&f.source_col, &field)).ok_or(CellError::Ref)?;
|
||||
let shown = match filter.selected.as_deref() {
|
||||
Some([one]) => item.to_text().is_ok_and(|t| same_text(&t, one)),
|
||||
_ => false,
|
||||
};
|
||||
if !shown {
|
||||
return Err(CellError::Ref);
|
||||
}
|
||||
}
|
||||
// The report's value cells. A pivot loaded without them builds them once; a stored report
|
||||
// that no longer matches its source gets no index at all, so the lookup is #REF! until a
|
||||
// refresh — never an index cached from a failed build, because the shared lookup keeps
|
||||
// the first one set and undo or reopen could then never rebuild it.
|
||||
if pt.data_index.cells().is_none() {
|
||||
let build = PIVOT_INDEXER.get().ok_or(CellError::Ref)?;
|
||||
if let Ok(cells) = build(wb, area.sheet, pt) {
|
||||
pt.data_index.set_cells(cells);
|
||||
}
|
||||
}
|
||||
let cell = find(&pt.data_index, &data_field, &axis_pairs).ok_or(CellError::Ref)?;
|
||||
// The value is the one the sheet shows, so the formula and the report cell always agree.
|
||||
let report = pt.last_range.ok_or(CellError::Ref)?;
|
||||
let at = CellRef::new(report.start.row.saturating_add(cell.row), report.start.col.saturating_add(cell.col));
|
||||
if !report.contains(at) {
|
||||
return Err(CellError::Ref);
|
||||
}
|
||||
Ok(sheet.value(at))
|
||||
}
|
||||
}
|
||||
+4
-119
@@ -48,8 +48,6 @@ pub struct Calc {
|
||||
/// Cells whose formulas have errors from cycles.
|
||||
pub circular: Vec<Key>,
|
||||
pub last_recalc_cells: usize,
|
||||
/// Which anchors held a spill when the current calculation started (see [`Standing`]).
|
||||
standing: Standing,
|
||||
/// The cells whose value is `#SPILL!`, kept so that finding the formulas an emptied cell or a
|
||||
/// freed spill area may unblock doesn't walk every formula or window of cells. Filled in
|
||||
/// `rebuild`, kept up to date by `cells_changed` and by the write-back of a run; an entry is
|
||||
@@ -57,45 +55,6 @@ pub struct Calc {
|
||||
spill_errors: SpillErrors,
|
||||
}
|
||||
|
||||
/// Who gets the cells when two arrays want the same ones. Excel (measured by a reviewer on
|
||||
/// PR #2483) lets the spill that already exists keep its cells, whichever anchor comes first;
|
||||
/// the other formula shows `#SPILL!`, and clearing the winner lets it spill. The rule here:
|
||||
///
|
||||
/// 1. an anchor that held a spill before this calculation outranks one that did not;
|
||||
/// 2. otherwise the anchor first in reading order (row, then column) wins.
|
||||
///
|
||||
/// Rule 2 alone decides when nothing is remembered, so the result never depends on hash order
|
||||
/// or evaluation order. A full recalculation remembers the layout the sheet held before it
|
||||
/// started (rule 1), so it agrees with the incremental one; a workbook that is calculated for
|
||||
/// the first time has no such layout (rule 2 only).
|
||||
///
|
||||
/// Known limits: (a) the xlsx reader does not restore spill layouts, so a workbook opened from a
|
||||
/// file is laid out by rule 2 alone, although Excel keeps the layout the file records; (b) when
|
||||
/// both anchors held a spill and one grows into the other, rule 2 decides, where Excel keeps
|
||||
/// the cells the other already owns.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
struct Standing {
|
||||
/// `true`: `keys` are the anchors that held a spill (full recalculation, which lays every
|
||||
/// spill out afresh). `false`: `keys` are the formulas that held none (incremental).
|
||||
held: bool,
|
||||
keys: HashSet<Key>,
|
||||
}
|
||||
|
||||
impl Standing {
|
||||
fn had_spill(&self, k: Key) -> bool {
|
||||
self.keys.contains(&k) == self.held
|
||||
}
|
||||
|
||||
/// Whether `a` takes cells from `b` when both want them.
|
||||
fn outranks(&self, a: Key, b: Key) -> bool {
|
||||
match (self.had_spill(a), self.had_spill(b)) {
|
||||
(true, false) => true,
|
||||
(false, true) => false,
|
||||
_ => (a.1.row, a.1.col) < (b.1.row, b.1.col),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A set of cells by row, each row's columns in their own set: a window of rows and columns is
|
||||
/// found by one column range per row that has an entry, so the cost follows the cells in the
|
||||
/// window, not those to the side of it in the same rows.
|
||||
@@ -142,7 +101,6 @@ impl Default for Calc {
|
||||
fixed_now: None,
|
||||
circular: vec![],
|
||||
last_recalc_cells: 0,
|
||||
standing: Standing::default(),
|
||||
spill_errors: SpillErrors::default(),
|
||||
}
|
||||
}
|
||||
@@ -311,14 +269,6 @@ impl Calc {
|
||||
/// Recalculates every formula (F9 / Ctrl+Alt+F9, and after loading).
|
||||
pub fn recalc_all(&mut self, wb: &mut Workbook) {
|
||||
self.rebuild(wb);
|
||||
// The layout the sheets hold now decides who keeps cells two arrays both want.
|
||||
// (A Python cell that holds a spill counts too, as it does in the incremental pass.)
|
||||
let mut held = HashSet::default();
|
||||
for i in 0..wb.sheets.len() {
|
||||
if let Some(sh) = wb.sheet(i) {
|
||||
held.extend(sh.spill_ranges.keys().filter(|a| sh.cell(**a).is_some_and(|c| c.formula.is_some() || c.py.is_some())).map(|a| (i, *a)));
|
||||
}
|
||||
}
|
||||
// Spills are laid out again from the formulas where they are now (a structural edit moves
|
||||
// or deletes the formulas, not the values they spilled).
|
||||
for i in 0..wb.sheets.len() {
|
||||
@@ -330,9 +280,7 @@ impl Calc {
|
||||
}
|
||||
}
|
||||
let all: Vec<Key> = self.graph.nodes.keys().copied().collect();
|
||||
self.standing = Standing { held: true, keys: held };
|
||||
self.run(wb, all, true);
|
||||
self.standing = Standing::default();
|
||||
}
|
||||
|
||||
/// Updates the graph for cells whose content changed and recalculates what depends on them.
|
||||
@@ -443,13 +391,6 @@ impl Calc {
|
||||
}
|
||||
}
|
||||
}
|
||||
// So can the area a removed formula spilled over.
|
||||
for (si, r) in &cleared {
|
||||
match emptied.iter_mut().find(|x| x.0 == *si) {
|
||||
Some(x) => x.1 = CellRef::new(x.1.row.max(r.end.row), x.1.col.max(r.end.col)),
|
||||
None => emptied.push((*si, r.end)),
|
||||
}
|
||||
}
|
||||
// An emptied cell can unblock an anchor any distance above or to the left of it.
|
||||
for (si, end) in emptied {
|
||||
seeds.extend(self.unblock_candidates(wb, si, end));
|
||||
@@ -531,22 +472,10 @@ impl Calc {
|
||||
fn run(&mut self, wb: &mut Workbook, mut dirty: Vec<Key>, full: bool) {
|
||||
let mut dynamic_again = !self.graph.dynamic.is_empty();
|
||||
self.last_recalc_cells = 0;
|
||||
let mut seen: HashSet<Key> = HashSet::default();
|
||||
if !full {
|
||||
self.standing = Standing::default();
|
||||
}
|
||||
for _round in 0..8 {
|
||||
if dirty.is_empty() {
|
||||
break;
|
||||
}
|
||||
if !full {
|
||||
// What each formula held before this calculation touched it.
|
||||
for &k in &dirty {
|
||||
if seen.insert(k) && wb.sheet(k.0).is_some_and(|s| !s.spill_ranges.contains_key(&k.1)) {
|
||||
self.standing.keys.insert(k);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Row-major order is a good topological guess; on-demand evaluation fixes the rest.
|
||||
dirty.sort_by_key(|(s, c)| (*s, c.row, c.col));
|
||||
let mut exprs: HashMap<Key, std::sync::Arc<Expr>> = HashMap::with_capacity_and_hasher(dirty.len(), Default::default());
|
||||
@@ -564,7 +493,6 @@ impl Calc {
|
||||
let tp = prof_now();
|
||||
let (results, spills, cycles) = {
|
||||
let mut host = PassHost::new(wb, &exprs, &mut rng, now).with_python(python);
|
||||
host.standing = Some(&self.standing);
|
||||
host.iterate = wb.calc.iterative;
|
||||
for k in &dirty {
|
||||
host.calculate(*k);
|
||||
@@ -663,40 +591,7 @@ impl Calc {
|
||||
if let Some(array) = new {
|
||||
let end = CellRef::new(key.1.row.saturating_add(array.rows as u32 - 1), key.1.col.saturating_add(array.cols as u32 - 1));
|
||||
let range = RangeRef::new(key.1, end);
|
||||
// Two arrays that want the same cells (see [`Standing`]): a spill already laid out
|
||||
// that this anchor outranks is taken over, and recalculated.
|
||||
let standing = &self.standing;
|
||||
// A spill can only be in the way where it has cells besides its anchor, and an
|
||||
// anchor itself blocks the array. When no spilled cell lies in the range, the owners
|
||||
// are not scanned: a full recalculation of many disjoint spills stays linear.
|
||||
let outranked: Vec<(CellRef, RangeRef)> = if range.iter().any(|cell| cell != key.1 && sheet.spill.contains_key(&cell)) {
|
||||
#[cfg(test)]
|
||||
OWNER_SCANS.with(|n| n.set(n.get() + 1));
|
||||
sheet
|
||||
.spill_ranges
|
||||
.iter()
|
||||
.filter(|(o, r)| **o != key.1 && r.intersects(&range) && standing.outranks(*key, (key.0, **o)))
|
||||
.map(|(o, r)| (*o, *r))
|
||||
.collect()
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
let blocked = spill_is_blocked(sheet, *key, range, end, standing);
|
||||
if !blocked {
|
||||
for (o, r) in outranked {
|
||||
for c in r.iter() {
|
||||
sheet.spill.remove(&c);
|
||||
}
|
||||
sheet.spill_ranges.remove(&o);
|
||||
if let Some(cell) = sheet.cells.get_mut(o) {
|
||||
cell.value = Value::Error(CellError::Spill);
|
||||
self.spill_errors.insert((key.0, o));
|
||||
}
|
||||
spill_changes.push((key.0, o));
|
||||
self.graph.dependents_of_range(key.0, r, &mut spill_changes);
|
||||
freed.push((key.0, r));
|
||||
}
|
||||
}
|
||||
let blocked = spill_is_blocked(sheet, key.1, range, end);
|
||||
if blocked {
|
||||
if let Some(cell) = sheet.cells.get_mut(key.1) {
|
||||
cell.value = Value::Error(CellError::Spill);
|
||||
@@ -733,22 +628,12 @@ impl Calc {
|
||||
}
|
||||
}
|
||||
|
||||
// Owner scans done by `write_back`, to check that disjoint spills never walk every owner.
|
||||
#[cfg(test)]
|
||||
thread_local! {
|
||||
pub(crate) static OWNER_SCANS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
}
|
||||
|
||||
/// Whether the array at `anchor` can't be laid out over `range`. A spill already laid out that
|
||||
/// `anchor` outranks does not block it: it is taken over when written back.
|
||||
fn spill_is_blocked(sheet: &gridcraft_model::Sheet, anchor: Key, range: RangeRef, end: CellRef, standing: &Standing) -> bool {
|
||||
let outranked =
|
||||
|cell: CellRef| sheet.spill_ranges.iter().any(|(o, r)| *o != anchor.1 && r.contains(cell) && standing.outranks(anchor, (anchor.0, *o)));
|
||||
fn spill_is_blocked(sheet: &gridcraft_model::Sheet, anchor: CellRef, range: RangeRef, end: CellRef) -> bool {
|
||||
end.row >= gridcraft_core::MAX_ROWS
|
||||
|| end.col >= gridcraft_core::MAX_COLS
|
||||
|| range.iter().any(|cell| cell != anchor.1 && (sheet.cells.has(cell) || (sheet.spill.contains_key(&cell) && !outranked(cell))))
|
||||
|| range.iter().any(|cell| cell != anchor && (sheet.cells.has(cell) || sheet.spill.contains_key(&cell)))
|
||||
|| sheet.merges.iter().any(|merge| merge.intersects(&range))
|
||||
|| sheet.tables.iter().any(|table| table.range.contains(anchor.1))
|
||||
|| sheet.tables.iter().any(|table| table.range.contains(anchor))
|
||||
}
|
||||
|
||||
fn fill_spill(sheet: &mut gridcraft_model::Sheet, anchor: CellRef, range: RangeRef, array: &Array) {
|
||||
|
||||
@@ -31,8 +31,6 @@ pub(super) struct PassHost<'a> {
|
||||
/// every row, so once per sheet rather than once per range read.
|
||||
used: HashMap<usize, Option<RangeRef>>,
|
||||
rng: &'a mut u64,
|
||||
/// Who held a spill before the calculation; unset: every formula did (reading order decides).
|
||||
pub(super) standing: Option<&'a super::Standing>,
|
||||
now: f64,
|
||||
cycle: bool,
|
||||
pub(super) cycles: Vec<Key>,
|
||||
@@ -101,7 +99,6 @@ impl<'a> PassHost<'a> {
|
||||
spill_index: SpillIndex::default(),
|
||||
used: HashMap::default(),
|
||||
rng,
|
||||
standing: None,
|
||||
now,
|
||||
cycle: false,
|
||||
cycles: vec![],
|
||||
@@ -163,26 +160,19 @@ fn spill_hits_overlap(index: &SpillIndex, sheet: usize, hits: &[CellRef], range:
|
||||
}
|
||||
|
||||
/// Whether an array result at `k` can't spill: it is in a table, or its area runs off the sheet,
|
||||
/// overlaps merged cells, holds other cells, or the spill of another formula that outranks it
|
||||
/// (see `Standing`; unless that formula is recalculated in this pass, and so may spill elsewhere
|
||||
/// now). A spill it outranks gives way to it when written back.
|
||||
/// overlaps merged cells, holds other cells, or another formula's spill (unless that formula is
|
||||
/// recalculated in this pass, and so may spill elsewhere now).
|
||||
fn spill_blocked(host: &PassHost<'_>, (sheet, anchor): Key, a: &Array) -> bool {
|
||||
let Some(sh) = host.wb.sheet(sheet) else { return false };
|
||||
let end =
|
||||
CellRef::new(anchor.row.saturating_add((a.rows as u32).saturating_sub(1)), anchor.col.saturating_add((a.cols as u32).saturating_sub(1)));
|
||||
let range = RangeRef::new(anchor, end);
|
||||
let own = sh.spill_ranges.get(&anchor);
|
||||
let default = super::Standing::default();
|
||||
let standing = host.standing.unwrap_or(&default);
|
||||
let spilled_over = |c: CellRef| {
|
||||
!own.is_some_and(|o| o.contains(c))
|
||||
&& sh.spill_ranges.iter().any(|(o, r)| {
|
||||
// A formula or Python cell recalculated in this pass lays its array out again.
|
||||
*o != anchor
|
||||
&& r.contains(c)
|
||||
&& !host.exprs.contains_key(&(sheet, *o))
|
||||
&& !host.python.contains_key(&(sheet, *o))
|
||||
&& standing.outranks((sheet, *o), (sheet, anchor))
|
||||
*o != anchor && r.contains(c) && !host.exprs.contains_key(&(sheet, *o)) && !host.python.contains_key(&(sheet, *o))
|
||||
})
|
||||
};
|
||||
end.row >= gridcraft_core::MAX_ROWS
|
||||
|
||||
@@ -2960,105 +2960,6 @@ fn formulas_read_a_dirty_python_cell_after_it_is_laid_out() {
|
||||
assert_eq!((t.num("A1"), t.num("A2"), t.num("A3")), (5.0, 100.0, 111.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disjoint_spills_do_not_scan_every_spill_owner() {
|
||||
// Many independent two-cell arrays: write-back must not walk all earlier owners for each one.
|
||||
let mut t = T::new();
|
||||
for i in 1..=2000 {
|
||||
t.wb.sheet_mut(0).unwrap().cells.set(c(&format!("A{}", i * 2 - 1)), Cell::formula(Formula::new("=SEQUENCE(2)")));
|
||||
}
|
||||
crate::recalc::OWNER_SCANS.with(|n| n.set(0));
|
||||
t.calc.recalc_all(&mut t.wb);
|
||||
assert_eq!((t.num("A2"), t.num("A4000")), (2.0, 2.0));
|
||||
let scans = crate::recalc::OWNER_SCANS.with(|n| n.get());
|
||||
assert!(scans < 10, "{scans} owner scans for 2000 disjoint spills");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overlapping_spill_edit_sequences_match_a_full_recalc() {
|
||||
// Random short edit sequences on a small grid of arrays that run into each other (sizes from
|
||||
// shared cells, so one edit resizes several at once), with constants and clears in their way.
|
||||
// After every edit the incremental result must equal a full recalc of the same workbook.
|
||||
let seeds: u64 = std::env::var("GRIDCRAFT_SPILL_SEEDS").ok().and_then(|v| v.parse().ok()).unwrap_or(200);
|
||||
let steps: usize = std::env::var("GRIDCRAFT_SPILL_STEPS").ok().and_then(|v| v.parse().ok()).unwrap_or(20);
|
||||
let only: Option<u64> = std::env::var("GRIDCRAFT_SPILL_SEED").ok().and_then(|v| v.parse().ok());
|
||||
let next = |state: &mut u64| {
|
||||
*state = state.wrapping_add(0x9E37_79B9_7F4A_7C15);
|
||||
let mut z = *state;
|
||||
z = (z ^ (z >> 30)).wrapping_mul(0xBF58_476D_1CE4_E5B9);
|
||||
z = (z ^ (z >> 27)).wrapping_mul(0x94D0_49BB_1331_11EB);
|
||||
z ^ (z >> 31)
|
||||
};
|
||||
let seeds: Vec<u64> = match only {
|
||||
Some(s) => vec![s],
|
||||
None => (0..seeds).collect(),
|
||||
};
|
||||
for seed in seeds {
|
||||
let mut state = seed;
|
||||
let mut t = T::new();
|
||||
// Sizes in J1:J4.
|
||||
for (i, n) in [2, 3, 1, 4].iter().enumerate() {
|
||||
t.set(&format!("J{}", i + 1), &n.to_string());
|
||||
}
|
||||
let mut log: Vec<(String, String)> = Vec::new();
|
||||
for step in 0..steps {
|
||||
let r = next(&mut state);
|
||||
let at = format!("{}{}", (b'A' + (r % 6) as u8) as char, 1 + (r >> 8) % 6);
|
||||
let kind = (r >> 16) % 14;
|
||||
let (at, input) = match kind {
|
||||
0..=3 => {
|
||||
let a = 1 + (r >> 24) % 4;
|
||||
let b = 1 + (r >> 28) % 4;
|
||||
(at, format!("=SEQUENCE($J${a},$J${b})"))
|
||||
}
|
||||
4 => (at, format!("=SEQUENCE({},{})", 1 + (r >> 24) % 3, 1 + (r >> 28) % 3)),
|
||||
5 => (format!("J{}", 1 + (r >> 24) % 4), (1 + (r >> 28) % 4).to_string()),
|
||||
6 => (at, "x".to_string()),
|
||||
7 | 8 => (at, String::new()),
|
||||
9 => (format!("K{}", 1 + (r >> 24) % 6), "=SUM(A1:F6)".to_string()),
|
||||
10 => {
|
||||
// An earlier edit again (often putting back what a cell held before, as undo does).
|
||||
match log.len() {
|
||||
0 => (at, String::new()),
|
||||
n => log[(r >> 24) as usize % n].clone(),
|
||||
}
|
||||
}
|
||||
11 => (format!("{}{}", (b'A' + ((r >> 24) % 6) as u8) as char, 1 + (r >> 32) % 6), (1 + (r >> 40) % 3).to_string()),
|
||||
// Several cells in one edit (a fill, or clearing a range): a 2x2 block from `at`.
|
||||
12 => (format!("{at}+"), String::new()),
|
||||
_ => (format!("{at}+"), format!("=SEQUENCE($J${},$J${})", 1 + (r >> 24) % 4, 1 + (r >> 28) % 4)),
|
||||
};
|
||||
log.push((at.clone(), input.clone()));
|
||||
if let Some(from) = at.strip_suffix('+') {
|
||||
let from = c(from);
|
||||
let keys: Vec<(usize, CellRef)> =
|
||||
(0..2).flat_map(|dr| (0..2).map(move |dc| (0, CellRef { row: from.row + dr, col: from.col + dc }))).collect();
|
||||
for k in &keys {
|
||||
let cell = if input.is_empty() { Cell::value(Value::Empty) } else { Cell::formula(Formula::new(&input)) };
|
||||
t.wb.sheet_mut(0).unwrap().cells.set(k.1, cell);
|
||||
}
|
||||
t.calc.cells_changed(&mut t.wb, &keys);
|
||||
} else {
|
||||
t.set(&at, &input);
|
||||
}
|
||||
let mut fresh = t.wb.clone();
|
||||
Calc::new().recalc_all(&mut fresh);
|
||||
let (a, b) = (t.wb.sheet(0).unwrap(), fresh.sheet(0).unwrap());
|
||||
for row in 0..12 {
|
||||
for col in 0..12 {
|
||||
let cell = CellRef { row, col };
|
||||
assert_eq!(a.value(cell), b.value(cell), "seed {seed} step {step}: {cell} incremental vs full recalc after {log:?}");
|
||||
}
|
||||
}
|
||||
let mut ka: Vec<_> = a.spill_ranges.iter().map(|(k, v)| (*k, *v)).collect();
|
||||
let mut kb: Vec<_> = b.spill_ranges.iter().map(|(k, v)| (*k, *v)).collect();
|
||||
ka.sort_by_key(|(k, _)| (k.row, k.col));
|
||||
kb.sort_by_key(|(k, _)| (k.row, k.col));
|
||||
assert_eq!(ka, kb, "seed {seed} step {step}: spill layout after {log:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A computed criterion whose formula runs a database function over the same criteria counts as
|
||||
/// not met inside itself: before, each record's check ran the function again for every record, at
|
||||
/// every level, so the work grew exponentially with the nesting allowed.
|
||||
|
||||
@@ -22,12 +22,10 @@ thiserror = { workspace = true }
|
||||
log = { workspace = true }
|
||||
gridcraft-xlsx = { workspace = true }
|
||||
craft-csv = { workspace = true }
|
||||
craft-gridcraft-format = { workspace = true }
|
||||
gridcraft-chart = { workspace = true }
|
||||
gridcraft-pdf = { workspace = true }
|
||||
gridcraft-math = { workspace = true }
|
||||
image = { workspace = true }
|
||||
unicode-segmentation = "=1.13.3"
|
||||
|
||||
[dev-dependencies]
|
||||
gridcraft-xlsx = { workspace = true, features = ["test-support"] }
|
||||
|
||||
@@ -283,8 +283,5 @@ pub(super) fn subtotal(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let range = RangeRef::new(CellRef::new(first, *c), CellRef::new(last - 1, *c)).a1();
|
||||
s.execute("cell.set", json!({"sheet": sheet, "cell": CellRef::new(last, *c).a1(), "input": format!("=SUBTOTAL({code},{range})")}))?;
|
||||
}
|
||||
// One outer group over every data and subtotal row, summarised by the grand total, as in
|
||||
// Excel: outline level 1 then shows only the grand total, and level 2 the subtotals.
|
||||
s.execute("data.group", json!({"sheet": sheet, "rows": format!("{}:{}", first + 1, last)}))?;
|
||||
Ok(json!({"groups": inserted}))
|
||||
}
|
||||
|
||||
@@ -119,29 +119,15 @@ fn do_sort(s: &mut Session, sheet: usize, r: RangeRef, header: bool, keys: Vec<S
|
||||
for (ki, k) in keys.iter().enumerate() {
|
||||
let (va, ca) = &keyed[a as usize][ki];
|
||||
let (vb, cb) = &keyed[b as usize][ki];
|
||||
let plain = || {
|
||||
if case && va.is_text() && vb.is_text() {
|
||||
sort_compare(va, vb).then_with(|| case_order(va.as_text().unwrap_or(""), vb.as_text().unwrap_or("")))
|
||||
} else {
|
||||
sort_compare(va, vb)
|
||||
}
|
||||
};
|
||||
let o = if k.by != "values" {
|
||||
ca.cmp(cb)
|
||||
} else if let Some(list) = &k.list {
|
||||
let pos = |v: &Value| v.as_text().and_then(|t| list.iter().position(|x| x.eq_ignore_ascii_case(t)));
|
||||
match (pos(va), pos(vb)) {
|
||||
(Some(a), Some(b)) => a.cmp(&b),
|
||||
(Some(_), None) => Ordering::Less,
|
||||
(None, Some(_)) => Ordering::Greater,
|
||||
// Values not in the list follow the listed ones in the usual order, as in Excel.
|
||||
// A descending key is left as it was: they tie, so the next key decides.
|
||||
// A blank has no place in the list either, but still goes last.
|
||||
(None, None) if k.desc => va.is_empty().cmp(&vb.is_empty()),
|
||||
(None, None) => plain(),
|
||||
}
|
||||
let pos = |v: &Value| v.as_text().and_then(|t| list.iter().position(|x| x.eq_ignore_ascii_case(t))).unwrap_or(usize::MAX);
|
||||
pos(va).cmp(&pos(vb))
|
||||
} else if case && va.is_text() && vb.is_text() {
|
||||
sort_compare(va, vb).then_with(|| case_order(va.as_text().unwrap_or(""), vb.as_text().unwrap_or("")))
|
||||
} else {
|
||||
plain()
|
||||
sort_compare(va, vb)
|
||||
};
|
||||
// Blanks always sort last, whatever the order.
|
||||
let o = if k.desc && !(va.is_empty() || vb.is_empty()) { o.reverse() } else { o };
|
||||
|
||||
@@ -40,8 +40,8 @@ fn subtotal_puts_summary_rows_below_their_detail() {
|
||||
s.execute("data.subtotal", json!({"range": "A1:B4", "groupBy": "A", "columns": ["B"]})).unwrap();
|
||||
let sh = s.doc().unwrap().wb.active().unwrap().clone();
|
||||
assert!(sh.summary_below, "the totals sit below their groups");
|
||||
// East's detail is rows 2–3 and its total row 4: showing level 2 keeps the total showing.
|
||||
s.execute("data.showLevels", json!({"rows": 2})).unwrap();
|
||||
// East's detail is rows 2–3 and its total row 4: collapsing level 1 keeps the total showing.
|
||||
s.execute("data.showLevels", json!({"rows": 1})).unwrap();
|
||||
let hidden = |s: &Session, row: u32| s.doc().unwrap().wb.active().unwrap().is_row_hidden(row);
|
||||
assert!(hidden(&s, 1) && hidden(&s, 2), "East's detail rows are hidden");
|
||||
assert!(!hidden(&s, 3), "East Total stays visible");
|
||||
|
||||
@@ -36,28 +36,15 @@ pub(super) fn paste_special(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let whole = clip.areas.is_empty() && (clip.selected.is_full_cols() || clip.selected.is_full_rows()) && clip.selected.contains_range(&clip.range);
|
||||
let src = if whole { clip.selected } else { clip.range };
|
||||
let (h, w) = if transpose { (src.width(), src.height()) } else { (src.height(), src.width()) };
|
||||
// Tile the copy over a larger destination that is a multiple of its size. A selection
|
||||
// narrower than the copy but a multiple of its height takes it down every row, at the copy's
|
||||
// width (and a shorter one a multiple of its width across), as in Excel.
|
||||
let multiple = sel.height() % h == 0 && sel.width() % w == 0;
|
||||
let down = sel.width() < w && sel.height() > h && sel.height() % h == 0;
|
||||
let across = sel.height() < h && sel.width() > w && sel.width() % w == 0;
|
||||
// The cells the tiles cover: the selection itself, or for `down`/`across` the selection at the
|
||||
// copy's width/height, which can be much larger than what was selected.
|
||||
let area = if down {
|
||||
u64::from(sel.height()) * u64::from(w)
|
||||
} else if across {
|
||||
u64::from(h) * u64::from(sel.width())
|
||||
} else {
|
||||
sel.count()
|
||||
};
|
||||
let tile = (multiple || down || across)
|
||||
// Tile the copy over a larger destination that is a multiple of its size.
|
||||
let tile = sel.height() % h == 0
|
||||
&& sel.width() % w == 0
|
||||
&& !sel.is_single()
|
||||
&& cell_param_on(s, p, "at", dest_sheet)?.is_none()
|
||||
&& !sel.is_full_cols()
|
||||
&& !sel.is_full_rows()
|
||||
&& area <= 4_000_000;
|
||||
let (tiles_r, tiles_c) = if tile { ((sel.height() / h).max(1), (sel.width() / w).max(1)) } else { (1, 1) };
|
||||
&& sel.count() <= 4_000_000;
|
||||
let (tiles_r, tiles_c) = if tile { (sel.height() / h, sel.width() / w) } else { (1, 1) };
|
||||
// A single cell or row repeated down a filtered selection skips the rows the filter hides; a
|
||||
// taller block is pasted straight down, hidden rows included, as in Excel.
|
||||
let skip_rows = match s.doc()?.wb.sheet(dest_sheet) {
|
||||
|
||||
@@ -290,12 +290,6 @@ pub fn function_list() -> Vec<Json> {
|
||||
("SHEETS", "Information", "SHEETS([reference])", "Number of sheets."),
|
||||
("AREAS", "Lookup", "AREAS(reference)", "Number of areas in a reference."),
|
||||
("TRIMRANGE", "Lookup", "TRIMRANGE(range, [trim_rows], [trim_cols])", "A range or array without its blank outer rows and columns."),
|
||||
(
|
||||
"GETPIVOTDATA",
|
||||
"Lookup",
|
||||
"GETPIVOTDATA(data_field, pivot_table, [field1, item1], ...)",
|
||||
"A value from a PivotTable report, by value field and items.",
|
||||
),
|
||||
("ISOMITTED", "Information", "ISOMITTED(argument)", "TRUE when a LAMBDA argument was left out."),
|
||||
];
|
||||
for (n, c, sig, d) in specials {
|
||||
|
||||
+1586
-21
File diff suppressed because it is too large
Load Diff
@@ -1,38 +1,17 @@
|
||||
use super::{
|
||||
Anchor, CellRef, Chart, ChartKind, EngineError, Json, LegendPos, MAX_COLS, MAX_ROWS, RangeRef, Result, Series, Session, Sheet, anchor_mode_param,
|
||||
bad, block, bool_param, cell_param_on, edit, f64_param, json, size_cap, split_sheet, str_param, target_ranges, target_sheet, u32_param,
|
||||
Anchor, CellRef, Chart, ChartKind, EngineError, Json, LegendPos, RangeRef, Result, Series, Session, Sheet, anchor_mode_param, bad, block,
|
||||
bool_param, cell_param_on, edit, f64_param, json, split_sheet, str_param, target_ranges, target_sheet, u32_param,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn compiled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn chart_areas(s: &Session, p: &Json) -> Result<Vec<RangeRef>> {
|
||||
let mut areas = if p.get("range").is_some() {
|
||||
target_ranges(s, p)?
|
||||
} else if s.doc()?.selection.ranges.len() > 1 {
|
||||
s.doc()?.selection.ranges.clone()
|
||||
} else {
|
||||
vec![block(s, p)?]
|
||||
};
|
||||
// Whole columns/rows span a million cells: clip their far edges to the cells in use, so only
|
||||
// a block that really is too large gets refused. Bounded areas keep their extent as given.
|
||||
let sheet = target_sheet(s, p)?;
|
||||
if let Some(used) = s.doc()?.wb.sheet(sheet).and_then(|sh| sh.used_range()) {
|
||||
// Areas that start outside the used range keep their extent as given.
|
||||
for r in &mut areas {
|
||||
let whole_cols = r.start.row == 0 && r.end.row >= MAX_ROWS - 1;
|
||||
let whole_rows = r.start.col == 0 && r.end.col >= MAX_COLS - 1;
|
||||
if whole_cols && r.start.row <= used.end.row {
|
||||
r.end.row = r.end.row.min(used.end.row);
|
||||
}
|
||||
if whole_rows && r.start.col <= used.end.col {
|
||||
r.end.col = r.end.col.min(used.end.col);
|
||||
}
|
||||
}
|
||||
if p.get("range").is_some() {
|
||||
return target_ranges(s, p);
|
||||
}
|
||||
Ok(areas)
|
||||
let d = s.doc()?;
|
||||
if d.selection.ranges.len() > 1 {
|
||||
return Ok(d.selection.ranges.clone());
|
||||
}
|
||||
Ok(vec![block(s, p)?])
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- charts
|
||||
@@ -284,8 +263,6 @@ pub fn build_chart(s: &Session, p: &Json) -> Result<(usize, Chart)> {
|
||||
data_table: None,
|
||||
gridlines: !matches!(kind, ChartKind::Pie | ChartKind::Doughnut | ChartKind::Treemap | ChartKind::Sunburst | ChartKind::Funnel),
|
||||
style: 1,
|
||||
hole_size: 75,
|
||||
first_slice_angle: 0,
|
||||
x_title: None,
|
||||
y_title: None,
|
||||
source: (areas.len() == 1).then(|| format!("{}!{}", gridcraft_formula::quote_sheet(&sh.name), bounds.a1())),
|
||||
@@ -331,11 +308,7 @@ pub(super) fn chart_set(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let Some(c) = sh.charts.get_mut(ci) else { return Ok(Json::Null) };
|
||||
if let Some(t) = str_param(p, "type") {
|
||||
c.kind = chart_kind(t, str_param(p, "subtype").unwrap_or(""));
|
||||
if !c.supports_data_table() {
|
||||
c.data_table = None;
|
||||
}
|
||||
}
|
||||
update_data_table(c, p, bool_param(p, "dataTable"))?;
|
||||
if let Some(method) = quartiles {
|
||||
for series in &mut c.series {
|
||||
series.quartiles = method;
|
||||
@@ -362,12 +335,6 @@ pub(super) fn chart_set(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
if let Some(v) = u32_param(p, "style") {
|
||||
c.style = v.clamp(1, 16);
|
||||
}
|
||||
if let Some(v) = u32_param(p, "holeSize") {
|
||||
c.hole_size = v.clamp(10, 90) as u8;
|
||||
}
|
||||
if let Some(v) = u32_param(p, "firstSliceAngle") {
|
||||
c.first_slice_angle = (v % 360) as u16;
|
||||
}
|
||||
if let Some(t) = p.get("xTitle") {
|
||||
c.x_title = t.as_str().map(str::to_string);
|
||||
}
|
||||
@@ -378,10 +345,10 @@ pub(super) fn chart_set(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
c.anchor.cell = at;
|
||||
}
|
||||
if let Some(w) = f64_param(p, "width") {
|
||||
c.anchor.width = w.clamp(20.0, size_cap(c.anchor.width)) as f32;
|
||||
c.anchor.width = w.clamp(20.0, 10000.0) as f32;
|
||||
}
|
||||
if let Some(h) = f64_param(p, "height") {
|
||||
c.anchor.height = h.clamp(20.0, size_cap(c.anchor.height)) as f32;
|
||||
c.anchor.height = h.clamp(20.0, 10000.0) as f32;
|
||||
}
|
||||
if let Some(v) = f64_param(p, "dx") {
|
||||
c.anchor.dx = v as f32;
|
||||
@@ -393,32 +360,6 @@ pub(super) fn chart_set(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Shared by Chart Properties and Add Chart Element; no separate UI state.
|
||||
pub(crate) fn update_data_table(c: &mut Chart, p: &Json, on: Option<bool>) -> Result<()> {
|
||||
if p.get("dataTable").is_some_and(|v| !v.is_boolean()) {
|
||||
return Err(bad("chart", "`dataTable` must be a boolean"));
|
||||
}
|
||||
if on == Some(false) {
|
||||
c.data_table = None;
|
||||
return Ok(());
|
||||
}
|
||||
let fields = ["dataTableKeys", "dataTableHorizontalBorder", "dataTableVerticalBorder", "dataTableOutline"];
|
||||
if on == Some(true) || fields.iter().any(|k| p.get(k).is_some()) {
|
||||
if !c.supports_data_table() {
|
||||
return Err(bad("chart", "data tables need a column, bar, line, area or compatible combo chart"));
|
||||
}
|
||||
let table = c.data_table.get_or_insert_with(Default::default);
|
||||
for (key, value) in
|
||||
fields.into_iter().zip([&mut table.show_keys, &mut table.horizontal_border, &mut table.vertical_border, &mut table.outline])
|
||||
{
|
||||
if let Some(v) = p.get(key) {
|
||||
*value = v.as_bool().ok_or_else(|| bad("chart", format!("`{key}` must be a boolean")))?;
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(super) fn chart_switch(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let (si, ci) = find_chart(s, p)?;
|
||||
edit(s, |cx| {
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
use super::{
|
||||
Anchor, BorderLine, BorderStyle, Borders, CellRef, CfOperator, CfRule, CfValueKind, Color, CondFormat, EngineError, Fill, Json, RangeRef, Result,
|
||||
Session, Shape, ShapeKind, Style, anchor_mode_param, bad, bool_param, cell_param, edit, f64_param, json, ok, str_param, target_ranges,
|
||||
target_sheet, u32_param,
|
||||
Anchor, BorderLine, BorderStyle, Borders, CfOperator, CfRule, CfValueKind, Color, CondFormat, EngineError, Fill, Json, Result, Session, Shape,
|
||||
ShapeKind, Style, anchor_mode_param, bad, bool_param, cell_param, edit, f64_param, json, ok, str_param, target_ranges, target_sheet, u32_param,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn compiled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- conditional formatting
|
||||
|
||||
fn preset_style(name: &str) -> Style {
|
||||
@@ -277,13 +271,7 @@ pub(super) fn clear_cf(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
sh.cond_formats.clear();
|
||||
} else {
|
||||
for cf in sh.cond_formats.iter_mut() {
|
||||
let before = RangeRef::top_left(&cf.ranges);
|
||||
cf.ranges.retain(|r| !ranges.iter().any(|x| x.intersects(r)));
|
||||
// The relative formulas are written for the top-left cell: when it goes, they're
|
||||
// rewritten for the new one, so the areas left keep reading the same cells.
|
||||
if let (Some(from), Some(to)) = (before, RangeRef::top_left(&cf.ranges)) {
|
||||
rebase_cf_formulas(&mut cf.rule, from, to);
|
||||
}
|
||||
}
|
||||
sh.cond_formats.retain(|c| !c.ranges.is_empty());
|
||||
}
|
||||
@@ -291,19 +279,6 @@ pub(super) fn clear_cf(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Moves the relative references of a rule's per-cell formulas written for `from` to `to`.
|
||||
fn rebase_cf_formulas(rule: &mut CfRule, from: CellRef, to: CellRef) {
|
||||
let mv = |f: &str| crate::cmd::data::move_rule_formula(f, from, to);
|
||||
match rule {
|
||||
CfRule::CellIs { a, b, .. } => {
|
||||
*a = mv(a);
|
||||
*b = b.as_deref().map(mv);
|
||||
}
|
||||
CfRule::Expression { formula, .. } => *formula = mv(formula),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn manage_cf(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let sheet = target_sheet(s, p)?;
|
||||
if p.get("delete").is_none() && p.get("moveUp").is_none() && p.get("moveDown").is_none() {
|
||||
|
||||
@@ -3,11 +3,6 @@ use super::{
|
||||
split_sheet, str_param, target_ranges, target_sheet,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn compiled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- links & comments
|
||||
|
||||
pub(super) fn insert_link(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
@@ -32,10 +27,8 @@ pub(super) fn insert_link(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
st.font.underline = Underline::Single;
|
||||
});
|
||||
let sh = cx.sheet_mut(sheet)?;
|
||||
if let Some(t) = text.clone().or_else(|| {
|
||||
(sh.spill_anchor(at).is_none() && sh.value(at).is_empty() && sh.cell(at).is_none_or(|cell| !cell.has_content())).then(|| target.clone())
|
||||
}) {
|
||||
sh.set_cell(at, Cell { value: gridcraft_core::Value::text(t.as_str()), formula: None, style: link_style, py: None });
|
||||
if let Some(t) = text.clone().or_else(|| sh.value(at).is_empty().then(|| target.clone())) {
|
||||
sh.set_cell(at, Cell { value: gridcraft_core::Value::text(t.as_str()), formula: None, style: link_style });
|
||||
} else {
|
||||
sh.set_style(at, link_style);
|
||||
}
|
||||
@@ -45,11 +38,9 @@ pub(super) fn insert_link(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Follows a link: a reference selects it; anything else is refused ([`crate::links::classify`]).
|
||||
/// An `http`/`https`/`mailto` address is refused too unless the host set
|
||||
/// [`crate::links::LinkPolicy::Allow`]: every caller of a command may be a script or an agent, so
|
||||
/// the user opens such links by clicking and confirming, and the UI then calls
|
||||
/// [`Session::open_confirmed_link`] (#2181). Opens no dialog.
|
||||
/// Follows a link: a reference selects it, an `http`/`https`/`mailto` address is handed to the
|
||||
/// host (`UiRequest::OpenUrl`); anything else is refused ([`crate::links::classify`]). Opens no
|
||||
/// dialog; the interactive click asks for confirmation first, in the UI.
|
||||
pub(super) fn open_link(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let target = match str_param(p, "url").or_else(|| str_param(p, "target")) {
|
||||
Some(t) => t.to_string(),
|
||||
@@ -65,9 +56,6 @@ pub(super) fn open_link(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
match crate::links::classify(&target) {
|
||||
crate::links::LinkKind::Internal(r) => crate::cmd::edit::go_to(s, &json!({"reference": r.trim_start_matches('#')})),
|
||||
crate::links::LinkKind::External(u) => {
|
||||
if s.link_policy != crate::links::LinkPolicy::Allow {
|
||||
return Err(EngineError::Other(crate::links::NEEDS_CONFIRMATION.into()));
|
||||
}
|
||||
s.ui_requests.push(crate::UiRequest::OpenUrl(u.clone()));
|
||||
Ok(json!({"opened": u}))
|
||||
}
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
use super::{
|
||||
Anchor, CellPicture, CellRef, Color, EngineError, Image, Json, MAX_OBJECT_OFFSET, ObjKind, ObjRef, PROTECTED, Result, Session, Shape, ShapeKind,
|
||||
Sparkline, SparklineKind, anchor_mode_name, anchor_mode_param, bad, bool_param, cell_param, edit, f64_param, json, locked_cell_error, ok,
|
||||
size_cap, str_param, u32_param,
|
||||
Anchor, CellPicture, CellRef, Color, EngineError, Image, Json, PROTECTED, Result, Session, Shape, ShapeKind, Sparkline, SparklineKind,
|
||||
anchor_mode_name, anchor_mode_param, bad, bool_param, cell_param, edit, f64_param, json, locked_cell_error, ok, str_param, u32_param,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn compiled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
pub(super) fn insert_sparkline(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let src = str_param(p, "range").ok_or_else(|| bad("insert.sparkline", "missing `range`"))?.to_string();
|
||||
let loc = cell_param(s, p, "location")?.ok_or_else(|| bad("insert.sparkline", "missing `location`"))?;
|
||||
@@ -69,10 +63,6 @@ pub(super) fn insert_picture(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
.unwrap_or_else(|| if data.starts_with(&[0x89, b'P', b'N', b'G']) { "image/png".into() } else { "image/jpeg".into() });
|
||||
let (w, h) = crate::io::image_size(&data).unwrap_or((320, 240));
|
||||
let d = s.doc()?;
|
||||
// Sheet protection locks drawing objects, as for a text box's text.
|
||||
if d.wb.active().is_some_and(|sh| sh.is_protected()) {
|
||||
return Err(EngineError::Other(PROTECTED.into()));
|
||||
}
|
||||
let id = d.wb.next_object_id();
|
||||
let at = cell_param(s, p, "at")?.unwrap_or(d.selection.active);
|
||||
let scale = (640.0 / w.max(1) as f32).min(1.0);
|
||||
@@ -186,15 +176,9 @@ pub(super) fn shape_set_text(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let sheet = d.wb.active_sheet();
|
||||
let sh = d.wb.active().ok_or_else(|| bad("shape.setText", "no such text box"))?;
|
||||
let shape = sh.shapes.iter().find(|shape| shape.id == id).ok_or_else(|| bad("shape.setText", "no such text box"))?;
|
||||
if !matches!(shape.kind, ShapeKind::TextBox | ShapeKind::WordArt) {
|
||||
if shape.kind != ShapeKind::TextBox {
|
||||
return Err(bad("shape.setText", "the shape is not a text box"));
|
||||
}
|
||||
if shape.kind == ShapeKind::WordArt && text.is_empty() {
|
||||
return Err(bad("shape.setText", "WordArt text must not be empty"));
|
||||
}
|
||||
if shape.kind == ShapeKind::WordArt && text.chars().nth(crate::cmd::wordart::MAX_CHARS).is_some() {
|
||||
return Err(bad("shape.setText", format!("`text` is longer than {} characters", crate::cmd::wordart::MAX_CHARS)));
|
||||
}
|
||||
// Sheet protection locks drawing objects (there is no "edit objects" allowance yet).
|
||||
if sh.is_protected() {
|
||||
return Err(EngineError::Other(PROTECTED.into()));
|
||||
@@ -209,50 +193,51 @@ pub(super) fn shape_set_text(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
})
|
||||
}
|
||||
|
||||
/// The floating object a `{kind, id}` command names on the active sheet. Unknown kinds and
|
||||
/// objects are errors, so a stale id never succeeds silently.
|
||||
fn object_param(s: &Session, p: &Json, cmd: &str) -> Result<(usize, ObjRef)> {
|
||||
let id = u32_param(p, "id").ok_or_else(|| bad(cmd, "missing `id`"))?;
|
||||
let kind =
|
||||
str_param(p, "kind").and_then(ObjKind::parse).ok_or_else(|| bad(cmd, "kind must be chart, image, shape, slicer, equation or control"))?;
|
||||
let d = s.doc()?;
|
||||
let sheet = d.wb.active_sheet();
|
||||
let o = ObjRef::new(kind, id);
|
||||
if !d.wb.sheet(sheet).is_some_and(|sh| sh.has_object(o)) {
|
||||
return Err(bad(cmd, "no such object"));
|
||||
}
|
||||
// A locked form control on a protected sheet stays as it is.
|
||||
crate::cmd::controls::check_objects_unlocked(s, sheet, kind, &[id])?;
|
||||
Ok((sheet, o))
|
||||
}
|
||||
|
||||
pub(super) fn delete_object(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let (sheet, o) = object_param(s, p, "object.delete")?;
|
||||
let id = u32_param(p, "id").ok_or_else(|| bad("object.delete", "missing `id`"))?;
|
||||
let kind = str_param(p, "kind").unwrap_or("").to_string();
|
||||
let sheet = s.doc()?.wb.active_sheet();
|
||||
edit(s, |cx| {
|
||||
cx.sheet_mut(sheet)?.remove_object(o);
|
||||
Ok(json!({"deleted": o}))
|
||||
let sh = cx.sheet_mut(sheet)?;
|
||||
match kind.as_str() {
|
||||
"chart" => sh.charts.retain(|c| c.id != id),
|
||||
"image" => sh.images.retain(|c| c.id != id),
|
||||
"slicer" => sh.slicers.retain(|c| c.id != id),
|
||||
_ => sh.shapes.retain(|c| c.id != id),
|
||||
}
|
||||
Ok(Json::Null)
|
||||
})
|
||||
}
|
||||
|
||||
pub(super) fn move_object(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let (sheet, o) = object_param(s, p, "object.move")?;
|
||||
let id = u32_param(p, "id").ok_or_else(|| bad("object.move", "missing `id`"))?;
|
||||
let kind = str_param(p, "kind").unwrap_or("").to_string();
|
||||
let sheet = s.doc()?.wb.active_sheet();
|
||||
let at = cell_param(s, p, "at")?;
|
||||
edit(s, |cx| {
|
||||
let Some(a) = cx.sheet_mut(sheet)?.object_anchor_mut(o) else { return Err(bad("object.move", "no such object")) };
|
||||
let sh = cx.sheet_mut(sheet)?;
|
||||
let anchor = match kind.as_str() {
|
||||
"chart" => sh.charts.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
"image" => sh.images.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
"slicer" => sh.slicers.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
"shape" => sh.shapes.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
_ => None,
|
||||
};
|
||||
let Some(a) = anchor else { return Err(bad("object.move", "no such object")) };
|
||||
if let Some(at) = at {
|
||||
a.cell = at;
|
||||
}
|
||||
if let Some(v) = f64_param(p, "dx") {
|
||||
a.dx = v.clamp(-MAX_OBJECT_OFFSET, MAX_OBJECT_OFFSET) as f32;
|
||||
a.dx = v as f32;
|
||||
}
|
||||
if let Some(v) = f64_param(p, "dy") {
|
||||
a.dy = v.clamp(-MAX_OBJECT_OFFSET, MAX_OBJECT_OFFSET) as f32;
|
||||
a.dy = v as f32;
|
||||
}
|
||||
if let Some(v) = f64_param(p, "width") {
|
||||
a.width = v.clamp(1.0, size_cap(a.width)) as f32;
|
||||
a.width = v.clamp(1.0, 10000.0) as f32;
|
||||
}
|
||||
if let Some(v) = f64_param(p, "height") {
|
||||
a.height = v.clamp(0.0, size_cap(a.height)) as f32;
|
||||
a.height = v.clamp(0.0, 10000.0) as f32;
|
||||
}
|
||||
Ok(Json::Null)
|
||||
})
|
||||
@@ -262,10 +247,21 @@ pub(super) fn move_object(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
/// cells" / "Don't move or size with cells"), so it follows — or ignores — its rows and columns
|
||||
/// when the sheet is sorted or edited structurally.
|
||||
pub(super) fn set_anchor_mode(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let (sheet, o) = object_param(s, p, "object.setAnchorMode")?;
|
||||
let id = u32_param(p, "id").ok_or_else(|| bad("object.setAnchorMode", "missing `id`"))?;
|
||||
let kind = str_param(p, "kind").unwrap_or("").to_string();
|
||||
if !matches!(kind.as_str(), "chart" | "image" | "shape") {
|
||||
return Err(bad("object.setAnchorMode", "kind must be chart, image or shape"));
|
||||
}
|
||||
let mode = anchor_mode_param(p).ok_or_else(|| bad("object.setAnchorMode", "mode must be moveAndSize, moveOnly or absolute"))?;
|
||||
let sheet = s.doc()?.wb.active_sheet();
|
||||
edit(s, |cx| {
|
||||
let Some(a) = cx.sheet_mut(sheet)?.object_anchor_mut(o) else { return Err(bad("object.setAnchorMode", "no such object")) };
|
||||
let sh = cx.sheet_mut(sheet)?;
|
||||
let anchor = match kind.as_str() {
|
||||
"chart" => sh.charts.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
"image" => sh.images.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
_ => sh.shapes.iter_mut().find(|c| c.id == id).map(|c| &mut c.anchor),
|
||||
};
|
||||
let Some(a) = anchor else { return Err(bad("object.setAnchorMode", "no such object")) };
|
||||
a.mode = mode;
|
||||
Ok(json!({"mode": anchor_mode_name(mode)}))
|
||||
})
|
||||
|
||||
@@ -3,11 +3,6 @@ use super::{
|
||||
block, bool_param, edit, json, rewrite, shift_cell_features, str_param, target_range, target_sheet, with,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn compiled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- tables
|
||||
|
||||
pub(super) fn insert_table(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
@@ -56,7 +51,7 @@ pub(super) fn insert_table(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
let sh = cx.sheet_mut(sheet)?;
|
||||
// The header row pushes the data down one row: never off the end of the sheet.
|
||||
let last = RangeRef::new(CellRef::new(MAX_ROWS - 1, r.start.col), CellRef::new(MAX_ROWS - 1, r.end.col));
|
||||
if sh.cells.iter_range(last).any(|(_, x)| x.has_content()) {
|
||||
if sh.cells.iter_range(last).any(|(_, x)| x.formula.is_some() || !x.value.is_empty()) {
|
||||
return Err(EngineError::Other("To prevent possible loss of data, cells can't be pushed off the end of the worksheet.".into()));
|
||||
}
|
||||
sh.cells.shift_rows_in_cols(r.start.col, r.end.col, r.start.row, 1);
|
||||
@@ -216,10 +211,7 @@ fn write_totals(sh: &mut Sheet, ti: usize) {
|
||||
let c = CellRef::new(row, t.range.start.col + i as u32);
|
||||
if let Some(code) = col.totals.subtotal_code() {
|
||||
let f = format!("=SUBTOTAL({code},{}[{}])", t.name, col.name);
|
||||
sh.set_cell(
|
||||
c,
|
||||
Cell { formula: Some(std::sync::Arc::new(Formula::new(&f))), value: gridcraft_core::Value::Empty, style: sh.style_id(c), py: None },
|
||||
);
|
||||
sh.set_cell(c, Cell { formula: Some(std::sync::Arc::new(Formula::new(&f))), value: gridcraft_core::Value::Empty, style: sh.style_id(c) });
|
||||
} else if let Some(l) = &col.totals_label {
|
||||
sh.set_value(c, gridcraft_core::Value::text(l.as_str()));
|
||||
} else {
|
||||
|
||||
@@ -628,312 +628,6 @@ fn calculated_field_errors() {
|
||||
assert!(matches!(s.ui_requests.last(), Some(crate::UiRequest::Dialog(n, _)) if n == "pivotCalculatedField"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_reads_the_report() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "columns": ["Product"], "values": ["Sales"]})).unwrap();
|
||||
assert_eq!(pt(&s).last_range.unwrap().a1(), "A3:E8");
|
||||
let gp = |s: &mut Session, cell: &str, f: &str| {
|
||||
s.execute("cell.set", json!({"cell": cell, "input": f})).unwrap();
|
||||
val(s, cell)
|
||||
};
|
||||
// Item cell, row subtotal by any cell of the report, grand total; names and items ignore case.
|
||||
assert_eq!(gp(&mut s, "G1", r#"=GETPIVOTDATA("Sales",$A$3,"Region","East","Product","Apples")"#), Value::Number(160.0));
|
||||
assert_eq!(gp(&mut s, "G2", r#"=GETPIVOTDATA("sales",C6,"region","east")"#), Value::Number(415.0));
|
||||
assert_eq!(gp(&mut s, "G3", r#"=GETPIVOTDATA("Sum of Sales",A3)"#), Value::Number(TOTAL));
|
||||
assert_eq!(gp(&mut s, "G4", r#"=GETPIVOTDATA("Sales",A3,"Product","Pears")"#), Value::Number(270.0));
|
||||
// Not in the report: unknown item, value field, field, unpaired field, not a pivot cell.
|
||||
for (cell, f) in [
|
||||
("H1", r#"=GETPIVOTDATA("Sales",A3,"Region","South")"#),
|
||||
("H2", r#"=GETPIVOTDATA("Units",A3)"#),
|
||||
("H3", r#"=GETPIVOTDATA("Sales",A3,"Date","East")"#),
|
||||
("H4", r#"=GETPIVOTDATA("Sales",A3,"Region")"#),
|
||||
("H5", r#"=GETPIVOTDATA("Sales",Z99)"#),
|
||||
("H6", r#"=GETPIVOTDATA("Sales",A3,"Region","East","Region","East")"#),
|
||||
] {
|
||||
assert_eq!(gp(&mut s, cell, f), Value::Error(CellError::Ref), "{f}");
|
||||
}
|
||||
assert_eq!(gp(&mut s, "H7", r#"=GETPIVOTDATA("Sales",A3,"Region",NA())"#), Value::Error(CellError::NA));
|
||||
// A refresh after a source edit updates the result.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "E2", "input": "1100"})).unwrap();
|
||||
s.execute("data.refreshAll", json!({})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(val(&s, "G1"), Value::Number(1160.0));
|
||||
// Opening a saved workbook starts without an index (files don't carry it); the first
|
||||
// GETPIVOTDATA builds it.
|
||||
let wb = (*s.doc().unwrap().wb).clone();
|
||||
let (back, _) = gridcraft_xlsx::read_xlsx(&gridcraft_xlsx::write_xlsx(&wb).unwrap()).unwrap();
|
||||
s.add_document(crate::DocState::new(back, None, "Reopened".into(), crate::Trust::FromFile));
|
||||
let d = s.doc().unwrap();
|
||||
let sh = d.wb.sheet(d.wb.sheet_index("Sheet2").unwrap()).unwrap();
|
||||
assert!(sh.pivots.first().unwrap().data_index.cells().is_some());
|
||||
assert_eq!(sh.value(CellRef::parse("G1").unwrap()), Value::Number(1160.0));
|
||||
assert_eq!(sh.value(CellRef::parse("G3").unwrap()), Value::Number(TOTAL + 1000.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_reads_the_displayed_report() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
// The source changes after the last refresh, then the workbook is saved and reopened:
|
||||
// the report still shows the old numbers, and the formula agrees with the cell.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "E2", "input": "1100"})).unwrap();
|
||||
let wb = (*s.doc().unwrap().wb).clone();
|
||||
let (back, _) = gridcraft_xlsx::read_xlsx(&gridcraft_xlsx::write_xlsx(&wb).unwrap()).unwrap();
|
||||
s.add_document(crate::DocState::new(back, None, "Reopened".into(), crate::Trust::FromFile));
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
let r = pt(&s).last_range.unwrap();
|
||||
let at = r.start.a1();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": format!(r#"=GETPIVOTDATA("Sales",{at},"Region","East")"#)})).unwrap();
|
||||
let d = s.doc().unwrap();
|
||||
let sh = d.wb.sheet(d.wb.sheet_index("Sheet2").unwrap()).unwrap();
|
||||
let east = (r.start.row..=r.end.row).find(|row| sh.value(CellRef::new(*row, r.start.col)) == Value::Text("East".into())).unwrap();
|
||||
let shown = sh.value(CellRef::new(east, r.start.col + 1));
|
||||
assert_eq!(shown, Value::Number(415.0));
|
||||
assert_eq!(val(&s, "K1"), shown);
|
||||
}
|
||||
|
||||
/// `=GETPIVOTDATA("Sales", <report>, "Region", <region>)` evaluated in K1 of the active sheet.
|
||||
fn region_sales(s: &mut Session, region: &str) -> Value {
|
||||
let at = pt(s).last_range.unwrap().start.a1();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": format!(r#"=GETPIVOTDATA("Sales",{at},"Region","{region}")"#)})).unwrap();
|
||||
val(s, "K1")
|
||||
}
|
||||
|
||||
fn reopen(s: &mut Session) {
|
||||
let wb = (*s.doc().unwrap().wb).clone();
|
||||
let (back, _) = gridcraft_xlsx::read_xlsx(&gridcraft_xlsx::write_xlsx(&wb).unwrap()).unwrap();
|
||||
s.add_document(crate::DocState::new(back, None, "Reopened".into(), crate::Trust::FromFile));
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_retries_after_a_lazy_build_fails() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
// A pivot read from a file carries no index, so the first lookup builds one.
|
||||
reopen(&mut s);
|
||||
assert!(pt(&s).data_index.cells().is_none());
|
||||
// The source changes, so the stored report is stale and the build finds nothing to trust.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "Alpha"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Error(CellError::Ref));
|
||||
assert!(pt(&s).data_index.cells().is_none(), "the failed build caches nothing");
|
||||
// The lookup is shared, so caching a failure as an empty index would leave every state that
|
||||
// shares it #REF! for good. Restoring the source lets the lookup build the index.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "East"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
assert!(pt(&s).data_index.cells().is_some(), "the lookup rebuilt after the failure");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_saves_no_index_when_the_lazy_build_fails() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
// A pivot read from a file carries no index; a source change makes the stored report stale,
|
||||
// so the lazy build fails and the lookup is #REF!.
|
||||
reopen(&mut s);
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "Alpha"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Error(CellError::Ref));
|
||||
// Saving the pivot must save no index at all, not an empty one: restoring an empty index
|
||||
// would count as an index and lock the reopened pivot against the lazy rebuild.
|
||||
let json = serde_json::to_string(&pt(&s)).unwrap();
|
||||
let back: gridcraft_model::PivotTable = serde_json::from_str(&json).unwrap();
|
||||
assert!(json.contains(r#""data_index":null"#), "a failed build saves no index, not an empty one: {json}");
|
||||
assert!(back.data_index.cells().is_none());
|
||||
// Reopened with the source restored, the lookup builds the index.
|
||||
reopen(&mut s);
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "East"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_keeps_the_refreshed_report_when_an_item_is_inserted() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
// A new first item in the source shifts every item of a fresh report down one row.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "Alpha"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
// Before the refresh the report still shows the old items, and the lookup reads that report.
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
assert_eq!(region_sales(&mut s, "Alpha"), Value::Error(CellError::Ref));
|
||||
// Saved and reopened unrefreshed: the stored report no longer matches the source, so there
|
||||
// is no index to trust (never the shifted cell of a different item).
|
||||
reopen(&mut s);
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Error(CellError::Ref));
|
||||
assert_eq!(region_sales(&mut s, "Alpha"), Value::Error(CellError::Ref));
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("data.refreshAll", json!({})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "Alpha"), Value::Number(100.0));
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
assert_eq!(region_sales(&mut s, "East"), Value::Number(315.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_keeps_the_refreshed_report_when_an_item_is_removed() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "North"), Value::Number(135.0));
|
||||
// Every North row becomes East: North leaves the report and West moves up.
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
for a in ["A5", "A8", "A11"] {
|
||||
s.execute("cell.set", json!({"cell": a, "input": "East"})).unwrap();
|
||||
}
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "North"), Value::Number(135.0));
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
reopen(&mut s);
|
||||
assert_eq!(region_sales(&mut s, "North"), Value::Error(CellError::Ref));
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Error(CellError::Ref));
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("data.refreshAll", json!({})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
assert_eq!(region_sales(&mut s, "North"), Value::Error(CellError::Ref));
|
||||
assert_eq!(region_sales(&mut s, "West"), Value::Number(285.0));
|
||||
assert_eq!(region_sales(&mut s, "East"), Value::Number(550.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_index_is_saved_with_an_unrefreshed_pivot() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "Alpha"})).unwrap();
|
||||
s.execute("sheet.activate", json!({"sheet": "Sheet2"})).unwrap();
|
||||
// The pivot as saved by the native format: the index of the stored report comes back with
|
||||
// it even though the source has since changed.
|
||||
let back: gridcraft_model::PivotTable = serde_json::from_str(&serde_json::to_string(&pt(&s)).unwrap()).unwrap();
|
||||
let cells = back.data_index.cells().expect("index saved");
|
||||
assert_eq!(cells, pt(&s).data_index.cells().unwrap());
|
||||
let west = back.data_index.find("Sales", &[("Region", "West", false)]).unwrap();
|
||||
assert_eq!((west.row, west.col), (3, 1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_calculated_field() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Region"], "values": ["Sales"]})).unwrap();
|
||||
s.execute("pivot.calculatedField", json!({"name": "Double", "formula": "=Sales*2"})).unwrap();
|
||||
let at = pt(&s).last_range.unwrap().start.a1();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": format!(r#"=GETPIVOTDATA("Double",{at},"Region","East")"#)})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(830.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn getpivotdata_report_filter() {
|
||||
let mut s = sales();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Product"], "values": ["Sales"], "filters": ["Region"]})).unwrap();
|
||||
let at = pt(&s).last_range.unwrap().start.a1();
|
||||
let f = |region: &str| format!(r#"=GETPIVOTDATA("Sales",{at},"Region","{region}","Product","Apples")"#);
|
||||
// With every item shown, naming the filter field is #REF!.
|
||||
s.execute("cell.set", json!({"cell": "H1", "input": f("East")})).unwrap();
|
||||
assert_eq!(val(&s, "H1"), Value::Error(CellError::Ref));
|
||||
// Filtered to East: East matches, West doesn't.
|
||||
s.execute("pivot.filter", json!({"field": "Region", "selected": ["East"]})).unwrap();
|
||||
assert_eq!(val(&s, "H1"), Value::Number(160.0));
|
||||
s.execute("cell.set", json!({"cell": "H2", "input": f("West")})).unwrap();
|
||||
assert_eq!(val(&s, "H2"), Value::Error(CellError::Ref));
|
||||
}
|
||||
|
||||
/// A workbook whose Sheet1 holds `rows` under a two-column header, with a PivotTable of the first
|
||||
/// column (rows) and the second (sum) on a new sheet; the report sheet is active.
|
||||
fn two_column_pivot(header: [&str; 2], rows: Json, key_format: Option<&str>) -> Session {
|
||||
let mut s = Session::new();
|
||||
s.new_workbook();
|
||||
let n = rows.as_array().map_or(0, Vec::len);
|
||||
let mut all = vec![json!(header)];
|
||||
all.extend(rows.as_array().cloned().unwrap_or_default());
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": all})).unwrap();
|
||||
if let Some(code) = key_format {
|
||||
s.execute("home.numberFormat", json!({"range": format!("A2:A{}", n + 1), "code": code})).unwrap();
|
||||
}
|
||||
s.execute("selection.set", json!({"range": "A1"})).unwrap();
|
||||
s.execute("insert.pivotTable", json!({"rows": [header[0]], "values": [header[1]]})).unwrap();
|
||||
s
|
||||
}
|
||||
|
||||
/// The value the report shows for the row item `label` (one value field: the report's last column).
|
||||
fn shown(s: &Session, label: &str) -> Value {
|
||||
let r = pt(s).last_range.unwrap();
|
||||
let row = find_row(s, label).unwrap_or_else(|| panic!("{label} is not in the report"));
|
||||
val(s, &CellRef::new(row, r.end.col).a1())
|
||||
}
|
||||
|
||||
/// Inserting or deleting rows or columns inside a report keeps GETPIVOTDATA on the requested
|
||||
/// item's cell (the stored offsets move with the cells), and undo restores the old positions.
|
||||
#[test]
|
||||
fn getpivotdata_follows_rows_and_columns_edited_inside_the_report() {
|
||||
let mut s = two_column_pivot(["Region", "Sales"], json!([["East", 10], ["North", 30], ["West", 20]]), None);
|
||||
assert_eq!(pt(&s).last_range.unwrap().start.a1(), "A3");
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": r#"=GETPIVOTDATA("Sales",A3,"Region","West")"#})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K2", "input": r#"=GETPIVOTDATA("Sales",A3,"Region","North")"#})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(20.0));
|
||||
// Row 4 splits the header from the items; column B splits the labels from the values (and
|
||||
// moves the formulas from K to L).
|
||||
for (cmd, lines, west, north) in
|
||||
[("home.insertRows", json!({"rows": "4:4"}), "K1", "K2"), ("home.insertColumns", json!({"cols": "B:B"}), "L1", "L2")]
|
||||
{
|
||||
s.execute(cmd, lines).unwrap();
|
||||
assert_eq!(shown(&s, "West"), Value::Number(20.0), "{cmd}");
|
||||
assert_eq!(val(&s, west), shown(&s, "West"), "{cmd}");
|
||||
assert_eq!(val(&s, north), shown(&s, "North"), "{cmd}");
|
||||
}
|
||||
s.execute("edit.undo", json!({})).unwrap();
|
||||
s.execute("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(pt(&s).last_range.unwrap().start.a1(), "A3");
|
||||
s.execute("cell.set", json!({"cell": "K3", "input": r#"=GETPIVOTDATA("Sales",A3,"Region","West")"#})).unwrap();
|
||||
assert_eq!(val(&s, "K3"), Value::Number(20.0), "undo restores the report and its offsets");
|
||||
// Deleting North's row moves West up; North itself is gone from the report.
|
||||
let north = find_row(&s, "North").unwrap() + 1;
|
||||
s.execute("home.deleteRows", json!({"rows": format!("{north}:{north}")})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": r#"=GETPIVOTDATA("Sales",A3,"Region","West")"#})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K2", "input": r#"=GETPIVOTDATA("Sales",A3,"Region","North")"#})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(20.0));
|
||||
assert_eq!(val(&s, "K1"), shown(&s, "West"));
|
||||
assert_eq!(val(&s, "K2"), Value::Error(CellError::Ref), "a deleted value cell is not read from its old place");
|
||||
// Lines inserted at the report's first line move the whole report, and lines right after it
|
||||
// leave it alone; either way the offsets stay what they were.
|
||||
for rows in ["3:3", "9:9"] {
|
||||
s.execute("home.insertRows", json!({"rows": rows})).unwrap();
|
||||
let at = pt(&s).last_range.unwrap().start.a1();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": format!(r#"=GETPIVOTDATA("Sales",{at},"Region","West")"#)})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(20.0), "insert {rows}");
|
||||
assert_eq!(val(&s, "K1"), shown(&s, "West"), "insert {rows}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Numeric items whose formatted labels collide are told apart by value: an exact numeric item
|
||||
/// wins over another item that only displays the same label.
|
||||
#[test]
|
||||
fn getpivotdata_matches_numeric_items_by_value_before_label() {
|
||||
let mut s = two_column_pivot(["Key", "Sales"], json!([[0.6, 10], [1, 20]]), Some("0"));
|
||||
let p = pt(&s);
|
||||
let labels: Vec<&str> = p.data_index.cells().unwrap().iter().flat_map(|c| c.items.iter().map(|i| i.label.as_str())).collect();
|
||||
assert_eq!(labels, ["1", "1"], "both items display as 1");
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": r#"=GETPIVOTDATA("Sales",A3,"Key",1)"#})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K2", "input": r#"=GETPIVOTDATA("Sales",A3,"Key",0.6)"#})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(20.0));
|
||||
assert_eq!(val(&s, "K2"), Value::Number(10.0));
|
||||
// Dates: two times on one day show the same date label; each serial finds its own item.
|
||||
let mut s = two_column_pivot(["Day", "Sales"], json!([[45000, 10], [45000.25, 20]]), Some("m/d/yyyy"));
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": r#"=GETPIVOTDATA("Sales",A3,"Day",45000.25)"#})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K2", "input": r#"=GETPIVOTDATA("Sales",A3,"Day",45000)"#})).unwrap();
|
||||
assert_eq!(val(&s, "K1"), Value::Number(20.0));
|
||||
assert_eq!(val(&s, "K2"), Value::Number(10.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn replace_protection() {
|
||||
let mut s = sales();
|
||||
@@ -1368,34 +1062,6 @@ fn detail_cells_are_the_cells_show_details_takes() {
|
||||
assert!(crate::pivot::detail_cells(&d.wb, pt, d.wb.active_sheet()).unwrap_err().contains("out of date"));
|
||||
}
|
||||
|
||||
/// Measurement, not a check: `perf stat -e instructions:u` of this test with `PIVOT_BENCH_EDITS=0`
|
||||
/// and `=20` (and `PIVOT_BENCH_REOPEN=0/1`) gives the cost of edits on the report's sheet and of
|
||||
/// opening a saved workbook, with the setup subtracted. `PIVOT_BENCH_ROWS` is the source size.
|
||||
#[test]
|
||||
#[ignore = "measurement only"]
|
||||
fn bench_edit_on_sheet_with_large_report() {
|
||||
let env = |k: &str, d: usize| std::env::var(k).ok().and_then(|v| v.parse().ok()).unwrap_or(d);
|
||||
let (n, edits) = (env("PIVOT_BENCH_ROWS", 100_000), env("PIVOT_BENCH_EDITS", 0));
|
||||
let mut s = Session::new();
|
||||
s.new_workbook();
|
||||
let mut rows = vec![json!(["Id", "Product", "Sales"])];
|
||||
rows.extend((0..n).map(|i| {
|
||||
let (id, product) = (format!("id{i:07}"), ["Apples", "Pears", "Plums"][i % 3]);
|
||||
json!([id, product, i])
|
||||
}));
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": rows})).unwrap();
|
||||
s.execute("selection.set", json!({"range": "A1"})).unwrap();
|
||||
s.execute("insert.pivotTable", json!({"rows": ["Id"], "columns": ["Product"], "values": ["Sales"]})).unwrap();
|
||||
for i in 0..edits {
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": i.to_string()})).unwrap();
|
||||
}
|
||||
if env("PIVOT_BENCH_REOPEN", 0) == 1 {
|
||||
let wb = (*s.doc().unwrap().wb).clone();
|
||||
let (back, _) = gridcraft_xlsx::read_xlsx(&gridcraft_xlsx::write_xlsx(&wb).unwrap()).unwrap();
|
||||
s.add_document(crate::DocState::new(back, None, "Reopened".into(), crate::Trust::FromFile));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rank_ties_are_dense_and_count_numbers_is_captioned_count_of() {
|
||||
// #1448 items 10 and 12: Excel ranks 5, 4, 3, 3, 4 as 1, 2, 3, 3, 2 (GridCraft gave 1, 2, 4,
|
||||
|
||||
@@ -13,15 +13,13 @@ use gridcraft_core::{CellRef, MAX_COLS, MAX_ROWS, RangeRef, Value};
|
||||
#[cfg(test)]
|
||||
use gridcraft_model::{Alignment, Image, SheetViewMode};
|
||||
use gridcraft_model::{
|
||||
Anchor, BorderLine, BorderStyle, Borders, Color, HAlign, Orientation, PageOrder, PatternType, PrintSettings, ReadingOrder, ShapeKind, Sheet,
|
||||
Style, StyleId, StyleTable, Underline, VAlign, Visibility, Workbook,
|
||||
Anchor, BorderLine, BorderStyle, Borders, Color, HAlign, Orientation, PageOrder, PatternType, PrintSettings, ShapeKind, Sheet, Style, StyleId,
|
||||
StyleTable, Underline, VAlign, Visibility, Workbook,
|
||||
};
|
||||
use gridcraft_pdf::{Baseline, Font, Page, PdfDoc, Point, Rect, Rgb, TextDirection};
|
||||
use gridcraft_pdf::{Font, Page, PdfDoc, Point, Rect, Rgb};
|
||||
use serde_json::{Value as Json, json};
|
||||
|
||||
use super::{
|
||||
CommandSpec, EngineError, Result, Session, bad, bool_param, cmd, edit, f64_param, has_doc, split_sheet, str_param, target_sheet, u32_param,
|
||||
};
|
||||
use super::{CommandSpec, Result, Session, bad, bool_param, cmd, edit, f64_param, has_doc, split_sheet, str_param, target_sheet, u32_param};
|
||||
|
||||
mod draw;
|
||||
mod header_footer;
|
||||
@@ -153,17 +151,8 @@ pub(crate) const PX_TO_PT: f32 = 0.75;
|
||||
/// Most pages one export produces.
|
||||
pub const MAX_PAGES: usize = 2000;
|
||||
|
||||
/// A rendered PDF and whether some of its Arabic text was set without an Arabic face.
|
||||
pub struct RenderedPdf {
|
||||
pub bytes: Vec<u8>,
|
||||
pub pages: usize,
|
||||
pub missing_arabic_font: bool,
|
||||
}
|
||||
|
||||
const MISSING_ARABIC_FONT: &str = "Some Arabic text could not be drawn in this PDF because no Noto Sans Arabic face was found for it.";
|
||||
|
||||
/// Renders laid-out sheets to a PDF.
|
||||
pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str) -> Result<RenderedPdf> {
|
||||
pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str) -> (Vec<u8>, usize) {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.info.title = if wb.props.title.is_empty() { file.to_string() } else { wb.props.title.clone() };
|
||||
doc.info.author = wb.props.author.clone();
|
||||
@@ -199,16 +188,7 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str
|
||||
let b = make_block(wb, lay.sheet, sh, *rs, *cs, (x, y), lay);
|
||||
draw_block(pg, &b, lay.settings.gridlines, &mut cf);
|
||||
draw_block_links(pg, &b, page_index, &mut pending_links);
|
||||
printed_blocks.push(PrintedBlock {
|
||||
page: page_index,
|
||||
sheet: lay.sheet,
|
||||
rows: *rs,
|
||||
cols: *cs,
|
||||
x,
|
||||
y,
|
||||
k,
|
||||
mirror_axis: sh.right_to_left.then_some(b.mirror_axis),
|
||||
});
|
||||
printed_blocks.push(PrintedBlock { page: page_index, sheet: lay.sheet, rows: *rs, cols: *cs, x, y, k });
|
||||
if lay.settings.headings {
|
||||
draw_headings(pg, &b, rsi == 0, csi == 0, (ox, oy), (lay.heading_w * k, lay.heading_h * k));
|
||||
}
|
||||
@@ -224,7 +204,6 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str
|
||||
}
|
||||
if lay.settings.headings {
|
||||
let fill = [0xF2, 0xF2, 0xF2];
|
||||
let ox = if sh.right_to_left { lay.page_w - ox - lay.heading_w * k } else { ox };
|
||||
pg.fill_rect(ox, oy, lay.heading_w * k, lay.heading_h * k, fill);
|
||||
pg.rect_stroke(ox, oy, lay.heading_w * k, lay.heading_h * k, 0.3, [0xA0, 0xA0, 0xA0]);
|
||||
}
|
||||
@@ -248,24 +227,18 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str
|
||||
page.link_page(Rect::new(lx, ly, w, h), target_page, Point::new(x, y));
|
||||
}
|
||||
}
|
||||
let pages = doc.page_count();
|
||||
let missing_arabic_font = doc.missing_arabic_font();
|
||||
let bytes = doc.finish().map_err(|error| EngineError::Other(error.to_string()))?;
|
||||
Ok(RenderedPdf { bytes, pages, missing_arabic_font })
|
||||
let n = doc.page_count();
|
||||
(doc.finish(), n)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- commands
|
||||
|
||||
fn build_pdf(s: &mut Session, p: &Json, cmd: &str) -> Result<(Vec<u8>, usize)> {
|
||||
fn build_pdf(s: &Session, p: &Json, cmd: &str) -> Result<(Vec<u8>, usize)> {
|
||||
let opts = PrintOptions::from_params(p, cmd)?;
|
||||
let d = s.doc()?;
|
||||
let lays = layouts(&d.wb, &opts);
|
||||
let path = d.path.clone().unwrap_or_default();
|
||||
let pdf = render_pdf(&d.wb, &lays, &d.display_title(), &path)?;
|
||||
if pdf.missing_arabic_font {
|
||||
s.ui_requests.push(crate::UiRequest::Message(MISSING_ARABIC_FONT.into()));
|
||||
}
|
||||
Ok((pdf.bytes, pdf.pages))
|
||||
Ok(render_pdf(&d.wb, &lays, &d.display_title(), &path))
|
||||
}
|
||||
|
||||
pub(crate) fn export_pdf(s: &mut Session, p: &Json) -> Result<Json> {
|
||||
|
||||
@@ -32,9 +32,6 @@ fn cell_look(wb: &Workbook, si: usize, sh: &Sheet, c: CellRef, cf: &mut Option<c
|
||||
};
|
||||
let cfl = cf.as_mut().and_then(|cache| cache.look(wb, si, c));
|
||||
if let Some(st) = cfl.as_ref().and_then(|l| l.style.as_ref()) {
|
||||
if st.align.reading_order.is_some() {
|
||||
style.align.reading_order = st.align.reading_order;
|
||||
}
|
||||
if st.fill.pattern != PatternType::None {
|
||||
style.fill = st.fill;
|
||||
}
|
||||
@@ -175,20 +172,9 @@ pub(super) struct Block<'a> {
|
||||
pub(super) ys: Vec<f32>,
|
||||
pub(super) k: f32,
|
||||
pub(super) scale: f32,
|
||||
pub(super) mirror_axis: f32,
|
||||
}
|
||||
|
||||
impl Block<'_> {
|
||||
fn point_x(&self, x: f32) -> f32 {
|
||||
if self.sh.right_to_left { self.mirror_axis - x } else { x }
|
||||
}
|
||||
pub(super) fn text_x(&self, x: f32, width: f32) -> f32 {
|
||||
if self.sh.right_to_left { self.mirror_axis - x - width } else { x }
|
||||
}
|
||||
pub(super) fn drawn_rect(&self, r: RangeRef) -> (f32, f32, f32, f32) {
|
||||
let (x, y, w, h) = self.rect(r);
|
||||
(self.text_x(x, w), y, w, h)
|
||||
}
|
||||
fn x(&self, col: u32) -> f32 {
|
||||
if col >= self.cols.0 && col <= self.cols.1 + 1 {
|
||||
return self.xs.get((col - self.cols.0) as usize).copied().unwrap_or(0.0);
|
||||
@@ -342,15 +328,15 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
set
|
||||
};
|
||||
pg.save();
|
||||
pg.clip_rect(b.text_x(bx, bw), by, bw, bh);
|
||||
pg.clip_rect(bx, by, bw, bh);
|
||||
if gridlines {
|
||||
let grey = [0xB0, 0xB0, 0xB0];
|
||||
let lw = (0.35 * b.scale).clamp(0.1, 0.5);
|
||||
for x in &b.xs {
|
||||
pg.stroke_line(b.point_x(*x), by, b.point_x(*x), by + bh, lw, grey);
|
||||
pg.stroke_line(*x, by, *x, by + bh, lw, grey);
|
||||
}
|
||||
for y in &b.ys {
|
||||
pg.stroke_line(b.point_x(bx), *y, b.point_x(bx + bw), *y, lw, grey);
|
||||
pg.stroke_line(bx, *y, bx + bw, *y, lw, grey);
|
||||
}
|
||||
}
|
||||
// Cheap pre-filter: blank, unstyled cells outside tables and conditional formats draw nothing.
|
||||
@@ -393,17 +379,17 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
continue;
|
||||
}
|
||||
if let Some(f) = l.fill {
|
||||
pg.fill_rect(b.text_x(x, w), y, w, h, f);
|
||||
pg.fill_rect(x, y, w, h, f);
|
||||
} else if merged && gridlines {
|
||||
pg.fill_rect(b.text_x(x, w), y, w, h, [255, 255, 255]);
|
||||
pg.fill_rect(x, y, w, h, [255, 255, 255]);
|
||||
}
|
||||
if merged && gridlines {
|
||||
pg.rect_stroke(b.text_x(x, w), y, w, h, (0.35 * b.scale).clamp(0.1, 0.5), [0xB0, 0xB0, 0xB0]);
|
||||
pg.rect_stroke(x, y, w, h, (0.35 * b.scale).clamp(0.1, 0.5), [0xB0, 0xB0, 0xB0]);
|
||||
}
|
||||
if let Some((frac, rgb, _)) = l.cf.as_ref().and_then(|cf| cf.bar) {
|
||||
let pad = 1.5 * b.k;
|
||||
let bwid = ((w - 2.0 * pad) * frac.clamp(0.0, 1.0)).max(0.0);
|
||||
pg.fill_rect(b.text_x(x + pad, bwid), y + pad, bwid, (h - 2.0 * pad).max(0.0), rgb);
|
||||
pg.fill_rect(x + pad, y + pad, bwid, (h - 2.0 * pad).max(0.0), rgb);
|
||||
}
|
||||
}
|
||||
// Borders.
|
||||
@@ -420,12 +406,12 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
),
|
||||
None => (bd.right, bd.bottom),
|
||||
};
|
||||
draw_border(pg, &bd.top, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x + w), y), b.k);
|
||||
draw_border(pg, &bottom, b.wb, Point::new(b.point_x(x), y + h), Point::new(b.point_x(x + w), y + h), b.k);
|
||||
draw_border(pg, &bd.left, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x), y + h), b.k);
|
||||
draw_border(pg, &right, b.wb, Point::new(b.point_x(x + w), y), Point::new(b.point_x(x + w), y + h), b.k);
|
||||
draw_border(pg, &bd.diag_down, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x + w), y + h), b.k);
|
||||
draw_border(pg, &bd.diag_up, b.wb, Point::new(b.point_x(x), y + h), Point::new(b.point_x(x + w), y), b.k);
|
||||
draw_border(pg, &bd.top, b.wb, Point::new(x, y), Point::new(x + w, y), b.k);
|
||||
draw_border(pg, &bottom, b.wb, Point::new(x, y + h), Point::new(x + w, y + h), b.k);
|
||||
draw_border(pg, &bd.left, b.wb, Point::new(x, y), Point::new(x, y + h), b.k);
|
||||
draw_border(pg, &right, b.wb, Point::new(x + w, y), Point::new(x + w, y + h), b.k);
|
||||
draw_border(pg, &bd.diag_down, b.wb, Point::new(x, y), Point::new(x + w, y + h), b.k);
|
||||
draw_border(pg, &bd.diag_up, b.wb, Point::new(x, y + h), Point::new(x + w, y), b.k);
|
||||
}
|
||||
// Text.
|
||||
for (c, l) in &looks {
|
||||
@@ -434,9 +420,9 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt
|
||||
continue;
|
||||
}
|
||||
if let Some(picture) = sh.cell_pictures.get(c) {
|
||||
draw_cell_picture(pg, &picture.data, (b.text_x(x, w), y, w, h), b.k);
|
||||
draw_cell_picture(pg, &picture.data, (x, y, w, h), b.k);
|
||||
} else if let Some(on) = checkbox_state(l, &sh.value(*c)) {
|
||||
draw_checkbox(pg, (b.text_x(x, w), y, w, h), b.k, on);
|
||||
draw_checkbox(pg, (x, y, w, h), b.k, on);
|
||||
} else {
|
||||
draw_text(pg, b, TextPlacement { cell: *c, look: l, rect: (x, y, w, h), merged, merges: &merges, limits: (bx, bx + bw) });
|
||||
}
|
||||
@@ -490,8 +476,6 @@ pub(super) struct PrintedBlock {
|
||||
pub(super) x: f32,
|
||||
pub(super) y: f32,
|
||||
pub(super) k: f32,
|
||||
/// The page x that right-to-left sheets are mirrored about; `None` for left-to-right sheets.
|
||||
pub(super) mirror_axis: Option<f32>,
|
||||
}
|
||||
|
||||
/// PDF annotations are not affected by graphics clipping, so intersect each cell with its page
|
||||
@@ -511,7 +495,7 @@ pub(super) fn draw_block_links(pg: &mut Page, b: &Block, page: usize, pending: &
|
||||
if x1 <= x0 || y1 <= y0 {
|
||||
continue;
|
||||
}
|
||||
let rect = (b.text_x(x0, x1 - x0), y0, x1 - x0, y1 - y0);
|
||||
let rect = (x0, y0, x1 - x0, y1 - y0);
|
||||
match crate::links::classify(&link.target) {
|
||||
crate::links::LinkKind::External(uri) => pg.link_uri(rect.0, rect.1, rect.2, rect.3, &uri),
|
||||
crate::links::LinkKind::Internal(target) if !link.external => {
|
||||
@@ -530,10 +514,6 @@ pub(super) fn printed_target(wb: &Workbook, blocks: &[PrintedBlock], source_shee
|
||||
let sh = wb.sheet(sheet)?;
|
||||
let block = blocks.iter().find(|b| b.sheet == sheet && (b.rows.0..=b.rows.1).contains(&cell.row) && (b.cols.0..=b.cols.1).contains(&cell.col))?;
|
||||
let x = block.x + (sh.col_left(cell.col) - sh.col_left(block.cols.0)) as f32 * block.k;
|
||||
let x = match block.mirror_axis {
|
||||
Some(axis) => axis - x - (sh.col_left(cell.col.saturating_add(1)) - sh.col_left(cell.col)) as f32 * block.k,
|
||||
None => x,
|
||||
};
|
||||
let y = block.y + (sh.row_top(cell.row) - sh.row_top(block.rows.0)) as f32 * block.k;
|
||||
Some((block.page, x, y))
|
||||
}
|
||||
@@ -550,11 +530,11 @@ pub(super) fn draw_headings(pg: &mut Page, b: &Block, col_heads: bool, row_heads
|
||||
if x1 - x0 <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
pg.fill_rect(b.text_x(x0, x1 - x0), y, x1 - x0, size.1, fill);
|
||||
pg.rect_stroke(b.text_x(x0, x1 - x0), y, x1 - x0, size.1, lw, line);
|
||||
pg.fill_rect(x0, y, x1 - x0, size.1, fill);
|
||||
pg.rect_stroke(x0, y, x1 - x0, size.1, lw, line);
|
||||
let t = gridcraft_core::col_to_letters(col);
|
||||
let tw = gridcraft_pdf::text_width(Font::Helvetica, fsize, &t);
|
||||
pg.text(b.text_x(x0 + (x1 - x0 - tw) / 2.0, tw), y + size.1 / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t);
|
||||
pg.text(x0 + (x1 - x0 - tw) / 2.0, y + size.1 / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t);
|
||||
}
|
||||
}
|
||||
if row_heads {
|
||||
@@ -564,11 +544,11 @@ pub(super) fn draw_headings(pg: &mut Page, b: &Block, col_heads: bool, row_heads
|
||||
if y1 - y0 <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
pg.fill_rect(b.text_x(x, size.0), y0, size.0, y1 - y0, fill);
|
||||
pg.rect_stroke(b.text_x(x, size.0), y0, size.0, y1 - y0, lw, line);
|
||||
pg.fill_rect(x, y0, size.0, y1 - y0, fill);
|
||||
pg.rect_stroke(x, y0, size.0, y1 - y0, lw, line);
|
||||
let t = (row + 1).to_string();
|
||||
let tw = gridcraft_pdf::text_width(Font::Helvetica, fsize, &t);
|
||||
pg.text(b.text_x(x + (size.0 - tw) / 2.0, tw), y0 + (y1 - y0) / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t);
|
||||
pg.text(x + (size.0 - tw) / 2.0, y0 + (y1 - y0) / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -599,7 +579,7 @@ pub(super) fn make_block<'a>(
|
||||
acc += sh.row_height(r) * k;
|
||||
ys.push(acc);
|
||||
}
|
||||
Block { wb, si, sh, rows, cols, xs, ys, k, scale: lay.scale, mirror_axis: lay.page_w }
|
||||
Block { wb, si, sh, rows, cols, xs, ys, k, scale: lay.scale }
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use super::draw::{Block, PdfMeasure, Xf, draw_prims, rgb_of};
|
||||
use super::text::wrap_lines;
|
||||
use super::{Anchor, Font, Page, Point, RangeRef, Rect, ShapeKind, Sheet, TextDirection, Value, Workbook};
|
||||
use super::{Anchor, Font, Page, RangeRef, Rect, ShapeKind, Sheet, Value, Workbook};
|
||||
|
||||
/// Cell pictures fit the current cell (or merged-cell) rectangle without changing aspect ratio.
|
||||
pub(super) fn draw_cell_picture(pg: &mut Page, data: &[u8], rect: (f32, f32, f32, f32), k: f32) {
|
||||
@@ -76,11 +76,9 @@ pub(super) fn draw_objects(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet,
|
||||
let (bx, by) = (b.xs.first().copied().unwrap_or(0.0), b.ys.first().copied().unwrap_or(0.0));
|
||||
let (bw, bh) = (b.xs.last().copied().unwrap_or(bx) - bx, b.ys.last().copied().unwrap_or(by) - by);
|
||||
let visible = |r: (f64, f64, f64, f64)| r.2 > 0.0 && r.3 > 0.0 && r.0 < sx1 && r.0 + r.2 > sx0 && r.1 < sy1 && r.1 + r.3 > sy0;
|
||||
let place = |r: (f64, f64, f64, f64)| {
|
||||
(b.text_x(bx + ((r.0 - sx0) as f32) * b.k, r.2 as f32 * b.k), by + ((r.1 - sy0) as f32) * b.k, r.2 as f32 * b.k, r.3 as f32 * b.k)
|
||||
};
|
||||
let place = |r: (f64, f64, f64, f64)| (bx + ((r.0 - sx0) as f32) * b.k, by + ((r.1 - sy0) as f32) * b.k, r.2 as f32 * b.k, r.3 as f32 * b.k);
|
||||
pg.save();
|
||||
pg.clip_rect(b.text_x(bx, bw), by, bw, bh);
|
||||
pg.clip_rect(bx, by, bw, bh);
|
||||
draw_sparklines(pg, wb, si, sh, b, block);
|
||||
for (imi, im) in sh.images.iter().enumerate() {
|
||||
let r = anchor_rect(sh, &im.anchor);
|
||||
@@ -155,19 +153,9 @@ fn draw_sparklines(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet, b: &Bloc
|
||||
v => vec![v.as_f64()],
|
||||
};
|
||||
let color = rgb_of(sp.color, wb).unwrap_or([0x15, 0x60, 0x82]);
|
||||
let (x, y, w, h) = b.drawn_rect(RangeRef::cell(sp.cell));
|
||||
let (x, y, w, h) = b.rect(RangeRef::cell(sp.cell));
|
||||
let (wpx, hpx) = (w / b.k, h / b.k);
|
||||
let mut prims = gridcraft_chart::render_sparkline(sp.kind, &vals, [color[0], color[1], color[2], 255], sp.markers, wpx, hpx);
|
||||
if sh.right_to_left {
|
||||
for prim in &mut prims {
|
||||
match prim {
|
||||
gridcraft_chart::Prim::Rect { x, w, .. } => *x = wpx - *x - *w,
|
||||
gridcraft_chart::Prim::Line { pts, .. } => pts.iter_mut().for_each(|p| p[0] = wpx - p[0]),
|
||||
gridcraft_chart::Prim::Circle { cx, .. } => *cx = wpx - *cx,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
let prims = gridcraft_chart::render_sparkline(sp.kind, &vals, [color[0], color[1], color[2], 255], sp.markers, wpx, hpx);
|
||||
draw_prims(pg, &prims, Xf { ox: x, oy: y, k: b.k });
|
||||
}
|
||||
}
|
||||
@@ -211,7 +199,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl
|
||||
let color = fm.text_color.and_then(|c| rgb_of(c, wb)).unwrap_or([0, 0, 0]);
|
||||
let align = fm.align.unwrap_or(if text_box { ShapeTextAlign::Left } else { ShapeTextAlign::Center });
|
||||
let anchor = fm.anchor.unwrap_or(if text_box { ShapeTextAnchor::Top } else { ShapeTextAnchor::Middle });
|
||||
let lines = wrap_lines(&shp.text, font, size, (w - 4.0 * b.k).max(size), TextDirection::Auto);
|
||||
let lines = wrap_lines(&shp.text, font, size, (w - 4.0 * b.k).max(size));
|
||||
let block_h = lines.len().min(500) as f32 * size * 1.2;
|
||||
let mut yy = match anchor {
|
||||
ShapeTextAnchor::Top => y + 2.0 * b.k,
|
||||
@@ -219,7 +207,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl
|
||||
ShapeTextAnchor::Bottom => y + h - 2.0 * b.k - block_h,
|
||||
} + size * 0.8;
|
||||
for l in lines.iter().take(500) {
|
||||
let lw = gridcraft_pdf::text_width_with_direction(font, size, &l.text, l.direction);
|
||||
let lw = gridcraft_pdf::text_width(font, size, l);
|
||||
let lx = match align {
|
||||
ShapeTextAlign::Left => x + 2.0 * b.k,
|
||||
ShapeTextAlign::Center => x + (w - lw) / 2.0,
|
||||
@@ -228,7 +216,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl
|
||||
// WordArt's drop shadow: the line again, offset, in the shadow colour (under the text).
|
||||
if let Some(sc) = fm.text_shadow.and_then(|c| rgb_of(c, wb)) {
|
||||
let off = (size * 0.06).max(0.5);
|
||||
pg.text_with_direction(Point::new(lx + off, yy + off), size, font, sc, &l.text, l.direction);
|
||||
pg.text(lx + off, yy + off, size, font, sc, l);
|
||||
}
|
||||
// WordArt's text outline, as on screen: the line in the outline colour, offset in eight
|
||||
// directions by half the outline width, under the filled text.
|
||||
@@ -237,10 +225,10 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl
|
||||
{
|
||||
let d = (ow * b.scale / 2.0).clamp(0.25, 20.0);
|
||||
for (dx, dy) in [(-1.0, -1.0), (0.0, -1.0), (1.0, -1.0), (-1.0, 0.0), (1.0, 0.0), (-1.0, 1.0), (0.0, 1.0), (1.0, 1.0)] {
|
||||
pg.text_with_direction(Point::new(lx + dx * d, yy + dy * d), size, font, oc, &l.text, l.direction);
|
||||
pg.text(lx + dx * d, yy + dy * d, size, font, oc, l);
|
||||
}
|
||||
}
|
||||
pg.text_with_direction(Point::new(lx, yy), size, font, color, &l.text, l.direction);
|
||||
pg.text(lx, yy, size, font, color, l);
|
||||
yy += size * 1.2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use gridcraft_model::{Sparkline, SparklineKind};
|
||||
use serde_json::json;
|
||||
|
||||
use super::*;
|
||||
@@ -16,35 +15,6 @@ fn pdf_of(s: &mut Session, p: Json) -> (Vec<u8>, u64) {
|
||||
fn contains(hay: &[u8], needle: &str) -> bool {
|
||||
hay.windows(needle.len()).any(|w| w == needle.as_bytes())
|
||||
}
|
||||
fn arabic_face_available() -> bool {
|
||||
let mut doc = gridcraft_pdf::PdfDoc::new();
|
||||
doc.add_page(100.0, 100.0).text(0.0, 50.0, 10.0, Font::Helvetica, [0, 0, 0], "مرحبا");
|
||||
!doc.missing_arabic_font()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn right_to_left_sheets_mirror_link_rectangles_and_targets() {
|
||||
fn numbers_after(pdf: &[u8], key: &str, n: usize) -> Vec<f32> {
|
||||
let text = String::from_utf8_lossy(pdf);
|
||||
let at = text.find(key).unwrap() + key.len();
|
||||
text[at..].split([' ', ']']).filter_map(|t| t.parse().ok()).take(n).collect()
|
||||
}
|
||||
let mut s = s();
|
||||
s.execute("insert.link", json!({"cell": "A1", "target": "https://example.org/report"})).unwrap();
|
||||
s.execute("insert.link", json!({"cell": "A2", "target": "Sheet1!B60"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "B60", "input": "Destination"})).unwrap();
|
||||
let (ltr, _) = pdf_of(&mut s, json!({}));
|
||||
s.execute("view.rightToLeft", json!({"on": true})).unwrap();
|
||||
let (rtl, _) = pdf_of(&mut s, json!({}));
|
||||
let axis = numbers_after(<r, "/MediaBox [", 4)[2];
|
||||
let (l, r) = (numbers_after(<r, "/Rect [", 4), numbers_after(&rtl, "/Rect [", 4));
|
||||
assert!((r[0] - (axis - l[2])).abs() < 0.01 && (r[2] - (axis - l[0])).abs() < 0.01, "{l:?} mirrors to {r:?}");
|
||||
assert_eq!(r[1], l[1]);
|
||||
let b_width = s.doc().unwrap().wb.active().unwrap().col_width(1);
|
||||
let (lx, rx) = (numbers_after(<r, "/XYZ ", 1)[0], numbers_after(&rtl, "/XYZ ", 1)[0]);
|
||||
let k = (l[2] - l[0]) / s.doc().unwrap().wb.active().unwrap().col_width(0);
|
||||
assert!((rx - (axis - lx - b_width * k)).abs() < 0.01, "target {lx} mirrors to {rx}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn chart_data_table_prints_formatted_values_and_follows_recalculation() {
|
||||
@@ -88,199 +58,6 @@ fn pdf_export_keeps_safe_links_on_their_printed_pages() {
|
||||
assert!(!cropped.contains("/Dest ["));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_with_characters_its_font_lacks_still_exports() {
|
||||
let mut s = s();
|
||||
s.execute("cell.set", json!({"cell": "A1", "input": "مرحبا 😀"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "A2", "input": "مرحبا Привет"})).unwrap();
|
||||
let out = s.execute("file.exportPdf", json!({})).unwrap();
|
||||
assert_eq!(out["pages"], 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapping_keeps_combining_marks_with_their_letters() {
|
||||
let word = "a\u{301}a\u{301}a\u{301}a\u{301}";
|
||||
let lines = wrap_lines(word, Font::Helvetica, 10.0, 7.0, TextDirection::Auto);
|
||||
assert_eq!(lines.iter().map(|line| line.text.as_str()).collect::<String>(), word);
|
||||
assert!(lines.iter().all(|line| line.text == "a\u{301}"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_cells_headers_and_charts_export_searchable_shaped_text() {
|
||||
if !arabic_face_available() && std::env::var_os("CRAFT_FONTS_REQUIRED").is_none() {
|
||||
return;
|
||||
}
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["مَرْحَبًا 123 (ABC)", "القيمة"], ["تفاح", 3], ["كمثرى", 5], ["العَرَبِيَّة العَرَبِيَّة العَرَبِيَّة العَرَبِيَّة العَرَبِيَّة", null], ["تقرير ١٢٣ (ABC)", null], ["مرحبا", null]]})).unwrap();
|
||||
s.execute("home.columnWidth", json!({"cols": "A:B", "chars": 32})).unwrap();
|
||||
s.execute("home.rowHeight", json!({"rows": "1:6", "height": 50})).unwrap();
|
||||
s.execute("home.fontSize", json!({"range": "A1:B6", "size": 20})).unwrap();
|
||||
s.execute("home.rowHeight", json!({"rows": "4:4", "height": 90})).unwrap();
|
||||
s.execute("home.bold", json!({"range": "A2"})).unwrap();
|
||||
s.execute("home.italic", json!({"range": "A3"})).unwrap();
|
||||
s.execute("home.wrapText", json!({"range": "A4"})).unwrap();
|
||||
s.execute("home.orientation", json!({"range": "A6", "angle": 30})).unwrap();
|
||||
s.execute("pageLayout.pageSetup", json!({"header": "&Cتقرير المبيعات 2026", "gridlines": true})).unwrap();
|
||||
s.execute("insert.chart", json!({"range": "A1:B3", "type": "column"})).unwrap();
|
||||
{
|
||||
let d = s.doc_mut().unwrap();
|
||||
let wb = std::sync::Arc::make_mut(&mut d.wb);
|
||||
for chart in &mut wb.sheet_mut(0).unwrap().charts {
|
||||
chart.anchor.cell = CellRef::new(8, 0);
|
||||
chart.anchor.width = 500.0;
|
||||
chart.anchor.height = 280.0;
|
||||
}
|
||||
}
|
||||
let (pdf, pages) = pdf_of(&mut s, json!({"fitToPage": true}));
|
||||
assert_eq!(pages, 1);
|
||||
assert!(contains(&pdf, "/Subtype /Type3"));
|
||||
for text in ["مَرْحَبًا 123 (ABC)", "تقرير المبيعات 2026", "القيمة", "تفاح", "كمثرى"] {
|
||||
let utf16 = text.encode_utf16().map(|unit| format!("{unit:04X}")).collect::<String>();
|
||||
assert!(contains(&pdf, &format!("/ActualText <FEFF{utf16}>")), "missing text {text}");
|
||||
}
|
||||
let lines = wrap_lines("العَرَبِيَّةالعَرَبِيَّة", Font::Helvetica, 20.0, 40.0, TextDirection::Auto);
|
||||
assert_eq!(lines.iter().map(|line| line.text.as_str()).collect::<String>(), "العَرَبِيَّةالعَرَبِيَّة");
|
||||
assert!(lines.iter().all(|line| !line.text.starts_with(['َ', 'ِ', 'ُ', 'ّ', 'ْ'])));
|
||||
assert!(lines.iter().all(|line| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 20.0, &line.text, line.direction) <= 40.0));
|
||||
let path = std::env::temp_dir().join(format!("gridcraft-arabic-export-{}.pdf", std::process::id()));
|
||||
std::fs::write(&path, &pdf).unwrap();
|
||||
eprintln!("Arabic PDF artifact: {}", path.display());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_reading_order_export_artifact() {
|
||||
if !arabic_face_available() && std::env::var_os("CRAFT_FONTS_REQUIRED").is_none() {
|
||||
return;
|
||||
}
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["Context", "LeftToRight", "RightToLeft"], ["مرحبا ABC !", "مرحبا ABC !", "مرحبا ABC !"], ["123 مرحبا ABC", "123 مرحبا ABC", "123 مرحبا ABC"], ["(مرحبا) ABC", "(مرحبا) ABC", "(مرحبا) ABC"], ["مرحبا ABC ! DEF ? مرحبا", "مرحبا ABC ! DEF ? مرحبا", "مرحبا ABC ! DEF ? مرحبا"]]})).unwrap();
|
||||
s.execute("home.columnWidth", json!({"cols": "A:C", "chars": 24})).unwrap();
|
||||
s.execute("home.rowHeight", json!({"rows": "1:5", "height": 60})).unwrap();
|
||||
s.execute("home.fontSize", json!({"range": "A2:C5", "size": 18})).unwrap();
|
||||
for (range, order) in [("A2:A5", "Context"), ("B2:B5", "LeftToRight"), ("C2:C5", "RightToLeft")] {
|
||||
s.execute("home.formatCells", json!({"range": range, "style": {"align": {"reading_order": order}}})).unwrap();
|
||||
}
|
||||
s.execute("home.wrapText", json!({"range": "A5:C5"})).unwrap();
|
||||
s.execute("pageLayout.pageSetup", json!({"gridlines": true, "header": "&CArabic cell reading order"})).unwrap();
|
||||
let (pdf, _) = pdf_of(&mut s, json!({}));
|
||||
for text in ["مرحبا ABC !", "123 مرحبا ABC", "(مرحبا) ABC"] {
|
||||
let utf16 = text.encode_utf16().map(|unit| format!("{unit:04X}")).collect::<String>();
|
||||
assert!(contains(&pdf, &format!("/ActualText <FEFF{utf16}>")));
|
||||
}
|
||||
let path = std::env::temp_dir().join(format!("gridcraft-arabic-reading-order-{}.pdf", std::process::id()));
|
||||
std::fs::write(&path, &pdf).unwrap();
|
||||
eprintln!("Arabic reading-order PDF artifact: {}", path.display());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapped_lines_keep_the_paragraph_direction() {
|
||||
let lines = wrap_lines("مرحبا ABC ! DEF ?\nLatin مرحبا !", Font::Helvetica, 10.0, 30.0, TextDirection::Auto);
|
||||
let split = lines.iter().position(|l| l.text.starts_with("Latin")).unwrap();
|
||||
assert!(split > 0);
|
||||
assert!(lines[..split].iter().all(|l| l.direction == TextDirection::RightToLeft));
|
||||
assert!(lines[split..].iter().all(|l| l.direction == TextDirection::LeftToRight));
|
||||
let lines = wrap_lines("123 مرحبا ABC !", Font::Helvetica, 10.0, 30.0, TextDirection::Context.resolve("123 مرحبا ABC !"));
|
||||
assert!(lines.iter().all(|l| l.direction == TextDirection::LeftToRight));
|
||||
}
|
||||
|
||||
fn exported_text_x(pdf: &[u8], text: &str) -> f32 {
|
||||
let pdf = String::from_utf8_lossy(pdf);
|
||||
let marker = format!("({text}) Tj");
|
||||
let before = &pdf[..pdf.find(&marker).unwrap()];
|
||||
let matrix = before.lines().rev().find(|line| line.ends_with(" Tm")).unwrap();
|
||||
matrix.split_whitespace().nth(4).unwrap().parse().unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cell_reading_order_and_conditional_context_reach_pdf() {
|
||||
let mut s = s();
|
||||
s.execute("cell.set", json!({"cell": "A1", "input": "ABC !"})).unwrap();
|
||||
s.execute("home.formatCells", json!({"range": "A1", "style": {"align": {"reading_order": "RightToLeft"}}})).unwrap();
|
||||
let (rtl, _) = pdf_of(&mut s, json!({}));
|
||||
assert!(contains(&rtl, "(! ABC) Tj"));
|
||||
assert!(!contains(&rtl, "/Subtype /Type3"));
|
||||
s.execute("home.conditionalFormat", json!({"range": "A1", "rule": {"type": "noBlanks", "style": {"align": {"reading_order": "Context"}}}}))
|
||||
.unwrap();
|
||||
let (context, _) = pdf_of(&mut s, json!({}));
|
||||
assert!(contains(&context, "(ABC !) Tj"));
|
||||
assert!(!contains(&context, "(! ABC) Tj"));
|
||||
assert!(exported_text_x(&rtl, "! ABC") > exported_text_x(&context, "ABC !"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rtl_sheet_sparkline_reflects_with_cell_geometry() {
|
||||
let mut wb = Workbook::new();
|
||||
let sh = wb.sheet_mut(0).unwrap();
|
||||
sh.set_value(CellRef::new(0, 0), Value::Number(1.0));
|
||||
sh.set_value(CellRef::new(1, 0), Value::Number(3.0));
|
||||
sh.sparklines.push(Sparkline {
|
||||
cell: CellRef::new(0, 1),
|
||||
source: "A1:A2".into(),
|
||||
kind: SparklineKind::Line,
|
||||
color: Color::rgb(255, 0, 0),
|
||||
markers: false,
|
||||
});
|
||||
let options = PrintOptions { range: RangeRef::parse("A1:B2"), ..PrintOptions::default() };
|
||||
let ltr = render_pdf(&wb, &layouts(&wb, &options), "", "").unwrap().bytes;
|
||||
wb.sheet_mut(0).unwrap().right_to_left = true;
|
||||
let rtl = render_pdf(&wb, &layouts(&wb, &options), "", "").unwrap().bytes;
|
||||
let points = |pdf: &[u8]| {
|
||||
let pdf = String::from_utf8_lossy(pdf);
|
||||
let after = pdf.split("1 0 0 RG\n").nth(1).unwrap();
|
||||
let line = after.lines().find(|line| line.ends_with(" l S")).unwrap();
|
||||
let values: Vec<_> = line.split_whitespace().collect();
|
||||
(values[0].parse::<f32>().unwrap(), values[3].parse::<f32>().unwrap())
|
||||
};
|
||||
let (left0, left1) = points(<r);
|
||||
let (right0, right1) = points(&rtl);
|
||||
assert!(left0 < left1 && right0 > right1);
|
||||
assert!((left0 + right0 - 612.0).abs() < 0.001);
|
||||
assert!((left1 + right1 - 612.0).abs() < 0.001);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_left_and_right_keep_their_side_on_a_right_to_left_sheet() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["LEFT"], ["RIGHT"]]})).unwrap();
|
||||
s.execute("home.alignLeft", json!({"range": "A1"})).unwrap();
|
||||
s.execute("home.alignRight", json!({"range": "A2"})).unwrap();
|
||||
let (ltr, _) = pdf_of(&mut s, json!({}));
|
||||
s.execute("view.rightToLeft", json!({"on": true})).unwrap();
|
||||
let (rtl, _) = pdf_of(&mut s, json!({}));
|
||||
let width = |label| gridcraft_pdf::text_width(Font::Helvetica, 11.0, label);
|
||||
let (left, right) = (width("LEFT"), width("RIGHT"));
|
||||
let ltr_gap = exported_text_x(<r, "RIGHT") + right - exported_text_x(<r, "LEFT");
|
||||
let rtl_gap = exported_text_x(&rtl, "RIGHT") + right - exported_text_x(&rtl, "LEFT");
|
||||
assert!((ltr_gap - rtl_gap).abs() < 0.01, "Left stays left of Right in the cell: {ltr_gap}, {rtl_gap}");
|
||||
assert!(exported_text_x(&rtl, "LEFT") + left < exported_text_x(&rtl, "RIGHT") + right);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rtl_sheet_pdf_mirrors_cells_merges_headings_and_object_anchors() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["FIRST", "SECOND"], [null, "MERGED"]]})).unwrap();
|
||||
s.execute("home.mergeCenter", json!({"range": "B2:C2"})).unwrap();
|
||||
s.execute("pageLayout.pageSetup", json!({"printArea": "A1:D5", "headings": true, "gridlines": true, "left": 0.8, "right": 0.4})).unwrap();
|
||||
s.execute("insert.shape", json!({"kind": "rectangle", "at": "B4", "width": 128, "height": 30, "text": "OBJECT"})).unwrap();
|
||||
let (ltr, _) = pdf_of(&mut s, json!({}));
|
||||
s.execute("view.rightToLeft", json!({"on": true})).unwrap();
|
||||
let (rtl, _) = pdf_of(&mut s, json!({}));
|
||||
for label in ["FIRST", "SECOND", "MERGED", "A", "B", "C", "D", "1", "2", "OBJECT"] {
|
||||
let left = exported_text_x(<r, label);
|
||||
let right = exported_text_x(&rtl, label);
|
||||
let font_size = if ["A", "B", "C", "D", "1", "2"].contains(&label) { 9.0 } else { 11.0 };
|
||||
let width = gridcraft_pdf::text_width(Font::Helvetica, font_size, label);
|
||||
assert!((left + right + width - 612.0).abs() < 0.01, "{label}: {left}, {right}, {width}");
|
||||
}
|
||||
assert!(exported_text_x(<r, "FIRST") < exported_text_x(<r, "SECOND"));
|
||||
assert!(exported_text_x(&rtl, "FIRST") > exported_text_x(&rtl, "SECOND"));
|
||||
for (name, pdf) in [("ltr", ltr), ("rtl", rtl)] {
|
||||
let path = std::env::temp_dir().join(format!("gridcraft-print-direction-{name}-{}.pdf", std::process::id()));
|
||||
std::fs::write(&path, pdf).unwrap();
|
||||
eprintln!("Print direction PDF artifact: {}", path.display());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn header_sections_split_join_and_field_names() {
|
||||
let spec = "&L&\"Arial,Bold\"Sales &&Co&CPage &P of &N&R&D";
|
||||
@@ -917,32 +694,11 @@ fn bands_unit() {
|
||||
let b = bands(0, 2, |r| if r == 1 { 100.0 } else { 10.0 }, |_| 35.0, &[], 100);
|
||||
assert_eq!(b, vec![(0, 0), (1, 1), (2, 2)]);
|
||||
assert_eq!(bands(0, 1_000_000, |_| 10.0, |_| 5.0, &[], 3).len(), 3);
|
||||
let w = wrap_lines("the quick brown fox jumps", Font::Helvetica, 10.0, 50.0, TextDirection::Auto);
|
||||
let w = wrap_lines("the quick brown fox jumps", Font::Helvetica, 10.0, 50.0);
|
||||
assert!(w.len() >= 2);
|
||||
assert!(w.iter().all(|l| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, &l.text, l.direction) <= 50.0 || !l.text.contains(' ')));
|
||||
let w = wrap_lines("Supercalifragilistic", Font::Helvetica, 10.0, 20.0, TextDirection::Auto);
|
||||
assert!(w.iter().all(|l| gridcraft_pdf::text_width(Font::Helvetica, 10.0, l) <= 50.0 || !l.contains(' ')));
|
||||
let w = wrap_lines("Supercalifragilistic", Font::Helvetica, 10.0, 20.0);
|
||||
assert!(w.len() > 2);
|
||||
let long = "abcdefghij".repeat(300);
|
||||
let w = wrap_lines(&long, Font::Helvetica, 10.0, 50.0, TextDirection::Auto);
|
||||
assert_eq!(w.iter().map(|l| l.text.as_str()).collect::<String>(), long);
|
||||
assert!(w.iter().all(|l| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, &l.text, l.direction) <= 50.0));
|
||||
let mut at = 0;
|
||||
for l in &w[..w.len() - 1] {
|
||||
let one_more = &long[at..at + l.text.len() + 1];
|
||||
assert!(gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, one_more, l.direction) > 50.0, "each split is as long as fits");
|
||||
at += l.text.len();
|
||||
}
|
||||
}
|
||||
|
||||
fn wrapped_text(text: &str, font: Font, size: f32, width: f32) -> Vec<String> {
|
||||
wrap_lines(text, font, size, width, TextDirection::Auto).into_iter().map(|line| line.text).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapping_ignores_the_width_of_undrawn_bidi_marks() {
|
||||
let word = "i\u{200e}".repeat(20);
|
||||
assert!(gridcraft_pdf::text_width(Font::Helvetica, 10.0, &word) <= 50.0);
|
||||
assert_eq!(wrapped_text(&word, Font::Helvetica, 10.0, 50.0), vec![word.clone()]);
|
||||
}
|
||||
|
||||
/// The wrapper `wrap_lines` replaced, re-measuring strings, as the reference for its lines.
|
||||
@@ -999,11 +755,7 @@ fn wrap_lines_matches_the_remeasuring_wrapper() {
|
||||
for text in texts {
|
||||
for font in [Font::Helvetica, Font::HelveticaBold, Font::Courier] {
|
||||
for (size, width) in [(10.0, 50.0), (10.0, 20.0), (11.0, 1.0), (8.0, 300.0), (12.0, 0.0)] {
|
||||
assert_eq!(
|
||||
wrapped_text(text, font, size, width),
|
||||
wrap_lines_remeasuring(text, font, size, width),
|
||||
"{text:?} {font:?} {size} {width}"
|
||||
);
|
||||
assert_eq!(wrap_lines(text, font, size, width), wrap_lines_remeasuring(text, font, size, width), "{text:?} {font:?} {size} {width}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1014,24 +766,12 @@ fn wrapping_a_long_word_in_a_narrow_box_stops_at_the_line_limit() {
|
||||
// One character per line: the old wrapper re-measured and copied the rest of the word for
|
||||
// each of the 100,000 lines before checking the limit.
|
||||
let word = "w".repeat(100_000);
|
||||
let lines = wrapped_text(&word, Font::Helvetica, 10.0, 1.0);
|
||||
let lines = wrap_lines(&word, Font::Helvetica, 10.0, 1.0);
|
||||
assert!(lines.len() <= 2002, "{}", lines.len());
|
||||
assert!(lines.iter().all(|l| l == "w"));
|
||||
// A long paragraph in a very wide box is one line.
|
||||
let para = vec!["word"; 50_000].join(" ");
|
||||
assert_eq!(wrapped_text(¶, Font::Helvetica, 10.0, 1.0e9), vec![para.clone()]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wrapping_a_long_arabic_word_measures_pieces_not_the_rest_of_the_word() {
|
||||
let word = "مرحبا".repeat(10_000);
|
||||
if !arabic_face_available() {
|
||||
return;
|
||||
}
|
||||
let lines = wrapped_text(&word, Font::Helvetica, 10.0, 20.0);
|
||||
assert!(lines.len() > 2000 && lines.len() <= 2002, "{}", lines.len());
|
||||
assert!(lines.iter().take(2000).all(|line| gridcraft_pdf::text_width(Font::Helvetica, 10.0, line) <= 20.0));
|
||||
assert!(word.starts_with(&lines.concat()));
|
||||
assert_eq!(wrap_lines(¶, Font::Helvetica, 10.0, 1.0e9), vec![para.clone()]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1,176 +1,78 @@
|
||||
use super::draw::{Block, Look, rgb_of};
|
||||
use super::{
|
||||
Baseline, CellRef, Color, Font, HAlign, MAX_COLS, Page, Point, RangeRef, ReadingOrder, Sheet, Style, StyleTable, TextDirection, Underline,
|
||||
VAlign, Value,
|
||||
};
|
||||
use unicode_segmentation::UnicodeSegmentation;
|
||||
use super::{CellRef, Color, Font, HAlign, MAX_COLS, Page, Point, RangeRef, Sheet, Style, StyleTable, Underline, VAlign, Value};
|
||||
|
||||
const PAD_PX: f32 = 2.0;
|
||||
|
||||
/// Most lines [`wrap_lines`] returns (it may return one more, the rest of a paragraph).
|
||||
const MAX_WRAP_LINES: usize = 2000;
|
||||
|
||||
pub(super) struct TextLine {
|
||||
pub(super) text: String,
|
||||
pub(super) direction: TextDirection,
|
||||
}
|
||||
|
||||
/// Word-wraps `text` to `width` points, keeping each paragraph's base direction on every
|
||||
/// continuation line.
|
||||
/// Word-wraps `text` to `width` points.
|
||||
///
|
||||
/// Widths are kept as running sums of glyph widths (the sum `text_width` makes), so each
|
||||
/// character is measured once: re-measuring the line for every word, or the rest of an
|
||||
/// over-long word for every piece cut from it, made a long paragraph or word quadratic.
|
||||
/// A paragraph whose width is not that sum is measured as drawn by [`wrap_measured_paragraph`].
|
||||
pub(super) fn wrap_lines(text: &str, font: Font, size: f32, width: f32, direction: TextDirection) -> Vec<TextLine> {
|
||||
let mut out = Vec::new();
|
||||
for para in text.split('\n') {
|
||||
let direction = direction.resolve(para);
|
||||
if gridcraft_pdf::width_is_char_sum(font, para, direction) {
|
||||
wrap_summed_paragraph(para, font, size, width, direction, &mut out);
|
||||
} else {
|
||||
let fits = |s: &str| gridcraft_pdf::text_width_with_direction(font, size, s, direction) <= width;
|
||||
wrap_measured_paragraph(para, &fits, direction, &mut out);
|
||||
}
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return out;
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn wrap_summed_paragraph(para: &str, font: Font, size: f32, width: f32, direction: TextDirection, out: &mut Vec<TextLine>) {
|
||||
pub(super) fn wrap_lines(text: &str, font: Font, size: f32, width: f32) -> Vec<String> {
|
||||
let units_of = |s: &str| -> u64 { s.chars().map(|c| u64::from(font.char_width(c))).sum() };
|
||||
let fits = |units: u64| units as f32 * size / 1000.0 <= width;
|
||||
let space = units_of(" ");
|
||||
let mut line = String::new();
|
||||
let mut line_units: u64 = 0;
|
||||
for word in para.split(' ') {
|
||||
let word_units = units_of(word);
|
||||
if line.is_empty() {
|
||||
line.push_str(word);
|
||||
line_units = word_units;
|
||||
} else if fits(line_units + space + word_units) {
|
||||
line.push(' ');
|
||||
line.push_str(word);
|
||||
line_units += space + word_units;
|
||||
} else {
|
||||
out.push(TextLine { text: std::mem::take(&mut line), direction });
|
||||
line.push_str(word);
|
||||
line_units = word_units;
|
||||
}
|
||||
if !fits(line_units) && line.graphemes(true).nth(1).is_some() {
|
||||
let mut piece = String::new();
|
||||
let mut units: u64 = 0;
|
||||
for g in line.graphemes(true) {
|
||||
let w = units_of(g);
|
||||
if !piece.is_empty() && !fits(units + w) {
|
||||
out.push(TextLine { text: std::mem::take(&mut piece), direction });
|
||||
units = 0;
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return;
|
||||
let mut out = Vec::new();
|
||||
for para in text.split('\n') {
|
||||
let mut line = String::new();
|
||||
let mut line_units: u64 = 0;
|
||||
for word in para.split(' ') {
|
||||
let word_units = units_of(word);
|
||||
if line.is_empty() {
|
||||
line.push_str(word);
|
||||
line_units = word_units;
|
||||
} else if fits(line_units + space + word_units) {
|
||||
line.push(' ');
|
||||
line.push_str(word);
|
||||
line_units += space + word_units;
|
||||
} else {
|
||||
out.push(std::mem::take(&mut line));
|
||||
line.push_str(word);
|
||||
line_units = word_units;
|
||||
}
|
||||
// Break a single over-long word by characters: each piece is the longest that fits
|
||||
// (at least one character).
|
||||
if !fits(line_units) && line.chars().nth(1).is_some() {
|
||||
let mut piece = String::new();
|
||||
let mut units: u64 = 0;
|
||||
for c in line.chars() {
|
||||
let w = u64::from(font.char_width(c));
|
||||
if !piece.is_empty() && !fits(units + w) {
|
||||
out.push(std::mem::take(&mut piece));
|
||||
units = 0;
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return out;
|
||||
}
|
||||
}
|
||||
piece.push(c);
|
||||
units += w;
|
||||
}
|
||||
piece.push_str(g);
|
||||
units += w;
|
||||
line = piece;
|
||||
line_units = units;
|
||||
}
|
||||
line = piece;
|
||||
line_units = units;
|
||||
}
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return;
|
||||
}
|
||||
}
|
||||
out.push(TextLine { text: line, direction });
|
||||
}
|
||||
|
||||
/// One paragraph of [`wrap_lines`] whose width is not a sum of character widths (shaped Arabic,
|
||||
/// right-to-left reordering or bidi controls), measuring each candidate line as drawn.
|
||||
fn wrap_measured_paragraph(para: &str, fits: &impl Fn(&str) -> bool, direction: TextDirection, out: &mut Vec<TextLine>) {
|
||||
let mut line = String::new();
|
||||
for word in para.split(' ') {
|
||||
if !line.is_empty() {
|
||||
let candidate = format!("{line} {word}");
|
||||
if fits(&candidate) {
|
||||
line = candidate;
|
||||
continue;
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return out;
|
||||
}
|
||||
out.push(TextLine { text: std::mem::take(&mut line), direction });
|
||||
}
|
||||
line = if fits(word) { word.to_string() } else { break_measured_word(word, fits, direction, out) };
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return;
|
||||
}
|
||||
}
|
||||
out.push(TextLine { text: line, direction });
|
||||
}
|
||||
|
||||
/// Cuts `word` into the longest grapheme prefixes that fit (at least one grapheme each), pushes
|
||||
/// all but the last to `out` and returns the last. Each cut gallops from one grapheme, so it
|
||||
/// measures prefixes about as long as the piece rather than the rest of the word.
|
||||
fn break_measured_word(word: &str, fits: &impl Fn(&str) -> bool, direction: TextDirection, out: &mut Vec<TextLine>) -> String {
|
||||
let ends: Vec<usize> = word.grapheme_indices(true).map(|(i, g)| i + g.len()).collect();
|
||||
let (mut start, mut first) = (0, 0);
|
||||
loop {
|
||||
let len = ends.len().saturating_sub(first);
|
||||
let end = |count: usize| ends.get(first + count.saturating_sub(1)).copied().unwrap_or(word.len());
|
||||
let fits_prefix = |count: usize| fits(word.get(start..end(count)).unwrap_or_default());
|
||||
let (mut fit, mut over, mut probe) = (1, len + 1, 2);
|
||||
while fit < len {
|
||||
let count = probe.min(len);
|
||||
if fits_prefix(count) {
|
||||
fit = count;
|
||||
probe = count.saturating_mul(2);
|
||||
} else {
|
||||
over = count;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if fit >= len {
|
||||
return word.get(start..).unwrap_or_default().to_string();
|
||||
}
|
||||
while over - fit > 1 {
|
||||
let mid = fit + (over - fit) / 2;
|
||||
if fits_prefix(mid) {
|
||||
fit = mid;
|
||||
} else {
|
||||
over = mid;
|
||||
}
|
||||
}
|
||||
let cut = end(fit);
|
||||
out.push(TextLine { text: word.get(start..cut).unwrap_or_default().to_string(), direction });
|
||||
start = cut;
|
||||
first += fit;
|
||||
if out.len() > MAX_WRAP_LINES {
|
||||
return word.get(start..).unwrap_or_default().to_string();
|
||||
}
|
||||
out.push(line);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn font_for(style: &Style) -> Font {
|
||||
Font::styled(Font::family_for(&style.font.name), style.font.bold, style.font.italic)
|
||||
}
|
||||
|
||||
fn text_direction(order: ReadingOrder) -> TextDirection {
|
||||
match order {
|
||||
ReadingOrder::Context => TextDirection::Context,
|
||||
ReadingOrder::LeftToRight => TextDirection::LeftToRight,
|
||||
ReadingOrder::RightToLeft => TextDirection::RightToLeft,
|
||||
}
|
||||
}
|
||||
|
||||
/// The alignment a cell is laid out with before a right-to-left sheet is mirrored. Explicit Left
|
||||
/// and Right are swapped there, as in the grid, so they print on the side the user chose.
|
||||
fn text_align(align: HAlign, value: &Value, direction: TextDirection, right_to_left_sheet: bool) -> HAlign {
|
||||
fn text_align(align: HAlign, value: &Value) -> HAlign {
|
||||
match align {
|
||||
HAlign::General => match value {
|
||||
Value::Number(_) => HAlign::Right,
|
||||
Value::Bool(_) | Value::Error(_) => HAlign::Center,
|
||||
_ if direction == TextDirection::RightToLeft && !right_to_left_sheet => HAlign::Right,
|
||||
_ => HAlign::Left,
|
||||
},
|
||||
HAlign::Left if right_to_left_sheet => HAlign::Right,
|
||||
HAlign::Right if right_to_left_sheet => HAlign::Left,
|
||||
HAlign::CenterAcross | HAlign::Distributed => HAlign::Center,
|
||||
HAlign::Justify | HAlign::Fill => HAlign::Left,
|
||||
other => other,
|
||||
@@ -281,46 +183,32 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>)
|
||||
if text.is_empty() {
|
||||
return;
|
||||
}
|
||||
let direction = text_direction(st.align.reading_order.unwrap_or_default()).resolve(&text);
|
||||
let mut tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction);
|
||||
let mut tw = gridcraft_pdf::text_width(font, size, &text);
|
||||
if st.align.shrink && !wrap && tw > avail && tw > 0.0 {
|
||||
size = (size * avail / tw).max(1.0);
|
||||
tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction);
|
||||
tw = gridcraft_pdf::text_width(font, size, &text);
|
||||
}
|
||||
if is_num && !wrap && tw > avail + 0.01 && !sh.show_formulas {
|
||||
let hash = gridcraft_pdf::text_width(font, size, "#").max(0.1);
|
||||
text = "#".repeat(((avail / hash).floor().max(1.0) as usize).min(255));
|
||||
tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction);
|
||||
tw = gridcraft_pdf::text_width(font, size, &text);
|
||||
}
|
||||
let h_align = text_align(st.align.h, &v, direction, sh.right_to_left);
|
||||
let h_align = text_align(st.align.h, &v);
|
||||
let rot = st.align.rotation;
|
||||
let rotated = rot != 0 && rot != 255;
|
||||
// Rotated text wraps along its own direction: upright (±90°) text to the row height.
|
||||
let lines: Vec<TextLine> = match (wrap, rotated) {
|
||||
(true, false) => wrap_lines(&text, font, size, avail.max(size), direction),
|
||||
(true, true) if rot.abs() == 90 => wrap_lines(&text, font, size, (h - 2.0 * pad).max(size), direction),
|
||||
(true, true) => vec![TextLine { text: text.lines().next().unwrap_or_default().to_string(), direction }],
|
||||
(false, _) => vec![TextLine { text, direction }],
|
||||
let lines: Vec<String> = match (wrap, rotated) {
|
||||
(true, false) => wrap_lines(&text, font, size, avail.max(size)),
|
||||
(true, true) if rot.abs() == 90 => wrap_lines(&text, font, size, (h - 2.0 * pad).max(size)),
|
||||
(true, true) => vec![text.lines().next().unwrap_or_default().to_string()],
|
||||
(false, _) => vec![text],
|
||||
};
|
||||
let extents = lines
|
||||
.iter()
|
||||
.filter_map(|line| pg.text_vertical_extents_with_direction(font, size, &line.text, line.direction))
|
||||
.reduce(|a, b| (a.0.max(b.0), a.1.max(b.1)))
|
||||
.map(|(ascent, descent)| (ascent.max(size * 0.8), descent.max(size * 0.22)));
|
||||
let line_h = extents.map_or(size * 1.2, |(ascent, descent)| (ascent + descent + size * 0.2).max(size * 1.2));
|
||||
let line_h = size * 1.2;
|
||||
let n = lines.len().max(1) as f32;
|
||||
let first_baseline = if let Some((ascent, descent)) = extents {
|
||||
match st.align.v {
|
||||
VAlign::Top => y + pad + ascent,
|
||||
VAlign::Center | VAlign::Justify | VAlign::Distributed => y + (h - (n - 1.0) * line_h - ascent - descent) / 2.0 + ascent,
|
||||
VAlign::Bottom => y + h - pad - descent - (n - 1.0) * line_h,
|
||||
}
|
||||
} else {
|
||||
match st.align.v {
|
||||
VAlign::Top => y + pad + size * 0.8,
|
||||
VAlign::Center | VAlign::Justify | VAlign::Distributed => y + (h - n * line_h) / 2.0 + line_h * 0.5 + size * 0.33,
|
||||
VAlign::Bottom => y + h - pad - size * 0.22 - (n - 1.0) * line_h,
|
||||
}
|
||||
let first_baseline = match st.align.v {
|
||||
VAlign::Top => y + pad + size * 0.8,
|
||||
VAlign::Center | VAlign::Justify | VAlign::Distributed => y + (h - n * line_h) / 2.0 + line_h * 0.5 + size * 0.33,
|
||||
VAlign::Bottom => y + h - pad - size * 0.22 - (n - 1.0) * line_h,
|
||||
};
|
||||
// Overflow into empty neighbours (single-line text, not merged).
|
||||
// Center Across Selection spans the empty Center Across cells to its right; the text stays within that run.
|
||||
@@ -334,7 +222,7 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>)
|
||||
let clip_l = clip_l.max(limits.0);
|
||||
let clip_r = clip_r.min(limits.1);
|
||||
pg.save();
|
||||
pg.clip_rect(b.text_x(clip_l, clip_r - clip_l), y, (clip_r - clip_l).max(0.0), h);
|
||||
pg.clip_rect(clip_l, y, (clip_r - clip_l).max(0.0), h);
|
||||
if rotated {
|
||||
// Rotated text: anchored at the bottom-left (upward) or top-left (downward) of the cell.
|
||||
// Wrapped lines stack rightward for upward text and leftward for downward text, so
|
||||
@@ -345,27 +233,23 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>)
|
||||
for (i, t) in lines.iter().enumerate() {
|
||||
let i = i as f32;
|
||||
let (ox, oy) = if deg > 0.0 {
|
||||
(x + pad + extents.map_or(size * 0.8, |e| e.0) * deg.to_radians().sin() + i * line_h, y + h - pad)
|
||||
(x + pad + size * 0.8 * deg.to_radians().sin() + i * line_h, y + h - pad)
|
||||
} else {
|
||||
(x + pad + (last - i) * line_h, y + pad + extents.map_or(size * 0.8, |e| e.0))
|
||||
(x + pad + (last - i) * line_h, y + pad + size * 0.8)
|
||||
};
|
||||
let tw = gridcraft_pdf::text_width_with_direction(font, size, &t.text, t.direction);
|
||||
let (sn, cs) = angle.sin_cos();
|
||||
let (ascent, descent) = extents.unwrap_or((size * 0.8, size * 0.22));
|
||||
let ox = if sh.right_to_left { b.mirror_axis - ox - tw * cs - (ascent - descent) * sn } else { ox };
|
||||
pg.text_rotated_with_direction(Baseline { origin: Point::new(ox, oy), angle }, size, font, color, &t.text, t.direction);
|
||||
pg.text_rotated(Point::new(ox, oy), size, font, color, t, angle);
|
||||
}
|
||||
pg.restore();
|
||||
return;
|
||||
}
|
||||
if rot == 255 {
|
||||
// Vertical stacked text.
|
||||
let stacked: String = lines.iter().map(|line| line.text.as_str()).collect();
|
||||
let chars: Vec<&str> = stacked.graphemes(true).take(500).collect();
|
||||
let mut yy = y + pad + extents.map_or(size * 0.8, |e| e.0);
|
||||
let chars: Vec<char> = lines.concat().chars().take(500).collect();
|
||||
let mut yy = y + pad + size * 0.8;
|
||||
for ch in chars {
|
||||
let cw = gridcraft_pdf::text_width(font, size, ch);
|
||||
pg.text_with_direction(Point::new(b.text_x(x + (w - cw) / 2.0, cw), yy), size, font, color, ch, direction);
|
||||
let s = ch.to_string();
|
||||
let cw = gridcraft_pdf::text_width(font, size, &s);
|
||||
pg.text(x + (w - cw) / 2.0, yy, size, font, color, &s);
|
||||
yy += line_h;
|
||||
if yy > y + h + line_h {
|
||||
break;
|
||||
@@ -375,7 +259,7 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>)
|
||||
return;
|
||||
}
|
||||
for (i, line) in lines.iter().enumerate() {
|
||||
let lw = gridcraft_pdf::text_width_with_direction(font, size, &line.text, line.direction);
|
||||
let lw = gridcraft_pdf::text_width(font, size, line);
|
||||
let lx = match h_align {
|
||||
HAlign::Right => x + w - pad - lw - indent,
|
||||
HAlign::Center => x + (w + across - lw) / 2.0,
|
||||
@@ -385,8 +269,7 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>)
|
||||
if ly - size > y + h || ly < y - line_h {
|
||||
continue;
|
||||
}
|
||||
let lx = b.text_x(lx, lw);
|
||||
pg.text_with_direction(Point::new(lx, ly), size, font, color, &line.text, line.direction);
|
||||
pg.text(lx, ly, size, font, color, line);
|
||||
if st.font.underline != Underline::None {
|
||||
let uw = (size * 0.06).max(0.2);
|
||||
pg.stroke_line(lx, ly + size * 0.12, lx + lw, ly + size * 0.12, uw, color);
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::sync::Arc;
|
||||
|
||||
use gridcraft_core::{CellRef, MAX_COLS, MAX_ROWS, RangeRef};
|
||||
use gridcraft_formula::adjust::{Axis, Edit};
|
||||
use gridcraft_model::{Anchor, AnchorMode, PivotDataCell, PivotLookup, Sheet, Visibility};
|
||||
use gridcraft_model::{Anchor, AnchorMode, Sheet, Visibility};
|
||||
use serde_json::{Value as Json, json};
|
||||
|
||||
use super::{
|
||||
@@ -211,31 +211,7 @@ fn shift_sheet_features(sh: &mut Sheet, axis: Axis, at: u32, count: u32, insert:
|
||||
Axis::Rows => CellRef::new(at, pt.anchor.col),
|
||||
Axis::Cols => CellRef::new(pt.anchor.row, at),
|
||||
});
|
||||
let old = pt.last_range;
|
||||
pt.last_range = old.and_then(map_range);
|
||||
// GETPIVOTDATA's value cells are stored as offsets from the report's top-left cell, so
|
||||
// lines inserted or deleted inside the report move them as well. The moved cells go into
|
||||
// a new index (the shared one stays with the undo snapshots); a value cell deleted with
|
||||
// its line drops out, so it is #REF! rather than read from whatever took its place.
|
||||
let index = pt.data_index.clone();
|
||||
if let (Some(o), Some(n), Some(cells)) = (old, pt.last_range, index.cells()) {
|
||||
let (lo, hi) = if axis == Axis::Rows { (o.start.row, o.end.row) } else { (o.start.col, o.end.col) };
|
||||
let inside = at <= hi && if insert { at > lo } else { at.saturating_add(count) > lo };
|
||||
if inside {
|
||||
let moved: Vec<PivotDataCell> = cells
|
||||
.iter()
|
||||
.filter_map(|c| {
|
||||
let to = map_cell(CellRef::new(o.start.row.checked_add(c.row)?, o.start.col.checked_add(c.col)?))?;
|
||||
Some(PivotDataCell { row: to.row.checked_sub(n.start.row)?, col: to.col.checked_sub(n.start.col)?, ..c.clone() })
|
||||
})
|
||||
.collect();
|
||||
let lookup = PivotLookup::default();
|
||||
if !moved.is_empty() {
|
||||
lookup.set_cells(moved);
|
||||
}
|
||||
pt.data_index = lookup;
|
||||
}
|
||||
}
|
||||
pt.last_range = pt.last_range.and_then(map_range);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ impl FileKind {
|
||||
"ods" => FileKind::Ods,
|
||||
"csv" => FileKind::Csv,
|
||||
"tsv" | "tab" | "txt" => FileKind::Tsv,
|
||||
ext if craft_gridcraft_format::is_extension(ext) => FileKind::Json,
|
||||
"json" | "scjson" => FileKind::Json,
|
||||
"html" | "htm" => FileKind::Html,
|
||||
"slk" => FileKind::Sylk,
|
||||
_ => return None,
|
||||
@@ -316,7 +316,7 @@ fn read_plain(name: &str, bytes: &[u8], csv_as_text: bool) -> Result<(Workbook,
|
||||
}
|
||||
match kind {
|
||||
Some(FileKind::Json) => {
|
||||
let mut wb: Workbook = craft_gridcraft_format::read(bytes).map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
let mut wb: Workbook = serde_json::from_slice(bytes).map_err(|e| EngineError::Other(format!("not a GridCraft JSON workbook: {e}")))?;
|
||||
wb.styles.rebuild_index();
|
||||
if wb.sheets.is_empty() {
|
||||
// The file's macros are read after this (`macros::load`), so they come along.
|
||||
|
||||
@@ -323,7 +323,6 @@ impl DocState {
|
||||
/// read from bytes (a file, a download, a recovery copy), [`Trust::Local`] only for a workbook
|
||||
/// made in this session.
|
||||
pub fn new(mut wb: Workbook, path: Option<String>, title: String, trust: Trust) -> DocState {
|
||||
let _ = gridcraft_model::PIVOT_INDEXER.set(pivot::index_cells);
|
||||
let mut calc = Calc::new();
|
||||
calc.recalc_all(&mut wb);
|
||||
Self::with_calc(wb, calc, path, title, trust)
|
||||
|
||||
@@ -213,7 +213,17 @@ pub fn json_bytes(wb: &Workbook) -> crate::Result<Vec<u8>> {
|
||||
for m in &wb.macros {
|
||||
check(m).map_err(crate::EngineError::Other)?;
|
||||
}
|
||||
craft_gridcraft_format::write_with_kept(wb, "macros", &wb.macros_unread).map_err(|e| crate::EngineError::Other(e.to_string()))
|
||||
let bytes = if wb.macros_unread.is_empty() {
|
||||
serde_json::to_vec_pretty(wb)
|
||||
} else {
|
||||
serde_json::to_value(wb).and_then(|mut v| {
|
||||
if let Some(list) = v.as_object_mut().map(|o| o.entry("macros").or_insert_with(|| Json::Array(vec![]))).and_then(Json::as_array_mut) {
|
||||
list.extend(wb.macros_unread.iter().cloned());
|
||||
}
|
||||
serde_json::to_vec_pretty(&v)
|
||||
})
|
||||
};
|
||||
bytes.map_err(|e| crate::EngineError::Other(e.to_string()))
|
||||
}
|
||||
|
||||
/// Whether `v` is a macro in a newer format than this build reads.
|
||||
|
||||
@@ -12,8 +12,8 @@ use gridcraft_core::date::datetime_from_serial;
|
||||
pub use gridcraft_core::quote_sheet;
|
||||
use gridcraft_core::{CellError, CellRef, MAX_COLS, MAX_ROWS, RangeRef, Value, split_sheet};
|
||||
use gridcraft_model::{
|
||||
BorderLine, BorderStyle, Cell, Chart, Color, Fill, HAlign, NumFmt, PivotDataCell, PivotDateGroup, PivotField, PivotFilter, PivotFunc,
|
||||
PivotItemRef, PivotLayout, PivotLookup, PivotShowAs, PivotSort, PivotTable, PivotValue, Series, Style, StyleId, Workbook,
|
||||
BorderLine, BorderStyle, Cell, Chart, Color, Fill, HAlign, NumFmt, PivotDateGroup, PivotField, PivotFilter, PivotFunc, PivotLayout, PivotShowAs,
|
||||
PivotSort, PivotTable, PivotValue, Series, Style, StyleId, Workbook,
|
||||
};
|
||||
|
||||
use crate::pivot_calc::CalcSet;
|
||||
@@ -41,9 +41,6 @@ pub const MAX_OUTPUT_CELLS: u64 = 2_000_000;
|
||||
pub const MAX_AXIS_FIELDS: usize = 32;
|
||||
/// Most fields in the Values area.
|
||||
pub const MAX_VALUE_FIELDS: usize = 256;
|
||||
/// Most report value cells a report may have (every one is indexed for GETPIVOTDATA; bigger
|
||||
/// reports are rejected).
|
||||
pub const MAX_INDEXED_CELLS: usize = 1_000_000;
|
||||
|
||||
const MONTHS: [&str; 12] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
|
||||
|
||||
@@ -317,42 +314,9 @@ pub fn refresh(wb: &mut Workbook, sheet: usize, idx: usize, replace: bool) -> Re
|
||||
}
|
||||
let sheet_name = shm.name.clone();
|
||||
rebind_charts(wb, &sheet_name, &pt.name, origin, &out);
|
||||
// The index of the new report; its lookup hash is built on the first GETPIVOTDATA.
|
||||
if let Some(p) = wb.sheet_mut(sheet).and_then(|s| s.pivots.get_mut(idx)) {
|
||||
let index = PivotLookup::default();
|
||||
index.set_cells(out.data);
|
||||
p.data_index = index;
|
||||
}
|
||||
Ok(area)
|
||||
}
|
||||
|
||||
/// The value cells of a PivotTable's report, for GETPIVOTDATA when a refresh did not set the
|
||||
/// index (a workbook just opened from XLSX). The positions must describe the report as it is
|
||||
/// stored on the sheet, not as the current source would render it: the source is recomputed only
|
||||
/// to learn the layout, and the result is accepted when every label and header cell of that
|
||||
/// layout equals the stored cell at the same place. A source changed since the last refresh gives
|
||||
/// a different layout, so there is no trustworthy index and the lookup fails until a refresh.
|
||||
pub fn index_cells(wb: &Workbook, sheet: usize, pt: &PivotTable) -> Result<Vec<PivotDataCell>, String> {
|
||||
const STALE: &str = "The stored report no longer matches the source. Refresh the PivotTable.";
|
||||
let report = pt.last_range.ok_or("The PivotTable has no report.")?;
|
||||
let out = compute(wb, pt, sheet)?;
|
||||
let sh = wb.sheet(sheet).ok_or("There's no such sheet.")?;
|
||||
let rows = u64::from(report.end.row) - u64::from(report.start.row) + 1;
|
||||
let cols = u64::from(report.end.col) - u64::from(report.start.col) + 1;
|
||||
if rows != u64::from(out.height().max(1)) || cols != u64::from(out.width.max(1)) {
|
||||
return Err(STALE.into());
|
||||
}
|
||||
let labels = [CellKind::Header, CellKind::RowLabel, CellKind::ColLabel, CellKind::Filter];
|
||||
for (r, row) in out.grid.iter().enumerate() {
|
||||
for (c, oc) in row.iter().enumerate() {
|
||||
if labels.contains(&oc.kind) && sh.value(CellRef::new(report.start.row + r as u32, report.start.col + c as u32)) != oc.value {
|
||||
return Err(STALE.into());
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(out.data)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod fit_tests {
|
||||
use super::data_cols_exceed_sheet;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use super::output::Output;
|
||||
use super::{CellRef, Chart, PivotLookup, Series, Workbook, quote_sheet};
|
||||
use super::{CellRef, Chart, Series, Workbook, quote_sheet};
|
||||
|
||||
// ---------------------------------------------------------------- PivotCharts
|
||||
|
||||
@@ -109,7 +109,6 @@ pub fn clear_output(wb: &mut Workbook, sheet: usize, idx: usize) {
|
||||
shm.take_cells(r);
|
||||
if let Some(p) = shm.pivots.get_mut(idx) {
|
||||
p.last_range = None;
|
||||
p.data_index = PivotLookup::default();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +126,6 @@ mod tests {
|
||||
chart_rows: vec![1, 2, 3],
|
||||
chart_cols: (1..1000).map(|c| (c, format!("S{c}"))).collect(),
|
||||
label_col: Some(0),
|
||||
data: vec![],
|
||||
};
|
||||
assert_eq!(chart_series("Sheet1", CellRef::new(0, 0), &out).len(), MAX_CHART_SERIES);
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ use super::output::{
|
||||
AggMap, CellKind, ColKind, ColSpec, Ctx, Grid, Line, LineKind, Output, RowKind, ValSrc, caption, data_cols_exceed_sheet, flatten_cols,
|
||||
};
|
||||
use super::{
|
||||
CalcSet, CellError, CellRef, HashMap, HashSet, MAX_AXIS_FIELDS, MAX_COLS, MAX_INDEXED_CELLS, MAX_VALUE_FIELDS, PivotDataCell, PivotDateGroup,
|
||||
PivotField, PivotFilter, PivotFunc, PivotItemRef, PivotLayout, PivotShowAs, PivotTable, PivotValue, Source, Value, Workbook, read_source,
|
||||
CalcSet, CellError, CellRef, HashMap, HashSet, MAX_AXIS_FIELDS, MAX_COLS, MAX_VALUE_FIELDS, PivotDateGroup, PivotField, PivotFilter, PivotFunc,
|
||||
PivotLayout, PivotShowAs, PivotTable, PivotValue, Source, Value, Workbook, read_source,
|
||||
};
|
||||
|
||||
/// Why Show Details turns a cell down when it isn't a value cell of a PivotTable (the front end
|
||||
@@ -653,7 +653,6 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
|
||||
chart_rows: vec![],
|
||||
chart_cols: vec![],
|
||||
label_col: None,
|
||||
data: vec![],
|
||||
});
|
||||
}
|
||||
|
||||
@@ -729,16 +728,6 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
|
||||
} else {
|
||||
Some(row_levels.saturating_sub(1) as u32)
|
||||
};
|
||||
let item_refs = |fields: &[&PivotField], items: &[FieldItems], path: &[u32]| -> Vec<PivotItemRef> {
|
||||
path.iter()
|
||||
.enumerate()
|
||||
.filter_map(|(d, it)| {
|
||||
let (f, item) = (fields.get(d)?, items.get(d)?.get(*it)?);
|
||||
Some(PivotItemRef { field: f.source_col.clone(), label: item.label.clone(), value: item.value.clone() })
|
||||
})
|
||||
.collect()
|
||||
};
|
||||
let mut data: Vec<PivotDataCell> = Vec::new();
|
||||
for line in &lines {
|
||||
let rk = match line.kind {
|
||||
LineKind::Item(b) => RowKind::Item(b),
|
||||
@@ -769,21 +758,6 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
|
||||
let Some(raw) = lookup.get(rp, cp, *vi) else { continue };
|
||||
let context = ShowContext { row_path: rp, col_path: cp, value_index: *vi, level0: &level0, siblings: &siblings, cache: &show_cache };
|
||||
let shown = show_value(vdef, raw, &lookup, &context);
|
||||
// Every value cell of the report is indexed, so a report that needs more cells than
|
||||
// the index cap is rejected outright — never written with a truncated index that
|
||||
// would answer #REF! for the values the sheet shows.
|
||||
if data.len() >= MAX_INDEXED_CELLS {
|
||||
return Err(format!("A PivotTable report can have at most {MAX_INDEXED_CELLS} value cells."));
|
||||
}
|
||||
let mut items = item_refs(&ctx.rows, &ctx.row_items, rp);
|
||||
items.extend(item_refs(&col_fields, &col_items, cp));
|
||||
data.push(PivotDataCell {
|
||||
data_field: vdef.name.clone(),
|
||||
source_col: vdef.source_col.clone(),
|
||||
items,
|
||||
row: u32::try_from(r).unwrap_or(u32::MAX),
|
||||
col: u32::try_from(l + j).unwrap_or(u32::MAX),
|
||||
});
|
||||
if let Some(pr) = probe.as_deref_mut() {
|
||||
if pr.at == Some((r, l + j)) {
|
||||
pr.hit = Some((rp.to_vec(), cp.to_vec()));
|
||||
@@ -795,5 +769,5 @@ pub(super) fn compute_from(wb: &Workbook, pt: &PivotTable, src: &Source, mut pro
|
||||
g.set(r, l + j, shown, ck.1, 0, data_fmt.get(*vi).cloned().flatten());
|
||||
}
|
||||
}
|
||||
Ok(Output { width: g.width as u32, grid: g.rows, row_kinds: g.kinds, body_offset, chart_rows, chart_cols, label_col, data })
|
||||
Ok(Output { width: g.width as u32, grid: g.rows, row_kinds: g.kinds, body_offset, chart_rows, chart_cols, label_col })
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use super::items::{Acc, FieldItems, Node, is_collapsed};
|
||||
use super::{
|
||||
BorderLine, BorderStyle, Color, Fill, HAlign, HashMap, MAX_COLS, MAX_OUTPUT_CELLS, MAX_ROWS, NumFmt, PivotDataCell, PivotField, PivotLayout,
|
||||
PivotTable, Style, Value,
|
||||
BorderLine, BorderStyle, Color, Fill, HAlign, HashMap, MAX_COLS, MAX_OUTPUT_CELLS, MAX_ROWS, NumFmt, PivotField, PivotLayout, PivotTable, Style,
|
||||
Value,
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------- output
|
||||
@@ -61,8 +61,6 @@ pub struct Output {
|
||||
pub chart_cols: Vec<(u32, String)>,
|
||||
/// Grid column holding the innermost row labels (`None` without row fields).
|
||||
pub label_col: Option<u32>,
|
||||
/// Every value cell with the items that locate it (for GETPIVOTDATA).
|
||||
pub data: Vec<PivotDataCell>,
|
||||
}
|
||||
|
||||
impl Output {
|
||||
|
||||
+1
-255
@@ -1621,44 +1621,6 @@ fn case_sensitive_sort_puts_lowercase_first() {
|
||||
assert_eq!(col, ["a", "A", "aB", "Ab", "b", "B"].map(Value::from));
|
||||
}
|
||||
|
||||
/// #3949: Excel sorts values that are not in the custom list A to Z after the listed ones.
|
||||
#[test]
|
||||
fn custom_list_sort_puts_unlisted_values_after_the_list_in_order() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["Priority"], ["Zulu"], ["Alpha"], ["Low"], ["High"], ["Medium"]]})).unwrap();
|
||||
let key = json!({"column": "A", "order": "asc", "customList": ["High", "Medium", "Low"]});
|
||||
s.execute("data.sort", json!({"range": "A1:A6", "header": true, "keys": [key]})).unwrap();
|
||||
let col: Vec<Value> = (1..=6).map(|r| v(&s, &format!("A{r}"))).collect();
|
||||
assert_eq!(col, ["Priority", "High", "Medium", "Low", "Alpha", "Zulu"].map(Value::from));
|
||||
}
|
||||
|
||||
/// #3949 changes only an ascending custom-list key: with a descending one, two values not in the
|
||||
/// list still tie, so the next key orders them.
|
||||
#[test]
|
||||
fn descending_custom_list_sort_leaves_unlisted_values_to_the_next_key() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["Name", "N"], ["Zulu", 2], ["Alpha", 1], ["High", 3]]})).unwrap();
|
||||
let keys = json!([
|
||||
{"column": "A", "order": "desc", "customList": ["High", "Medium", "Low"]},
|
||||
{"column": "B", "order": "asc"}
|
||||
]);
|
||||
s.execute("data.sort", json!({"range": "A1:B4", "header": true, "keys": keys})).unwrap();
|
||||
let col: Vec<Value> = (2..=4).map(|r| v(&s, &format!("A{r}"))).collect();
|
||||
assert_eq!(col, ["Alpha", "Zulu", "High"].map(Value::from));
|
||||
}
|
||||
|
||||
/// A blank in a descending custom-list key goes last, after the list, rather than tying with the
|
||||
/// values that are not in the list (which come first), so the order is the same whatever the input.
|
||||
#[test]
|
||||
fn descending_custom_list_sort_puts_blanks_last() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["Name"], [null], ["High"], ["Zulu"]]})).unwrap();
|
||||
let key = json!({"column": "A", "order": "desc", "customList": ["High", "Medium", "Low"]});
|
||||
s.execute("data.sort", json!({"range": "A1:A4", "header": true, "keys": [key]})).unwrap();
|
||||
let col: Vec<Value> = (2..=4).map(|r| v(&s, &format!("A{r}"))).collect();
|
||||
assert_eq!(col, [Value::from("Zulu"), Value::from("High"), Value::Empty]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn data_sort_orders_vowelled_arabic_by_letters() {
|
||||
let mut s = s();
|
||||
@@ -1797,7 +1759,7 @@ fn subtotal_with_a_sheet_prefix_works_on_the_named_sheet() {
|
||||
assert_eq!(col(prices, 0), ["Item", "a", "a", "a Total", "b", "b Total", "Grand Total"].map(Value::from));
|
||||
assert_eq!(col(prices, 1)[1..], [1.0, 2.0, 3.0, 4.0, 4.0, 7.0].map(Value::from));
|
||||
assert!(wb.styles.get(prices.style_id(CellRef::new(3, 0))).font.bold);
|
||||
assert_eq!(prices.rows.get(&1).map(|l| l.outline), Some(2));
|
||||
assert_eq!(prices.rows.get(&1).map(|l| l.outline), Some(1));
|
||||
let sheet1 = wb.sheet(wb.sheet_index("Sheet1").unwrap()).unwrap();
|
||||
assert_eq!(col(sheet1, 0)[..4], ["Name", "x", "x", "y"].map(Value::from));
|
||||
assert!(sheet1.value(CellRef::new(4, 0)).is_empty());
|
||||
@@ -1805,24 +1767,6 @@ fn subtotal_with_a_sheet_prefix_works_on_the_named_sheet() {
|
||||
assert!(s.execute("data.group", json!({"sheet": "Prices"})).is_err());
|
||||
}
|
||||
|
||||
/// #3945: Excel groups every data and subtotal row under the grand total, so the details are at
|
||||
/// level 2, the subtotals at level 1, and showing level 1 leaves only the grand total.
|
||||
#[test]
|
||||
fn subtotal_groups_everything_under_the_grand_total() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [["Group", "Amount"], ["A", 10], ["A", 20], ["B", 30]]})).unwrap();
|
||||
s.execute("data.subtotal", json!({"range": "A1:B4", "groupBy": "A", "columns": ["B"], "function": "sum"})).unwrap();
|
||||
let sh = s.doc().unwrap().wb.active().unwrap();
|
||||
let levels: Vec<u8> = (0..7).map(|r| sh.rows.get(&r).map_or(0, |l| l.outline)).collect();
|
||||
assert_eq!(levels, [0, 2, 2, 1, 2, 1, 0]);
|
||||
let shown = |s: &Session| -> Vec<u32> { (0..7).filter(|&r| !s.doc().unwrap().wb.active().unwrap().is_row_hidden(r)).map(|r| r + 1).collect() };
|
||||
s.execute("data.showLevels", json!({"rows": 1})).unwrap();
|
||||
assert_eq!(shown(&s), [1, 7]);
|
||||
s.execute("data.showLevels", json!({"rows": 2})).unwrap();
|
||||
assert_eq!(shown(&s), [1, 4, 6, 7]);
|
||||
assert_eq!(v(&s, "B7"), Value::Number(60.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn formatting_and_styles() {
|
||||
let mut s = s();
|
||||
@@ -2457,35 +2401,6 @@ fn merging_over_a_spill_blocks_it_and_unmerging_unblocks_it() {
|
||||
assert_eq!(v(&s, "A3"), Value::Number(3.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn inserting_a_link_without_text_preserves_a_spill_child() {
|
||||
let mut s = s();
|
||||
s.execute("cell.set", json!({"cell": "A1", "input": "=SEQUENCE(3)"})).unwrap();
|
||||
assert_eq!(v(&s, "A2"), Value::Number(2.0));
|
||||
s.execute("insert.link", json!({"cell": "A2", "target": "https://example.org"})).unwrap();
|
||||
assert_eq!(v(&s, "A1"), Value::Number(1.0));
|
||||
assert_eq!(v(&s, "A2"), Value::Number(2.0));
|
||||
let d = s.doc().unwrap();
|
||||
let at = CellRef::parse("A2").unwrap();
|
||||
assert_eq!(d.wb.active().unwrap().hyperlinks.get(&at).map(|link| link.target.as_str()), Some("https://example.org"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn inserting_a_link_without_text_preserves_an_empty_spill_child() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1:C3", "values": [["a", "x", 1], ["b", "x", 2], ["a", "y", 3]]})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "K1", "input": "=PIVOTBY(A1:A3,B1:B3,C1:C3,LAMBDA(x,SUM(x)))"})).unwrap();
|
||||
assert_eq!(v(&s, "K1"), Value::Empty);
|
||||
let at = CellRef::parse("M3").unwrap();
|
||||
assert_eq!(v(&s, "M3"), Value::Empty);
|
||||
assert_eq!(s.doc().unwrap().wb.active().unwrap().spill_anchor(at), Some(CellRef::parse("K1").unwrap()));
|
||||
s.execute("insert.link", json!({"cell": "M3", "target": "https://example.org"})).unwrap();
|
||||
assert_eq!(v(&s, "K1"), Value::Empty);
|
||||
assert_eq!(v(&s, "M3"), Value::Empty);
|
||||
let d = s.doc().unwrap();
|
||||
assert_eq!(d.wb.active().unwrap().hyperlinks.get(&at).map(|link| link.target.as_str()), Some("https://example.org"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multi_cell_array_formulas_and_tables_dont_overlap() {
|
||||
// Found by the command-sequence fuzzer: an array over a table header lost its value to the
|
||||
@@ -3025,127 +2940,6 @@ fn validation_formulas_are_relative_and_see_the_new_value() {
|
||||
assert!(!ok(&mut s, "C1", "50"));
|
||||
}
|
||||
|
||||
/// Every value of the active sheet as the incremental recalculation left it must equal a full one.
|
||||
fn assert_matches_full_recalc(s: &Session) {
|
||||
let wb = &s.doc().unwrap().wb;
|
||||
let mut fresh = (**wb).clone();
|
||||
gridcraft_calc::Calc::new().recalc_all(&mut fresh);
|
||||
let (a, b) = (wb.active().unwrap(), fresh.active().unwrap());
|
||||
for row in 0..30 {
|
||||
for col in 0..12 {
|
||||
let cell = CellRef { row, col };
|
||||
assert_eq!(a.value(cell), b.value(cell), "{cell} in memory vs after a full recalc");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn filling_a_formula_next_to_a_spill_matches_a_full_recalc() {
|
||||
// Found by the command-sequence fuzzer: C14 spills along row 14; filling `=D14:E18` over
|
||||
// E13:F13 puts two array formulas whose areas run into that spill and into each other. The
|
||||
// incremental pass left F13 as #SPILL! while a full recalc gave F13 its array and C14
|
||||
// #SPILL!. The spill that already exists keeps its cells (as in Excel), in both.
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "B18", "values": [[1], [2], [3], [4], [5], [6], [7]]})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "C14", "input": "=TRANSPOSE(B18:B24)"})).unwrap();
|
||||
s.execute("selection.set", json!({"range": "E13"})).unwrap();
|
||||
s.execute("range.fill", json!({"range": "E13:F13", "input": "=D14:E18"})).unwrap();
|
||||
assert_eq!(v(&s, "C14"), Value::Number(1.0));
|
||||
assert_eq!(v(&s, "I14"), Value::Number(7.0));
|
||||
assert_eq!(v(&s, "F13"), Value::Error(gridcraft_core::CellError::Spill));
|
||||
assert_matches_full_recalc(&s);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overlapping_spills_keep_the_one_that_exists_whichever_anchor_is_first() {
|
||||
use gridcraft_core::CellError::Spill;
|
||||
// E10 spills along row 10, F8 down over F10: F8 is first in reading order, E10 may be first
|
||||
// to spill. Excel keeps whichever spilled first.
|
||||
for (first, second) in [(("E10", "=SEQUENCE(1,3)"), ("F8", "=SEQUENCE(5)")), (("F8", "=SEQUENCE(5)"), ("E10", "=SEQUENCE(1,3)"))] {
|
||||
let mut s = s();
|
||||
s.execute("cell.set", json!({"cell": first.0, "input": first.1})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": second.0, "input": second.1})).unwrap();
|
||||
assert_ne!(v(&s, first.0), Value::Error(Spill), "{} keeps its cells", first.0);
|
||||
assert_eq!(v(&s, second.0), Value::Error(Spill), "{} is blocked", second.0);
|
||||
assert_matches_full_recalc(&s);
|
||||
// Clearing the winner lets the other one spill.
|
||||
s.execute("edit.clearContents", json!({"range": first.0})).unwrap();
|
||||
assert_ne!(v(&s, second.0), Value::Error(Spill), "{} spills once {} is cleared", second.0, first.0);
|
||||
assert_matches_full_recalc(&s);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_spill_growing_into_another_and_back_matches_a_full_recalc_at_every_step() {
|
||||
use gridcraft_core::CellError::Spill;
|
||||
// Both arrays already spill; F8 (first in reading order) grows down over E10's spill, takes
|
||||
// its cells, shrinks back and lets it spill again, then the steps are undone, redone, edited
|
||||
// inside the contested area and cleared. Every state must match a full recalc.
|
||||
let mut s = s();
|
||||
s.execute("cell.set", json!({"cell": "H1", "input": "1"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "F8", "input": "=SEQUENCE(H1)"})).unwrap();
|
||||
s.execute("cell.set", json!({"cell": "E10", "input": "=SEQUENCE(1,3)*10"})).unwrap();
|
||||
assert_eq!(v(&s, "G10"), Value::Number(30.0));
|
||||
assert_matches_full_recalc(&s);
|
||||
let steps: [(&str, serde_json::Value); 9] = [
|
||||
("cell.set", json!({"cell": "H1", "input": "5"})),
|
||||
("cell.set", json!({"cell": "E10", "input": "=SEQUENCE(1,2)*10"})),
|
||||
("cell.set", json!({"cell": "H1", "input": "1"})),
|
||||
("edit.undo", json!({})),
|
||||
("edit.undo", json!({})),
|
||||
("edit.redo", json!({})),
|
||||
("cell.set", json!({"cell": "F11", "input": "x"})),
|
||||
("cell.set", json!({"cell": "H1", "input": "2"})),
|
||||
("edit.clearContents", json!({"range": "E8:F10"})),
|
||||
];
|
||||
for (i, (id, params)) in steps.iter().enumerate() {
|
||||
s.execute(id, params.clone()).unwrap();
|
||||
assert_matches_full_recalc(&s);
|
||||
if i == 0 {
|
||||
// Both held a spill: reading order gives F8 the cells.
|
||||
assert_eq!(v(&s, "F12"), Value::Number(5.0));
|
||||
assert_eq!(v(&s, "E10"), Value::Error(Spill));
|
||||
}
|
||||
if i == 2 {
|
||||
assert_eq!(v(&s, "E10"), Value::Number(10.0));
|
||||
assert_eq!(v(&s, "F10"), Value::Number(20.0));
|
||||
}
|
||||
if i == 3 {
|
||||
// Undone back to the grown F8.
|
||||
assert_eq!(v(&s, "F12"), Value::Number(5.0));
|
||||
assert_eq!(v(&s, "E10"), Value::Error(Spill));
|
||||
}
|
||||
if i == 8 {
|
||||
assert_eq!((v(&s, "F8"), v(&s, "E10"), v(&s, "F9")), (Value::Empty, Value::Empty, Value::Empty));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overlapping_spills_with_no_history_go_to_the_earlier_anchor() {
|
||||
use gridcraft_core::CellError::Spill;
|
||||
// A workbook calculated for the first time (a file that carries no layout) has no entry
|
||||
// order: the anchor first in reading order wins, whatever order the formulas were set in.
|
||||
for order in [["E10", "F8"], ["F8", "E10"]] {
|
||||
let mut s = s();
|
||||
for a in order {
|
||||
let input = if a == "E10" { "=SEQUENCE(1,3)" } else { "=SEQUENCE(5)" };
|
||||
s.execute("cell.set", json!({"cell": a, "input": input})).unwrap();
|
||||
}
|
||||
let mut fresh = (*s.doc().unwrap().wb).clone();
|
||||
for i in 0..fresh.sheets.len() {
|
||||
let sh = fresh.sheet_mut(i).unwrap();
|
||||
sh.spill.clear();
|
||||
sh.spill_ranges.clear();
|
||||
}
|
||||
gridcraft_calc::Calc::new().recalc_all(&mut fresh);
|
||||
let a = fresh.active().unwrap();
|
||||
let cell = |r: &str| a.value(CellRef::parse(r).unwrap());
|
||||
assert_ne!(cell("F8"), Value::Error(Spill), "order {order:?}");
|
||||
assert_eq!(cell("E10"), Value::Error(Spill), "order {order:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multi_area_rule_formulas_are_relative_to_the_top_left_cell_of_all_areas() {
|
||||
// Issue #3152: Excel writes the formula for the top-left cell of all the areas (H26), whatever
|
||||
@@ -5836,53 +5630,6 @@ fn tiled_paste_clears_destination_cells_under_blank_source_cells() {
|
||||
assert_eq!(v(&s, "C4"), Value::Empty);
|
||||
}
|
||||
|
||||
/// #3934: a row copied into a taller, narrower selection repeats down every selected row at the
|
||||
/// copy's width, as in Excel; a column copied into a wider, shorter one repeats across.
|
||||
#[test]
|
||||
fn paste_into_a_narrower_selection_repeats_the_copy_down_its_rows() {
|
||||
for dest in ["A3:A6", "A3:B6"] {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [[1, 2]]})).unwrap();
|
||||
s.execute("edit.copy", json!({"range": "A1:B1"})).unwrap();
|
||||
s.execute("selection.set", json!({"range": dest})).unwrap();
|
||||
let r = s.execute("edit.paste", json!({})).unwrap();
|
||||
assert_eq!(r["pasted"], json!("A3:B6"), "{dest}");
|
||||
for row in 3..=6 {
|
||||
assert_eq!(v(&s, &format!("A{row}")), Value::Number(1.0), "{dest} row {row}");
|
||||
assert_eq!(v(&s, &format!("B{row}")), Value::Number(2.0), "{dest} row {row}");
|
||||
}
|
||||
assert_eq!(v(&s, "A2"), Value::Empty);
|
||||
assert_eq!(v(&s, "A7"), Value::Empty);
|
||||
}
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [[1], [2]]})).unwrap();
|
||||
s.execute("edit.copy", json!({"range": "A1:A2"})).unwrap();
|
||||
s.execute("selection.set", json!({"range": "C1:F1"})).unwrap();
|
||||
let r = s.execute("edit.paste", json!({})).unwrap();
|
||||
assert_eq!(r["pasted"], json!("C1:F2"));
|
||||
for col in ["C", "D", "E", "F"] {
|
||||
assert_eq!(v(&s, &format!("{col}1")), Value::Number(1.0), "{col}1");
|
||||
assert_eq!(v(&s, &format!("{col}2")), Value::Number(2.0), "{col}2");
|
||||
}
|
||||
}
|
||||
|
||||
/// #3934: repeating a wide copy down a narrow selection writes the copy's width on every row, so
|
||||
/// the 4,000,000-cell limit on a tiled paste counts that area, not the selection's. Past it the
|
||||
/// copy is pasted once, as a tiled paste over too large a selection already is.
|
||||
#[test]
|
||||
fn a_row_repeated_down_a_narrow_selection_is_bounded_by_the_area_it_fills() {
|
||||
let mut s = s();
|
||||
s.execute("range.setValues", json!({"range": "A1", "values": [[1]]})).unwrap();
|
||||
s.execute("range.setValues", json!({"range": "P1", "values": [[2]]})).unwrap();
|
||||
s.execute("edit.copy", json!({"range": "A1:P1"})).unwrap();
|
||||
// 300,000 rows selected, 4,800,000 cells once the copy's 16 columns are repeated down them.
|
||||
s.execute("selection.set", json!({"range": "A3:A300002"})).unwrap();
|
||||
let r = s.execute("edit.paste", json!({})).unwrap();
|
||||
assert_eq!(r["pasted"], json!("A3:P3"));
|
||||
assert_eq!(v(&s, "P3"), Value::Number(2.0));
|
||||
assert_eq!(v(&s, "A4"), Value::Empty);
|
||||
}
|
||||
|
||||
/// Excel refuses a paste that would run off the sheet rather than pasting part of it: whole
|
||||
/// columns below row 1, whole rows right of column A, a whole column transposed, or a block at
|
||||
/// the last row or column.
|
||||
@@ -6626,7 +6373,6 @@ fn a_script_cannot_switch_windows() {
|
||||
|
||||
mod controls;
|
||||
mod equation;
|
||||
mod json_golden;
|
||||
mod macros;
|
||||
mod objects;
|
||||
mod python_cells;
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
//! Byte-for-byte checks on the native JSON workbook (`.json`, `.scjson`). The files in
|
||||
//! `crates/engine/tests/golden` were written before the format moved to `craft-gridcraft-format`
|
||||
//! (storytold/craft-libs). Saving the same workbook must give the same bytes, and opening a
|
||||
//! golden file and saving it again must give it back.
|
||||
//! `GRIDCRAFT_BLESS_GOLDEN=1` rewrites them. Only do that for a deliberate format change.
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
use serde_json::json;
|
||||
|
||||
use super::s;
|
||||
use crate::Session;
|
||||
|
||||
fn golden(name: &str) -> PathBuf {
|
||||
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests").join("golden").join(name)
|
||||
}
|
||||
|
||||
fn check(name: &str, actual: &[u8]) {
|
||||
let path = golden(name);
|
||||
if std::env::var_os("GRIDCRAFT_BLESS_GOLDEN").is_some() {
|
||||
std::fs::write(&path, actual).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
|
||||
return;
|
||||
}
|
||||
let expected = std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
|
||||
assert!(expected == actual, "{name} changed ({} bytes, golden has {})", actual.len(), expected.len());
|
||||
}
|
||||
|
||||
fn save(s: &mut Session) -> Vec<u8> {
|
||||
let r = s.execute("file.saveBytes", json!({"format": "json"})).unwrap();
|
||||
crate::io::base64_decode(r["base64"].as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
fn open(s: &mut Session, name: &str, bytes: &[u8]) {
|
||||
s.execute("file.open", json!({"name": name, "base64": crate::io::base64_encode(bytes)})).unwrap();
|
||||
}
|
||||
|
||||
/// A workbook with text, numbers, a formula, a style, a number format, a second sheet and a macro.
|
||||
fn book() -> Session {
|
||||
let mut s = s();
|
||||
for (cell, input) in [("A1", "Item"), ("B1", "Qty"), ("A2", "Äpfel ✓"), ("B2", "3.5"), ("A3", "Pears"), ("B3", "2"), ("B4", "=SUM(B2:B3)")] {
|
||||
s.execute("cell.set", json!({"cell": cell, "input": input})).unwrap();
|
||||
}
|
||||
s.execute("home.bold", json!({"range": "A1:B1"})).unwrap();
|
||||
s.execute("home.numberFormat", json!({"range": "B2:B4", "format": "0.00"})).unwrap();
|
||||
s.execute("macro.save", json!({"name": "Fill", "steps": [{"command": "cell.set", "params": {"cell": "C1", "input": "x"}}]})).unwrap();
|
||||
s
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_save_writes_the_golden_workbook_bytes() {
|
||||
let mut s = book();
|
||||
check("book.json", &save(&mut s));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_golden_workbook_opens_and_saves_back_unchanged() {
|
||||
let bytes = std::fs::read(golden("book.json")).unwrap();
|
||||
for name in ["book.json", "book.scjson"] {
|
||||
let mut s = s();
|
||||
open(&mut s, name, &bytes);
|
||||
assert_eq!(super::v(&s, "B4"), gridcraft_core::Value::Number(5.5), "{name}");
|
||||
assert!(save(&mut s) == bytes, "{name} saved back differently");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn macros_in_a_newer_format_are_written_back_as_the_file_held_them() {
|
||||
// The save that splices kept macros back into `macros` goes through a JSON value.
|
||||
let mut v: serde_json::Value = serde_json::from_slice(&std::fs::read(golden("book.json")).unwrap()).unwrap();
|
||||
v["macros"].as_array_mut().unwrap().push(json!({"name": "Future", "v": gridcraft_model::MACRO_VERSION + 1, "extra": [1, 2]}));
|
||||
let mut s = s();
|
||||
open(&mut s, "kept.json", &serde_json::to_vec_pretty(&v).unwrap());
|
||||
check("kept.json", &save(&mut s));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn what_is_not_a_json_workbook_says_so() {
|
||||
let err = crate::io::open_bytes("bad.json", b"{\"sheets\": 7}").unwrap_err().to_string();
|
||||
check("bad.error.txt", err.as_bytes());
|
||||
}
|
||||
@@ -530,16 +530,3 @@ fn python_code_with_an_empty_value_counts_as_content() {
|
||||
s.execute("edit.copy", json!({"range": "T1"})).unwrap();
|
||||
assert!(s.execute("edit.paste", json!({"at": "R2"})).is_err_and(|e| e.to_string().contains("part of an array")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn inserting_a_link_without_text_preserves_an_empty_python_cell() {
|
||||
let mut s = s();
|
||||
plant_empty(&mut s, "A1");
|
||||
s.execute("insert.link", json!({"cell": "A1", "target": "https://example.org"})).unwrap();
|
||||
assert_eq!(code(&s, 0, "A1"), Some("x = 1".into()));
|
||||
let d = s.doc().unwrap();
|
||||
let sh = d.wb.sheet(0).unwrap();
|
||||
let at = CellRef::parse("A1").unwrap();
|
||||
assert_eq!(sh.value(at), Value::Empty);
|
||||
assert_eq!(sh.hyperlinks.get(&at).map(|link| link.target.as_str()), Some("https://example.org"));
|
||||
}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# Golden files are compared byte for byte: no line-ending conversion on checkout.
|
||||
* -text
|
||||
@@ -1 +0,0 @@
|
||||
not a GridCraft JSON workbook: invalid type: integer `7`, expected a sequence at line 1 column 12
|
||||
@@ -1,440 +0,0 @@
|
||||
{
|
||||
"sheets": [
|
||||
{
|
||||
"name": "Sheet1",
|
||||
"cells": {
|
||||
"bands": {
|
||||
"0": {
|
||||
"rows": {
|
||||
"0": {
|
||||
"0": {
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Item"
|
||||
},
|
||||
"formula": null,
|
||||
"style": 1
|
||||
},
|
||||
"1": {
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Qty"
|
||||
},
|
||||
"formula": null,
|
||||
"style": 1
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"0": {
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Äpfel ✓"
|
||||
},
|
||||
"formula": null,
|
||||
"style": 0
|
||||
},
|
||||
"1": {
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 3.5
|
||||
},
|
||||
"formula": null,
|
||||
"style": 2
|
||||
}
|
||||
},
|
||||
"2": {
|
||||
"0": {
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Pears"
|
||||
},
|
||||
"formula": null,
|
||||
"style": 0
|
||||
},
|
||||
"1": {
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 2.0
|
||||
},
|
||||
"formula": null,
|
||||
"style": 2
|
||||
}
|
||||
},
|
||||
"3": {
|
||||
"1": {
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 5.5
|
||||
},
|
||||
"formula": {
|
||||
"text": "SUM(B2:B3)",
|
||||
"array": null
|
||||
},
|
||||
"style": 2
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"len": 7
|
||||
},
|
||||
"cols": {},
|
||||
"rows": {},
|
||||
"default_col_width": 64.0,
|
||||
"default_row_height": 20.0,
|
||||
"merges": [],
|
||||
"freeze": null,
|
||||
"tab_color": null,
|
||||
"visibility": "Visible",
|
||||
"show_gridlines": true,
|
||||
"show_headings": true,
|
||||
"show_formulas": false,
|
||||
"show_zeros": true,
|
||||
"show_outline_symbols": true,
|
||||
"summary_below": true,
|
||||
"summary_right": true,
|
||||
"right_to_left": false,
|
||||
"zoom": 100,
|
||||
"cond_formats": [],
|
||||
"validations": [],
|
||||
"tables": [],
|
||||
"autofilter": null,
|
||||
"comments": {},
|
||||
"hyperlinks": {},
|
||||
"charts": [],
|
||||
"images": [],
|
||||
"shapes": [],
|
||||
"sparklines": [],
|
||||
"slicers": [],
|
||||
"pivots": [],
|
||||
"protection": null,
|
||||
"print": {
|
||||
"orientation": "Portrait",
|
||||
"paper": "Letter",
|
||||
"margins": [
|
||||
0.7,
|
||||
0.7,
|
||||
0.75,
|
||||
0.75,
|
||||
0.3,
|
||||
0.3
|
||||
],
|
||||
"print_area": null,
|
||||
"title_rows": null,
|
||||
"title_cols": null,
|
||||
"scale": 100,
|
||||
"fit_to": null,
|
||||
"gridlines": false,
|
||||
"headings": false,
|
||||
"center_h": false,
|
||||
"center_v": false,
|
||||
"header": "",
|
||||
"footer": "",
|
||||
"row_breaks": [],
|
||||
"col_breaks": [],
|
||||
"different_first": false,
|
||||
"different_odd_even": false,
|
||||
"first_header": "",
|
||||
"first_footer": "",
|
||||
"even_header": "",
|
||||
"even_footer": "",
|
||||
"hf_scale_with_doc": true,
|
||||
"hf_align_with_margins": true,
|
||||
"page_order": "downThenOver"
|
||||
},
|
||||
"view_active": {
|
||||
"row": 0,
|
||||
"col": 0
|
||||
},
|
||||
"view_top_left": {
|
||||
"row": 0,
|
||||
"col": 0
|
||||
},
|
||||
"view": "normal"
|
||||
}
|
||||
],
|
||||
"names": [],
|
||||
"styles": {
|
||||
"styles": [
|
||||
{
|
||||
"font": {
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"underline": "None",
|
||||
"strike": false,
|
||||
"color": "Auto",
|
||||
"vert": "Baseline",
|
||||
"charset": null,
|
||||
"family": null,
|
||||
"minor": true
|
||||
},
|
||||
"fill": {
|
||||
"pattern": "None",
|
||||
"fg": "Auto",
|
||||
"bg": "Auto"
|
||||
},
|
||||
"borders": {
|
||||
"left": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"right": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"top": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"bottom": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_down": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_up": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
}
|
||||
},
|
||||
"align": {
|
||||
"h": "General",
|
||||
"v": "Bottom",
|
||||
"wrap": false,
|
||||
"shrink": false,
|
||||
"indent": 0,
|
||||
"rotation": 0,
|
||||
"reading_order": null
|
||||
},
|
||||
"num_fmt": "General",
|
||||
"protection": {
|
||||
"locked": true,
|
||||
"hidden": false
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"strike": false,
|
||||
"underline": false,
|
||||
"size": false,
|
||||
"name": false,
|
||||
"scheme": null,
|
||||
"protection": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"font": {
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"bold": true,
|
||||
"italic": false,
|
||||
"underline": "None",
|
||||
"strike": false,
|
||||
"color": "Auto",
|
||||
"vert": "Baseline",
|
||||
"charset": null,
|
||||
"family": null,
|
||||
"minor": true
|
||||
},
|
||||
"fill": {
|
||||
"pattern": "None",
|
||||
"fg": "Auto",
|
||||
"bg": "Auto"
|
||||
},
|
||||
"borders": {
|
||||
"left": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"right": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"top": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"bottom": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_down": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_up": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
}
|
||||
},
|
||||
"align": {
|
||||
"h": "General",
|
||||
"v": "Bottom",
|
||||
"wrap": false,
|
||||
"shrink": false,
|
||||
"indent": 0,
|
||||
"rotation": 0,
|
||||
"reading_order": null
|
||||
},
|
||||
"num_fmt": "General",
|
||||
"protection": {
|
||||
"locked": true,
|
||||
"hidden": false
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"strike": false,
|
||||
"underline": false,
|
||||
"size": false,
|
||||
"name": false,
|
||||
"scheme": null,
|
||||
"protection": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"font": {
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"underline": "None",
|
||||
"strike": false,
|
||||
"color": "Auto",
|
||||
"vert": "Baseline",
|
||||
"charset": null,
|
||||
"family": null,
|
||||
"minor": true
|
||||
},
|
||||
"fill": {
|
||||
"pattern": "None",
|
||||
"fg": "Auto",
|
||||
"bg": "Auto"
|
||||
},
|
||||
"borders": {
|
||||
"left": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"right": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"top": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"bottom": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_down": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
},
|
||||
"diag_up": {
|
||||
"style": "None",
|
||||
"color": "Auto"
|
||||
}
|
||||
},
|
||||
"align": {
|
||||
"h": "General",
|
||||
"v": "Bottom",
|
||||
"wrap": false,
|
||||
"shrink": false,
|
||||
"indent": 0,
|
||||
"rotation": 0,
|
||||
"reading_order": null
|
||||
},
|
||||
"num_fmt": "0.00",
|
||||
"protection": {
|
||||
"locked": true,
|
||||
"hidden": false
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"strike": false,
|
||||
"underline": false,
|
||||
"size": false,
|
||||
"name": false,
|
||||
"scheme": null,
|
||||
"protection": false
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"theme": {
|
||||
"name": "Craft",
|
||||
"colors": [
|
||||
16777215,
|
||||
0,
|
||||
15263976,
|
||||
927809,
|
||||
1400962,
|
||||
15298866,
|
||||
1665828,
|
||||
1023701,
|
||||
10496915,
|
||||
5154606,
|
||||
4618374,
|
||||
9855101
|
||||
],
|
||||
"major_font": "Calibri",
|
||||
"minor_font": "Calibri",
|
||||
"major_font_ea": "",
|
||||
"minor_font_ea": "",
|
||||
"major_font_cs": "",
|
||||
"minor_font_cs": "",
|
||||
"major_font_scripts": [],
|
||||
"minor_font_scripts": []
|
||||
},
|
||||
"date_system": "D1900",
|
||||
"calc": {
|
||||
"mode": "Automatic",
|
||||
"iterative": false,
|
||||
"max_iterations": 100,
|
||||
"max_change": 0.001,
|
||||
"precision_as_displayed": false,
|
||||
"r1c1": false
|
||||
},
|
||||
"active_sheet": 0,
|
||||
"props": {
|
||||
"title": "",
|
||||
"subject": "",
|
||||
"author": "GridCraft User",
|
||||
"company": "",
|
||||
"keywords": "",
|
||||
"description": ""
|
||||
},
|
||||
"protected_structure": false,
|
||||
"custom_lists": [],
|
||||
"cell_styles": [],
|
||||
"vba_project": null,
|
||||
"macros": [
|
||||
{
|
||||
"v": 1,
|
||||
"name": "Fill",
|
||||
"description": "",
|
||||
"inputs": [],
|
||||
"steps": [
|
||||
{
|
||||
"type": "command",
|
||||
"id": "cell.set",
|
||||
"params": {
|
||||
"cell": "C1",
|
||||
"input": "x"
|
||||
}
|
||||
}
|
||||
],
|
||||
"output": {
|
||||
"onConflict": "ask"
|
||||
},
|
||||
"permissions": []
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,448 +0,0 @@
|
||||
{
|
||||
"active_sheet": 0,
|
||||
"calc": {
|
||||
"iterative": false,
|
||||
"max_change": 0.001,
|
||||
"max_iterations": 100,
|
||||
"mode": "Automatic",
|
||||
"precision_as_displayed": false,
|
||||
"r1c1": false
|
||||
},
|
||||
"cell_styles": [],
|
||||
"custom_lists": [],
|
||||
"date_system": "D1900",
|
||||
"macros": [
|
||||
{
|
||||
"description": "",
|
||||
"inputs": [],
|
||||
"name": "Fill",
|
||||
"output": {
|
||||
"onConflict": "ask"
|
||||
},
|
||||
"permissions": [],
|
||||
"steps": [
|
||||
{
|
||||
"id": "cell.set",
|
||||
"params": {
|
||||
"cell": "C1",
|
||||
"input": "x"
|
||||
},
|
||||
"type": "command"
|
||||
}
|
||||
],
|
||||
"v": 1
|
||||
},
|
||||
{
|
||||
"extra": [
|
||||
1,
|
||||
2
|
||||
],
|
||||
"name": "Future",
|
||||
"v": 2
|
||||
}
|
||||
],
|
||||
"names": [],
|
||||
"props": {
|
||||
"author": "GridCraft User",
|
||||
"company": "",
|
||||
"description": "",
|
||||
"keywords": "",
|
||||
"subject": "",
|
||||
"title": ""
|
||||
},
|
||||
"protected_structure": false,
|
||||
"sheets": [
|
||||
{
|
||||
"autofilter": null,
|
||||
"cells": {
|
||||
"bands": {
|
||||
"0": {
|
||||
"rows": {
|
||||
"0": {
|
||||
"0": {
|
||||
"formula": null,
|
||||
"style": 1,
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Item"
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"formula": null,
|
||||
"style": 1,
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Qty"
|
||||
}
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"0": {
|
||||
"formula": null,
|
||||
"style": 0,
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Äpfel ✓"
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"formula": null,
|
||||
"style": 2,
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 3.5
|
||||
}
|
||||
}
|
||||
},
|
||||
"2": {
|
||||
"0": {
|
||||
"formula": null,
|
||||
"style": 0,
|
||||
"value": {
|
||||
"t": "Text",
|
||||
"v": "Pears"
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"formula": null,
|
||||
"style": 2,
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 2.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"3": {
|
||||
"1": {
|
||||
"formula": {
|
||||
"array": null,
|
||||
"text": "SUM(B2:B3)"
|
||||
},
|
||||
"style": 2,
|
||||
"value": {
|
||||
"t": "Number",
|
||||
"v": 5.5
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"len": 7
|
||||
},
|
||||
"charts": [],
|
||||
"cols": {},
|
||||
"comments": {},
|
||||
"cond_formats": [],
|
||||
"default_col_width": 64.0,
|
||||
"default_row_height": 20.0,
|
||||
"freeze": null,
|
||||
"hyperlinks": {},
|
||||
"images": [],
|
||||
"merges": [],
|
||||
"name": "Sheet1",
|
||||
"pivots": [],
|
||||
"print": {
|
||||
"center_h": false,
|
||||
"center_v": false,
|
||||
"col_breaks": [],
|
||||
"different_first": false,
|
||||
"different_odd_even": false,
|
||||
"even_footer": "",
|
||||
"even_header": "",
|
||||
"first_footer": "",
|
||||
"first_header": "",
|
||||
"fit_to": null,
|
||||
"footer": "",
|
||||
"gridlines": false,
|
||||
"header": "",
|
||||
"headings": false,
|
||||
"hf_align_with_margins": true,
|
||||
"hf_scale_with_doc": true,
|
||||
"margins": [
|
||||
0.699999988079071,
|
||||
0.699999988079071,
|
||||
0.75,
|
||||
0.75,
|
||||
0.30000001192092896,
|
||||
0.30000001192092896
|
||||
],
|
||||
"orientation": "Portrait",
|
||||
"page_order": "downThenOver",
|
||||
"paper": "Letter",
|
||||
"print_area": null,
|
||||
"row_breaks": [],
|
||||
"scale": 100,
|
||||
"title_cols": null,
|
||||
"title_rows": null
|
||||
},
|
||||
"protection": null,
|
||||
"right_to_left": false,
|
||||
"rows": {},
|
||||
"shapes": [],
|
||||
"show_formulas": false,
|
||||
"show_gridlines": true,
|
||||
"show_headings": true,
|
||||
"show_outline_symbols": true,
|
||||
"show_zeros": true,
|
||||
"slicers": [],
|
||||
"sparklines": [],
|
||||
"summary_below": true,
|
||||
"summary_right": true,
|
||||
"tab_color": null,
|
||||
"tables": [],
|
||||
"validations": [],
|
||||
"view": "normal",
|
||||
"view_active": {
|
||||
"col": 0,
|
||||
"row": 0
|
||||
},
|
||||
"view_top_left": {
|
||||
"col": 0,
|
||||
"row": 0
|
||||
},
|
||||
"visibility": "Visible",
|
||||
"zoom": 100
|
||||
}
|
||||
],
|
||||
"styles": {
|
||||
"styles": [
|
||||
{
|
||||
"align": {
|
||||
"h": "General",
|
||||
"indent": 0,
|
||||
"reading_order": null,
|
||||
"rotation": 0,
|
||||
"shrink": false,
|
||||
"v": "Bottom",
|
||||
"wrap": false
|
||||
},
|
||||
"borders": {
|
||||
"bottom": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_down": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_up": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"left": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"right": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"top": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
}
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"name": false,
|
||||
"protection": false,
|
||||
"scheme": null,
|
||||
"size": false,
|
||||
"strike": false,
|
||||
"underline": false
|
||||
},
|
||||
"fill": {
|
||||
"bg": "Auto",
|
||||
"fg": "Auto",
|
||||
"pattern": "None"
|
||||
},
|
||||
"font": {
|
||||
"bold": false,
|
||||
"charset": null,
|
||||
"color": "Auto",
|
||||
"family": null,
|
||||
"italic": false,
|
||||
"minor": true,
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"strike": false,
|
||||
"underline": "None",
|
||||
"vert": "Baseline"
|
||||
},
|
||||
"num_fmt": "General",
|
||||
"protection": {
|
||||
"hidden": false,
|
||||
"locked": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"align": {
|
||||
"h": "General",
|
||||
"indent": 0,
|
||||
"reading_order": null,
|
||||
"rotation": 0,
|
||||
"shrink": false,
|
||||
"v": "Bottom",
|
||||
"wrap": false
|
||||
},
|
||||
"borders": {
|
||||
"bottom": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_down": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_up": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"left": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"right": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"top": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
}
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"name": false,
|
||||
"protection": false,
|
||||
"scheme": null,
|
||||
"size": false,
|
||||
"strike": false,
|
||||
"underline": false
|
||||
},
|
||||
"fill": {
|
||||
"bg": "Auto",
|
||||
"fg": "Auto",
|
||||
"pattern": "None"
|
||||
},
|
||||
"font": {
|
||||
"bold": true,
|
||||
"charset": null,
|
||||
"color": "Auto",
|
||||
"family": null,
|
||||
"italic": false,
|
||||
"minor": true,
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"strike": false,
|
||||
"underline": "None",
|
||||
"vert": "Baseline"
|
||||
},
|
||||
"num_fmt": "General",
|
||||
"protection": {
|
||||
"hidden": false,
|
||||
"locked": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"align": {
|
||||
"h": "General",
|
||||
"indent": 0,
|
||||
"reading_order": null,
|
||||
"rotation": 0,
|
||||
"shrink": false,
|
||||
"v": "Bottom",
|
||||
"wrap": false
|
||||
},
|
||||
"borders": {
|
||||
"bottom": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_down": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"diag_up": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"left": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"right": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
},
|
||||
"top": {
|
||||
"color": "Auto",
|
||||
"style": "None"
|
||||
}
|
||||
},
|
||||
"dxf_stated": {
|
||||
"bold": false,
|
||||
"italic": false,
|
||||
"name": false,
|
||||
"protection": false,
|
||||
"scheme": null,
|
||||
"size": false,
|
||||
"strike": false,
|
||||
"underline": false
|
||||
},
|
||||
"fill": {
|
||||
"bg": "Auto",
|
||||
"fg": "Auto",
|
||||
"pattern": "None"
|
||||
},
|
||||
"font": {
|
||||
"bold": false,
|
||||
"charset": null,
|
||||
"color": "Auto",
|
||||
"family": null,
|
||||
"italic": false,
|
||||
"minor": true,
|
||||
"name": "Calibri",
|
||||
"size": 11.0,
|
||||
"strike": false,
|
||||
"underline": "None",
|
||||
"vert": "Baseline"
|
||||
},
|
||||
"num_fmt": "0.00",
|
||||
"protection": {
|
||||
"hidden": false,
|
||||
"locked": true
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"theme": {
|
||||
"colors": [
|
||||
16777215,
|
||||
0,
|
||||
15263976,
|
||||
927809,
|
||||
1400962,
|
||||
15298866,
|
||||
1665828,
|
||||
1023701,
|
||||
10496915,
|
||||
5154606,
|
||||
4618374,
|
||||
9855101
|
||||
],
|
||||
"major_font": "Calibri",
|
||||
"major_font_cs": "",
|
||||
"major_font_ea": "",
|
||||
"major_font_scripts": [],
|
||||
"minor_font": "Calibri",
|
||||
"minor_font_cs": "",
|
||||
"minor_font_ea": "",
|
||||
"minor_font_scripts": [],
|
||||
"name": "Craft"
|
||||
},
|
||||
"vba_project": null
|
||||
}
|
||||
@@ -9,10 +9,7 @@ use crate::style::{Color, Style};
|
||||
mod pivot;
|
||||
mod print;
|
||||
|
||||
pub use pivot::{
|
||||
PIVOT_INDEXER, PivotCalcField, PivotDataCell, PivotDateGroup, PivotField, PivotFilter, PivotFunc, PivotIndexer, PivotItemRef, PivotLayout,
|
||||
PivotLookup, PivotShowAs, PivotSort, PivotTable, PivotValue, pivot_key,
|
||||
};
|
||||
pub use pivot::{PivotCalcField, PivotDateGroup, PivotField, PivotFilter, PivotFunc, PivotLayout, PivotShowAs, PivotSort, PivotTable, PivotValue};
|
||||
pub use print::{EditRange, HfPage, LineInfo, Orientation, PageOrder, PrintSettings, SheetProtection, password_hash};
|
||||
|
||||
// ---------------------------------------------------------------- tables
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use gridcraft_core::Value;
|
||||
|
||||
use super::{CellRef, RangeRef};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
@@ -133,11 +131,6 @@ pub struct PivotTable {
|
||||
pub last_range: Option<RangeRef>,
|
||||
/// Calculated fields, usable in the Values area by name.
|
||||
pub calculated_fields: Vec<PivotCalcField>,
|
||||
/// Where GETPIVOTDATA finds the report's value cells, as of the last refresh. Shared between
|
||||
/// workbook clones (so editing the pivot's sheet doesn't copy it), set on refresh and saved
|
||||
/// with the report, so a reopened unrefreshed pivot still reads the report it stored. Only a
|
||||
/// pivot loaded without one (XLSX) builds it on first use, checked against the stored report.
|
||||
pub data_index: PivotLookup,
|
||||
/// The Σ Values pseudo-field (it exists with two or more value fields) sits in Rows rather
|
||||
/// than Columns (Excel's "values on rows").
|
||||
pub values_on_rows: bool,
|
||||
@@ -156,143 +149,6 @@ pub struct PivotCalcField {
|
||||
pub formula: String,
|
||||
}
|
||||
|
||||
/// One value cell of a computed PivotTable report: the value field, the row and column items
|
||||
/// that locate it (fewer for subtotals, none for the grand total) and where the report shows it.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct PivotDataCell {
|
||||
/// The value field's caption ("Sum of Sales").
|
||||
pub data_field: String,
|
||||
/// The value field's source column ("Sales").
|
||||
pub source_col: String,
|
||||
pub items: Vec<PivotItemRef>,
|
||||
/// Row and column of the cell, counted from the report's top-left cell.
|
||||
pub row: u32,
|
||||
pub col: u32,
|
||||
}
|
||||
|
||||
/// Builds a PivotTable's value cells from its source (`sheet` is the pivot's sheet). The engine
|
||||
/// sets it; the model can't compute reports.
|
||||
pub type PivotIndexer = fn(&crate::Workbook, usize, &PivotTable) -> Result<Vec<PivotDataCell>, String>;
|
||||
pub static PIVOT_INDEXER: std::sync::OnceLock<PivotIndexer> = std::sync::OnceLock::new();
|
||||
|
||||
fn norm(s: &str) -> String {
|
||||
s.trim().to_lowercase()
|
||||
}
|
||||
|
||||
/// One part of a lookup key: length-prefixed, so no label text can imitate a separator.
|
||||
fn key_part(out: &mut String, s: &str) {
|
||||
out.push_str(&s.len().to_string());
|
||||
out.push(':');
|
||||
out.push_str(s);
|
||||
}
|
||||
|
||||
/// The lookup key of a value field with field/item labels (names ignore case and outer blanks).
|
||||
/// Each item is `(field, label, is_bool)`: a Boolean item and a text item with the same label
|
||||
/// are different items.
|
||||
pub fn pivot_key(data_field: &str, items: &[(&str, &str, bool)]) -> String {
|
||||
let mut parts: Vec<String> = items
|
||||
.iter()
|
||||
.map(|(f, l, b)| {
|
||||
let mut p = String::new();
|
||||
key_part(&mut p, &norm(f));
|
||||
key_part(&mut p, &norm(l));
|
||||
p.push(if *b { 'b' } else { 't' });
|
||||
p
|
||||
})
|
||||
.collect();
|
||||
parts.sort_unstable();
|
||||
let mut key = String::new();
|
||||
key_part(&mut key, &norm(data_field));
|
||||
key.push_str(&parts.len().to_string());
|
||||
key.push('|');
|
||||
for p in parts {
|
||||
key.push_str(&p);
|
||||
}
|
||||
key
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct LookupInner {
|
||||
cells: std::sync::OnceLock<Vec<PivotDataCell>>,
|
||||
keys: std::sync::OnceLock<std::collections::HashMap<String, usize>>,
|
||||
}
|
||||
|
||||
/// A PivotTable's GETPIVOTDATA index. Clones share it, so `Workbook` clones per command stay
|
||||
/// cheap however large the report is. The cells are set on refresh or on first use; the hash of
|
||||
/// them is built on the first lookup.
|
||||
#[derive(Clone, Default)]
|
||||
pub struct PivotLookup(std::sync::Arc<LookupInner>);
|
||||
|
||||
impl PivotLookup {
|
||||
/// The value cells, if they were set.
|
||||
pub fn cells(&self) -> Option<&[PivotDataCell]> {
|
||||
self.0.cells.get().map(Vec::as_slice)
|
||||
}
|
||||
|
||||
/// Sets the value cells (the first set wins) and returns them.
|
||||
pub fn set_cells(&self, cells: Vec<PivotDataCell>) -> &[PivotDataCell] {
|
||||
self.0.cells.get_or_init(|| cells)
|
||||
}
|
||||
|
||||
/// The cell with this value field and exactly these items, by hash.
|
||||
pub fn find(&self, data_field: &str, items: &[(&str, &str, bool)]) -> Option<&PivotDataCell> {
|
||||
let cells = self.0.cells.get()?;
|
||||
let keys = self.0.keys.get_or_init(|| {
|
||||
let mut m = std::collections::HashMap::with_capacity(cells.len());
|
||||
for (i, c) in cells.iter().enumerate() {
|
||||
let items: Vec<(&str, &str, bool)> =
|
||||
c.items.iter().map(|it| (it.field.as_str(), it.label.as_str(), matches!(it.value, Value::Bool(_)))).collect();
|
||||
m.entry(pivot_key(&c.data_field, &items)).or_insert(i);
|
||||
m.entry(pivot_key(&c.source_col, &items)).or_insert(i);
|
||||
}
|
||||
m
|
||||
});
|
||||
keys.get(&pivot_key(data_field, items)).and_then(|i| cells.get(*i))
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for PivotLookup {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "PivotLookup({} cells)", self.cells().map_or(0, <[PivotDataCell]>::len))
|
||||
}
|
||||
}
|
||||
|
||||
/// Saved as the list of value cells (or nothing before the first refresh); the hash is rebuilt.
|
||||
/// An empty list is never saved: it is no index, and restoring one would lock the shared lookup
|
||||
/// against the lazy rebuild that a reopened workbook needs.
|
||||
impl Serialize for PivotLookup {
|
||||
fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
|
||||
self.cells().filter(|cells| !cells.is_empty()).serialize(s)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'de> Deserialize<'de> for PivotLookup {
|
||||
fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
|
||||
let l = PivotLookup::default();
|
||||
if let Some(cells) = Option::<Vec<PivotDataCell>>::deserialize(d)?
|
||||
&& !cells.is_empty()
|
||||
{
|
||||
l.set_cells(cells);
|
||||
}
|
||||
Ok(l)
|
||||
}
|
||||
}
|
||||
|
||||
/// The index is a cache, not part of a PivotTable's identity.
|
||||
impl PartialEq for PivotLookup {
|
||||
fn eq(&self, _: &Self) -> bool {
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
/// A row or column field item: the field's source column, the item's label and its value.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct PivotItemRef {
|
||||
pub field: String,
|
||||
pub label: String,
|
||||
pub value: Value,
|
||||
}
|
||||
|
||||
impl Default for PivotTable {
|
||||
fn default() -> Self {
|
||||
PivotTable {
|
||||
@@ -314,65 +170,8 @@ impl Default for PivotTable {
|
||||
show_headers: true,
|
||||
last_range: None,
|
||||
calculated_fields: vec![],
|
||||
data_index: PivotLookup::default(),
|
||||
values_on_rows: false,
|
||||
values_position: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod pivot_lookup_tests {
|
||||
use super::*;
|
||||
|
||||
fn cell(field: &str, label: &str, value: Value, row: u32) -> PivotDataCell {
|
||||
PivotDataCell {
|
||||
data_field: "Sum of Sales".into(),
|
||||
source_col: "Sales".into(),
|
||||
items: vec![PivotItemRef { field: field.into(), label: label.into(), value }],
|
||||
row,
|
||||
col: 1,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn labels_with_separator_characters_do_not_collide() {
|
||||
let l = PivotLookup::default();
|
||||
// Two different (field, label) pairs that a separator-joined key would make identical.
|
||||
l.set_cells(vec![cell("A\u{2}B", "C", Value::Text("C".into()), 1), cell("A", "B\u{2}C", Value::Text("B\u{2}C".into()), 2)]);
|
||||
assert_eq!(l.find("Sales", &[("A\u{2}B", "C", false)]).unwrap().row, 1);
|
||||
assert_eq!(l.find("Sales", &[("A", "B\u{2}C", false)]).unwrap().row, 2);
|
||||
// A label carrying the old pair separator cannot stand for two items.
|
||||
assert!(l.find("Sales", &[("A", "B", false), ("C", "D", false)]).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn boolean_and_text_items_with_one_label_are_different_items() {
|
||||
let l = PivotLookup::default();
|
||||
l.set_cells(vec![cell("Flag", "TRUE", Value::Text("TRUE".into()), 1), cell("Flag", "TRUE", Value::Bool(true), 2)]);
|
||||
assert_eq!(l.find("Sales", &[("Flag", "TRUE", true)]).unwrap().row, 2);
|
||||
assert_eq!(l.find("Sales", &[("Flag", "TRUE", false)]).unwrap().row, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn index_round_trips_through_serde() {
|
||||
let l = PivotLookup::default();
|
||||
l.set_cells(vec![cell("Region", "East", Value::Text("East".into()), 1)]);
|
||||
let back: PivotLookup = serde_json::from_str(&serde_json::to_string(&l).unwrap()).unwrap();
|
||||
assert_eq!(back.find("Sales", &[("Region", "East", false)]).unwrap().row, 1);
|
||||
let none: PivotLookup = serde_json::from_str(&serde_json::to_string(&PivotLookup::default()).unwrap()).unwrap();
|
||||
assert!(none.cells().is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_empty_lookup_is_saved_as_no_index() {
|
||||
// An empty cell list is no index, so it must not be saved as an empty one: restoring an
|
||||
// empty index counts as an initialized lookup, which blocks the lazy rebuild.
|
||||
let l = PivotLookup::default();
|
||||
l.set_cells(vec![]);
|
||||
let saved = serde_json::to_string(&l).unwrap();
|
||||
assert_eq!(saved, "null", "an empty lookup saves no index: {saved}");
|
||||
let back: PivotLookup = serde_json::from_str("[]").unwrap();
|
||||
assert!(back.cells().is_none(), "an empty saved list restores no index");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,11 +53,6 @@ pub struct PrintSettings {
|
||||
/// sheet is more than one page wide and tall.
|
||||
#[serde(default)]
|
||||
pub page_order: PageOrder,
|
||||
/// Page Setup › Page › First page number: the number the sheet's first printed page takes,
|
||||
/// or `None` for Automatic (XLSX `pageSetup firstPageNumber` with `useFirstPageNumber`). Left
|
||||
/// out of a JSON workbook when Automatic, so files without it are written as before.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub first_page_number: Option<u32>,
|
||||
}
|
||||
|
||||
fn yes() -> bool {
|
||||
@@ -192,7 +187,6 @@ impl Default for PrintSettings {
|
||||
hf_scale_with_doc: true,
|
||||
hf_align_with_margins: true,
|
||||
page_order: PageOrder::DownThenOver,
|
||||
first_page_number: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -287,17 +281,4 @@ mod tests {
|
||||
p = serde_json::from_value(saved).unwrap();
|
||||
assert_eq!(p, PrintSettings::default());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn first_page_number_is_saved_only_when_set() {
|
||||
// Automatic writes nothing, so a JSON workbook without a first page number is unchanged and
|
||||
// one saved before the field existed loads as Automatic.
|
||||
let saved = serde_json::to_value(PrintSettings::default()).unwrap();
|
||||
assert!(saved.get("first_page_number").is_none(), "{saved}");
|
||||
assert_eq!(serde_json::from_value::<PrintSettings>(saved).unwrap().first_page_number, None);
|
||||
let p = PrintSettings { first_page_number: Some(7), ..Default::default() };
|
||||
let saved = serde_json::to_value(&p).unwrap();
|
||||
assert_eq!(saved["first_page_number"], 7);
|
||||
assert_eq!(serde_json::from_value::<PrintSettings>(saved).unwrap(), p);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-10
@@ -3,19 +3,10 @@ name = "gridcraft-pdf"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
description = "GridCraft PDF 1.7 writer with shaped Arabic text, vector drawing and RGBA images"
|
||||
description = "GridCraft's tiny self-contained PDF 1.7 writer (standard 14 fonts, vector drawing, RGBA images)"
|
||||
readme = "README.md"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
[dependencies]
|
||||
craft-pdf.workspace = true
|
||||
craft-stream-codecs.workspace = true
|
||||
harfrust = "=0.12.0"
|
||||
skrifa = { workspace = true }
|
||||
unicode-bidi = "=0.3.18"
|
||||
|
||||
[build-dependencies]
|
||||
sha2 = { workspace = true }
|
||||
skrifa = { workspace = true }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# gridcraft-pdf
|
||||
|
||||
A small PDF 1.7 writer for shaped Arabic text, vector drawing and RGBA images.
|
||||
A small, dependency-free PDF 1.7 writer for vector drawing and RGBA images.
|
||||
|
||||
## API migration
|
||||
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
use std::fmt::Write as _;
|
||||
|
||||
fn main() -> Result<(), String> {
|
||||
arabic_fonts()
|
||||
}
|
||||
|
||||
/// Embed only Arabic fallback faces from the optional, separately licensed font bundle.
|
||||
fn arabic_fonts() -> Result<(), String> {
|
||||
use std::path::PathBuf;
|
||||
println!("cargo::rerun-if-env-changed=CRAFT_FONTS_DIR");
|
||||
println!("cargo::rerun-if-env-changed=CRAFT_FONTS_REQUIRED");
|
||||
let required = std::env::var_os("CRAFT_FONTS_REQUIRED").is_some();
|
||||
let entries = match std::env::var_os("CRAFT_FONTS_DIR").map(PathBuf::from) {
|
||||
Some(dir) => arabic_font_entries(&dir),
|
||||
None if required => Err("CRAFT_FONTS_REQUIRED needs CRAFT_FONTS_DIR".into()),
|
||||
None => Ok(String::new()),
|
||||
};
|
||||
let entries = match entries {
|
||||
Ok(entries) => entries,
|
||||
Err(e) if required => return Err(e),
|
||||
Err(e) => {
|
||||
println!("cargo::warning=building without bundled Arabic fonts: {e}");
|
||||
String::new()
|
||||
}
|
||||
};
|
||||
let out = PathBuf::from(std::env::var_os("OUT_DIR").unwrap_or_default()).join("arabic_fonts.rs");
|
||||
std::fs::write(&out, format!("pub(crate) static ARABIC_FONTS: &[(&str, &[u8])] = &[\n{entries}];\n"))
|
||||
.map_err(|e| format!("writing {}: {e}", out.display()))
|
||||
}
|
||||
|
||||
fn arabic_font_entries(dir: &std::path::Path) -> Result<String, String> {
|
||||
use sha2::{Digest, Sha256};
|
||||
use skrifa::MetadataProvider;
|
||||
let root = dir.canonicalize().map_err(|e| format!("craft-fonts directory: {e}"))?;
|
||||
let manifest = root.join("fonts/manifest.txt");
|
||||
println!("cargo::rerun-if-changed={}", manifest.display());
|
||||
let text = String::from_utf8(read_font_input(&manifest, 1 << 20)?).map_err(|e| e.to_string())?;
|
||||
let mut out = String::new();
|
||||
let mut has_regular = false;
|
||||
for (line_number, line) in text.lines().enumerate() {
|
||||
let line = line.trim();
|
||||
if line.is_empty() || line.starts_with('#') {
|
||||
continue;
|
||||
}
|
||||
let fields: Vec<_> = line.split(" | ").map(str::trim).collect();
|
||||
let [family, style, file, scripts, _licence, licence_file, checksum, _source] = fields.as_slice() else {
|
||||
return Err(format!("malformed craft-fonts manifest line {}", line_number + 1));
|
||||
};
|
||||
if !scripts.split(',').any(|script| script.trim() == "Arab") {
|
||||
continue;
|
||||
}
|
||||
let path = root.join(file).canonicalize().map_err(|e| format!("{file}: {e}"))?;
|
||||
let licence = root.join(licence_file).canonicalize().map_err(|e| format!("{licence_file}: {e}"))?;
|
||||
if !path.starts_with(&root) || !licence.starts_with(&root) {
|
||||
return Err("craft-fonts paths must stay inside the checkout".into());
|
||||
}
|
||||
println!("cargo::rerun-if-changed={}", path.display());
|
||||
println!("cargo::rerun-if-changed={}", licence.display());
|
||||
let bytes = read_font_input(&path, 64 << 20)?;
|
||||
if Sha256::digest(&bytes).iter().map(|byte| format!("{byte:02x}")).collect::<String>() != *checksum {
|
||||
return Err(format!("checksum mismatch for {file}"));
|
||||
}
|
||||
let font = skrifa::FontRef::from_index(&bytes, 0).map_err(|e| format!("invalid Arabic font {file}: {e}"))?;
|
||||
if !"العربية١٢٣".chars().all(|ch| font.charmap().map(ch).is_some()) {
|
||||
return Err(format!("{file} lacks Arabic glyphs"));
|
||||
}
|
||||
let _ = writeln!(out, " ({:?}, include_bytes!({:?})),", format!("craft:{family}:{style}"), path);
|
||||
has_regular |= *style != "Bold";
|
||||
}
|
||||
if out.is_empty() {
|
||||
return Err("craft-fonts manifest contains no Arabic face; update the checkout".into());
|
||||
}
|
||||
if !has_regular {
|
||||
return Err("craft-fonts manifest has only bold Arabic faces; regular text needs a regular or variable face".into());
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn read_font_input(path: &std::path::Path, limit: u64) -> Result<Vec<u8>, String> {
|
||||
use std::io::Read as _;
|
||||
let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?;
|
||||
let mut bytes = Vec::new();
|
||||
file.take(limit + 1).read_to_end(&mut bytes).map_err(|e| format!("{}: {e}", path.display()))?;
|
||||
if bytes.len() as u64 > limit {
|
||||
return Err(format!("{} exceeds the font input size limit", path.display()));
|
||||
}
|
||||
Ok(bytes)
|
||||
}
|
||||
@@ -1,666 +0,0 @@
|
||||
//! Arabic shaping and subset Type3 fonts. Outlines use the same variation coordinates as the
|
||||
//! shaper; ActualText preserves the logical source independently of visual glyph order.
|
||||
use std::{borrow::Cow, collections::BTreeMap, fmt::Write as _, sync::OnceLock};
|
||||
|
||||
use harfrust::{Direction, ShaperData, ShaperInstance, UnicodeBuffer};
|
||||
use skrifa::{
|
||||
FontRef, MetadataProvider,
|
||||
instance::Size,
|
||||
outline::{DrawSettings, OutlinePen},
|
||||
};
|
||||
use unicode_bidi::BidiInfo;
|
||||
|
||||
use crate::{CID_FONT, Error, Font, TextDirection, n, needs_cid, pdf_string, pdf_utf16_string};
|
||||
|
||||
include!(concat!(env!("OUT_DIR"), "/arabic_fonts.rs"));
|
||||
|
||||
const MAX_TEXT_BYTES: usize = 128 * 1024;
|
||||
const MAX_OUTLINE_BYTES: usize = 256 * 1024;
|
||||
const MAX_SUBSET_BYTES: usize = 64 * 1024 * 1024;
|
||||
const MAX_SUBSET_GLYPHS: usize = 16_384;
|
||||
const SYNTHETIC_BOLD_STROKE: f32 = 30.0;
|
||||
|
||||
/// How `text` set in `font` is drawn. Symbol keeps its own one-run encoding, and Arabic without
|
||||
/// an installed or bundled face falls back to the standard fonts.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub(crate) enum Shaping {
|
||||
Plain,
|
||||
Shaped,
|
||||
NoFont,
|
||||
}
|
||||
|
||||
pub(crate) fn shaping(font: Font, text: &str) -> Shaping {
|
||||
if font == Font::Symbol || !needed(text) {
|
||||
return Shaping::Plain;
|
||||
}
|
||||
match face(bold(font)) {
|
||||
Ok(None) => Shaping::NoFont,
|
||||
Ok(Some(_)) | Err(_) => Shaping::Shaped,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn shaped(font: Font, text: &str) -> bool {
|
||||
shaping(font, text) == Shaping::Shaped
|
||||
}
|
||||
|
||||
pub(crate) fn needed(text: &str) -> bool {
|
||||
text.chars().any(|ch| matches!(ch as u32, 0x0600..=0x06ff | 0x0750..=0x077f | 0x0870..=0x089f | 0x08a0..=0x08ff | 0xfb50..=0xfdff | 0xfe70..=0xfefc | 0x10e60..=0x10e7f | 0x1ee00..=0x1eeff))
|
||||
}
|
||||
|
||||
fn bold(font: Font) -> bool {
|
||||
matches!(
|
||||
font,
|
||||
Font::HelveticaBold | Font::HelveticaBoldOblique | Font::TimesBold | Font::TimesBoldItalic | Font::CourierBold | Font::CourierBoldOblique
|
||||
)
|
||||
}
|
||||
|
||||
fn italic(font: Font) -> bool {
|
||||
matches!(
|
||||
font,
|
||||
Font::HelveticaOblique
|
||||
| Font::HelveticaBoldOblique
|
||||
| Font::TimesItalic
|
||||
| Font::TimesBoldItalic
|
||||
| Font::CourierOblique
|
||||
| Font::CourierBoldOblique
|
||||
)
|
||||
}
|
||||
|
||||
struct Face {
|
||||
bytes: Cow<'static, [u8]>,
|
||||
data: ShaperData,
|
||||
instance: ShaperInstance,
|
||||
synthetic_bold: bool,
|
||||
}
|
||||
|
||||
impl Face {
|
||||
fn new(bytes: Cow<'static, [u8]>, bold: bool) -> Result<Self, Error> {
|
||||
let font = FontRef::from_index(&bytes, 0).map_err(|e| Error(format!("Invalid Arabic PDF font: {e}")))?;
|
||||
if !"العربية١٢٣".chars().all(|ch| font.charmap().map(ch).is_some()) {
|
||||
return Err(Error("The PDF font lacks Arabic glyphs".into()));
|
||||
}
|
||||
let data = ShaperData::new(&font);
|
||||
let instance = ShaperInstance::from_variations(&font, [("wght", if bold { 700.0 } else { 400.0 })]);
|
||||
Ok(Self { bytes, data, instance, synthetic_bold: false })
|
||||
}
|
||||
|
||||
fn font(&self) -> Result<FontRef<'_>, Error> {
|
||||
FontRef::from_index(&self.bytes, 0).map_err(|e| Error(format!("Invalid Arabic PDF font: {e}")))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) fn bold_face_is_synthetic() -> bool {
|
||||
face(true).is_ok_and(|face| face.is_some_and(|face| face.synthetic_bold))
|
||||
}
|
||||
|
||||
/// The Arabic face for a weight, or `None` when none is bundled or installed. The search runs
|
||||
/// once per weight, so measuring text never rescans the font directories.
|
||||
fn face(is_bold: bool) -> Result<Option<&'static Face>, Error> {
|
||||
static REGULAR: OnceLock<Result<Option<Face>, Error>> = OnceLock::new();
|
||||
static BOLD: OnceLock<Result<Option<Face>, Error>> = OnceLock::new();
|
||||
let cache = if is_bold { &BOLD } else { ®ULAR };
|
||||
cache.get_or_init(|| find_face(ARABIC_FONTS, &system_font_dirs(), is_bold)).as_ref().map(Option::as_ref).map_err(Error::clone)
|
||||
}
|
||||
|
||||
fn loaded_face(font: Font) -> Result<&'static Face, Error> {
|
||||
face(bold(font))?.ok_or_else(|| Error("Arabic PDF export needs Noto Sans Arabic".into()))
|
||||
}
|
||||
|
||||
fn bundled_match(fonts: &[(&str, &'static [u8])], is_bold: bool) -> Option<&'static [u8]> {
|
||||
fonts
|
||||
.iter()
|
||||
.find(|(name, bytes)| if is_bold { name.ends_with(":Bold") || has_weight_axis(bytes) } else { !name.ends_with(":Bold") })
|
||||
.map(|&(_, bytes)| bytes)
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn system_font_dirs() -> Vec<std::path::PathBuf> {
|
||||
use std::path::PathBuf;
|
||||
let mut dirs: Vec<PathBuf> = [
|
||||
"/usr/share/fonts/noto",
|
||||
"/usr/share/fonts/google-noto-vf",
|
||||
"/usr/share/fonts/truetype/noto",
|
||||
"/usr/share/fonts/TTF",
|
||||
"/usr/local/share/fonts",
|
||||
"/usr/local/share/fonts/noto",
|
||||
"/usr/local/share/fonts/TTF",
|
||||
"/Library/Fonts",
|
||||
]
|
||||
.into_iter()
|
||||
.map(Into::into)
|
||||
.collect();
|
||||
if let Some(home) = std::env::var_os("HOME").or_else(|| std::env::var_os("USERPROFILE")) {
|
||||
let home = PathBuf::from(home);
|
||||
dirs.extend([home.join(".local/share/fonts"), home.join(".fonts"), home.join("Library/Fonts")]);
|
||||
}
|
||||
if let Some(root) = std::env::var_os("WINDIR") {
|
||||
dirs.push(PathBuf::from(root).join("Fonts"));
|
||||
}
|
||||
if let Some(root) = std::env::var_os("LOCALAPPDATA") {
|
||||
dirs.push(PathBuf::from(root).join("Microsoft/Windows/Fonts"));
|
||||
}
|
||||
dirs
|
||||
}
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
fn system_font_dirs() -> Vec<std::path::PathBuf> {
|
||||
Vec::new()
|
||||
}
|
||||
|
||||
fn find_face(bundled: &[(&str, &'static [u8])], dirs: &[std::path::PathBuf], is_bold: bool) -> Result<Option<Face>, Error> {
|
||||
use std::io::Read as _;
|
||||
if let Some(bytes) = bundled_match(bundled, is_bold) {
|
||||
return Face::new(Cow::Borrowed(bytes), is_bold).map(Some);
|
||||
}
|
||||
let filename = if is_bold { "NotoSansArabic-Bold.ttf" } else { "NotoSansArabic-Regular.ttf" };
|
||||
for dir in dirs {
|
||||
for name in ["NotoSansArabic.ttf", "NotoSansArabic[wght].ttf", filename] {
|
||||
let path = dir.join(name);
|
||||
let file = match std::fs::File::open(&path) {
|
||||
Ok(file) => file,
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => continue,
|
||||
Err(e) => return Err(Error(format!("Cannot read Arabic PDF font {}: {e}", path.display()))),
|
||||
};
|
||||
let mut bytes = Vec::new();
|
||||
file.take((64 << 20) + 1).read_to_end(&mut bytes).map_err(|e| Error(format!("Cannot read Arabic PDF font: {e}")))?;
|
||||
if bytes.len() > 64 << 20 {
|
||||
return Err(Error("Arabic PDF font exceeds 64 MiB".into()));
|
||||
}
|
||||
if is_bold && name != filename && !has_weight_axis(&bytes) {
|
||||
continue;
|
||||
}
|
||||
return Face::new(Cow::Owned(bytes), is_bold).map(Some);
|
||||
}
|
||||
}
|
||||
if let Some((name, bytes)) = bundled_fallback(bundled, is_bold) {
|
||||
let mut face = Face::new(Cow::Borrowed(bytes), is_bold)?;
|
||||
face.synthetic_bold = needs_synthetic_bold(name, bytes, is_bold);
|
||||
return Ok(Some(face));
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
/// The bundled face to use when no face matches the requested weight: regular text never borrows a bold face.
|
||||
fn bundled_fallback<'a>(fonts: &[(&'a str, &'static [u8])], is_bold: bool) -> Option<(&'a str, &'static [u8])> {
|
||||
fonts.iter().find(|(name, _)| is_bold || !name.ends_with(":Bold")).copied()
|
||||
}
|
||||
|
||||
/// A bold request served by a static regular face is emboldened by stroking its outlines.
|
||||
fn needs_synthetic_bold(name: &str, bytes: &[u8], is_bold: bool) -> bool {
|
||||
is_bold && !name.ends_with(":Bold") && !has_weight_axis(bytes)
|
||||
}
|
||||
|
||||
fn has_weight_axis(bytes: &[u8]) -> bool {
|
||||
FontRef::from_index(bytes, 0).is_ok_and(|font| font.axes().iter().any(|axis| axis.tag() == skrifa::raw::types::Tag::new(b"wght")))
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) enum Item {
|
||||
Glyph { id: u32, x: f32, y: f32, source: String },
|
||||
Latin { text: String, x: f32 },
|
||||
Cid { text: String, x: f32 },
|
||||
}
|
||||
|
||||
pub(crate) struct Layout {
|
||||
pub items: Vec<Item>,
|
||||
pub width: f32,
|
||||
}
|
||||
|
||||
/// Positions are in 1/1000 em, matching the Type3 font matrix.
|
||||
pub(crate) fn layout(font: Font, text: &str, direction: TextDirection) -> Result<Layout, Error> {
|
||||
if text.len() > MAX_TEXT_BYTES {
|
||||
return Err(Error("Arabic PDF text exceeds the 128 KiB per-line limit".into()));
|
||||
}
|
||||
let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction };
|
||||
let face = loaded_face(font)?;
|
||||
let raw = face.font()?;
|
||||
let shaper = face.data.shaper(&raw).instance(Some(&face.instance)).build();
|
||||
let units = shaper.units_per_em();
|
||||
if units <= 0 {
|
||||
return Err(Error("Arabic PDF font has invalid units per em".into()));
|
||||
}
|
||||
let scale = 1000.0 / units as f32;
|
||||
let single_line: String = text.chars().map(|ch| if is_paragraph_break(ch) { ' ' } else { ch }).collect();
|
||||
let text = single_line.as_str();
|
||||
let bidi = BidiInfo::new(text, direction.level());
|
||||
let mut layout = Layout { items: Vec::new(), width: 0.0 };
|
||||
for para in &bidi.paragraphs {
|
||||
let (levels, runs) = bidi.visual_runs(para, para.range.clone());
|
||||
for run in runs {
|
||||
let rtl = levels.get(run.start).is_some_and(|level| level.is_rtl());
|
||||
let run_text = text.get(run.clone()).ok_or_else(|| Error("Invalid PDF text boundary".into()))?;
|
||||
let mut spans = Vec::new();
|
||||
let mut start = 0;
|
||||
let mut embedded = None;
|
||||
for (i, ch) in run_text.char_indices() {
|
||||
let supported = embeddable(raw.charmap().map(ch).is_some(), ch);
|
||||
if embedded.is_some_and(|v| v != supported) {
|
||||
spans.push((start..i, embedded.unwrap_or(false)));
|
||||
start = i;
|
||||
}
|
||||
embedded = Some(supported);
|
||||
}
|
||||
spans.push((start..run_text.len(), embedded.unwrap_or(false)));
|
||||
if rtl {
|
||||
spans.reverse();
|
||||
}
|
||||
for (span, embedded) in spans {
|
||||
let part = run_text.get(span.clone()).ok_or_else(|| Error("Invalid PDF text boundary".into()))?;
|
||||
if !embedded {
|
||||
let part = part.chars().map(|ch| if is_line_break(ch) { ' ' } else { ch });
|
||||
let part: Vec<char> = if rtl { part.rev().map(mirror_ansi).collect() } else { part.collect() };
|
||||
for run in part.chunk_by(|a, b| needs_cid(*a) == needs_cid(*b)) {
|
||||
let (text, x) = (run.iter().collect(), layout.width);
|
||||
layout.width += run.iter().map(|&ch| f32::from(font.char_width(ch))).sum::<f32>();
|
||||
layout.items.push(if run.first().is_some_and(|&ch| needs_cid(ch)) { Item::Cid { text, x } } else { Item::Latin { text, x } });
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let mut buffer = UnicodeBuffer::new();
|
||||
buffer.push_str(part);
|
||||
buffer.set_pre_context(run_text.get(..span.start).unwrap_or_default());
|
||||
buffer.set_post_context(run_text.get(span.end..).unwrap_or_default());
|
||||
buffer.set_direction(if rtl { Direction::RightToLeft } else { Direction::LeftToRight });
|
||||
buffer.set_flags(harfrust::BufferFlags::REMOVE_DEFAULT_IGNORABLES);
|
||||
if needed(part) {
|
||||
buffer.set_script(harfrust::script::ARABIC);
|
||||
}
|
||||
buffer.guess_segment_properties();
|
||||
let shaped = shaper.shape(buffer, harfrust::ShapeOptions::new());
|
||||
let mut clusters: Vec<_> = shaped.glyph_infos().iter().map(|g| g.cluster as usize).collect();
|
||||
clusters.push(part.len());
|
||||
clusters.sort_unstable();
|
||||
clusters.dedup();
|
||||
let mut previous_cluster = None;
|
||||
for (info, pos) in shaped.glyph_infos().iter().zip(shaped.glyph_positions()) {
|
||||
if info.glyph_id == 0 {
|
||||
return Err(Error("The Arabic PDF font produced a missing glyph".into()));
|
||||
}
|
||||
let cluster = info.cluster as usize;
|
||||
let source = if previous_cluster == Some(cluster) {
|
||||
String::new()
|
||||
} else {
|
||||
let index = clusters.binary_search(&cluster).map_err(|_| Error("Invalid PDF glyph cluster".into()))?;
|
||||
let end = clusters.get(index + 1).copied().ok_or_else(|| Error("Invalid PDF glyph cluster".into()))?;
|
||||
part.get(cluster..end).ok_or_else(|| Error("Invalid PDF glyph cluster".into()))?.to_string()
|
||||
};
|
||||
previous_cluster = Some(cluster);
|
||||
layout.items.push(Item::Glyph {
|
||||
id: info.glyph_id,
|
||||
x: layout.width + pos.x_offset as f32 * scale,
|
||||
y: pos.y_offset as f32 * scale,
|
||||
source,
|
||||
});
|
||||
layout.width += pos.x_advance as f32 * scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(layout)
|
||||
}
|
||||
|
||||
pub(crate) fn vertical_extents(font: Font, text: &str, direction: TextDirection) -> Result<(f32, f32), Error> {
|
||||
let layout = layout(font, text, direction)?;
|
||||
let face = loaded_face(font)?;
|
||||
let raw = face.font()?;
|
||||
let metrics = raw.glyph_metrics(Size::new(1000.0), skrifa::instance::LocationRef::new(face.instance.coords()));
|
||||
let (mut ascent, mut descent) = (0.0_f32, 0.0_f32);
|
||||
for item in layout.items {
|
||||
match item {
|
||||
Item::Glyph { id, y, .. } => {
|
||||
let (bottom, top) = if let Some(bounds) = metrics.bounds(id.into()) {
|
||||
(bounds.y_min, bounds.y_max)
|
||||
} else {
|
||||
let glyph = raw.outline_glyphs().get(id.into()).ok_or_else(|| Error("Missing Arabic PDF glyph outline".into()))?;
|
||||
let mut pen = Pen::default();
|
||||
glyph
|
||||
.draw(DrawSettings::unhinted(Size::new(1000.0), skrifa::instance::LocationRef::new(face.instance.coords())), &mut pen)
|
||||
.map_err(|e| Error(format!("Cannot measure Arabic PDF glyph: {e}")))?;
|
||||
if pen.full {
|
||||
return Err(Error("Arabic PDF glyph exceeds the outline size limit".into()));
|
||||
}
|
||||
(pen.bounds[1], pen.bounds[3])
|
||||
};
|
||||
ascent = ascent.max(y + top);
|
||||
descent = descent.max(-y - bottom);
|
||||
}
|
||||
Item::Latin { .. } | Item::Cid { .. } => {
|
||||
ascent = ascent.max(800.0);
|
||||
descent = descent.max(220.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok((ascent, descent))
|
||||
}
|
||||
|
||||
/// Whether standard-font `text` is drawn in its logical order, unchanged.
|
||||
pub(crate) fn is_logical_order(text: &str, direction: TextDirection) -> bool {
|
||||
direction != TextDirection::RightToLeft && !text.chars().any(is_control)
|
||||
}
|
||||
|
||||
/// Bidi reordering for standard-font text requires no optional Arabic font.
|
||||
pub(crate) fn latin_visual(text: &str, direction: TextDirection) -> Result<Cow<'_, str>, Error> {
|
||||
if is_logical_order(text, direction) {
|
||||
return Ok(Cow::Borrowed(text));
|
||||
}
|
||||
if text.len() > MAX_TEXT_BYTES {
|
||||
return Err(Error("Bidirectional PDF text exceeds the 128 KiB per-line limit".into()));
|
||||
}
|
||||
let single_line: String = text.chars().map(|ch| if is_paragraph_break(ch) { ' ' } else { ch }).collect();
|
||||
let text = single_line.as_str();
|
||||
let bidi = BidiInfo::new(text, direction.level());
|
||||
let mut out = String::with_capacity(text.len());
|
||||
for para in &bidi.paragraphs {
|
||||
let (levels, runs) = bidi.visual_runs(para, para.range.clone());
|
||||
for run in runs {
|
||||
let part = text.get(run.clone()).unwrap_or_default();
|
||||
if levels.get(run.start).is_some_and(|level| level.is_rtl()) {
|
||||
out.extend(part.chars().rev().filter(|ch| !is_control(*ch)).map(mirror_ansi));
|
||||
} else {
|
||||
out.extend(part.chars().filter(|ch| !is_control(*ch)));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(Cow::Owned(out))
|
||||
}
|
||||
|
||||
fn mirror_ansi(ch: char) -> char {
|
||||
match ch {
|
||||
'(' => ')',
|
||||
')' => '(',
|
||||
'[' => ']',
|
||||
']' => '[',
|
||||
'{' => '}',
|
||||
'}' => '{',
|
||||
'<' => '>',
|
||||
'>' => '<',
|
||||
'«' => '»',
|
||||
'»' => '«',
|
||||
'‹' => '›',
|
||||
'›' => '‹',
|
||||
other => other,
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether a character is drawn from the embedded Arabic face. Line breaks never are, so the
|
||||
/// fallback path draws them as spaces even when the face maps them.
|
||||
fn embeddable(mapped: bool, ch: char) -> bool {
|
||||
(mapped || is_control(ch)) && !is_line_break(ch)
|
||||
}
|
||||
|
||||
fn is_line_break(ch: char) -> bool {
|
||||
matches!(ch, '\n' | '\r' | '\u{2028}' | '\u{2029}')
|
||||
}
|
||||
|
||||
/// Bidi paragraph separators (class B). A drawn line is one paragraph: left in, they would split it
|
||||
/// into paragraphs laid out left to right, swapping the parts of a right-to-left line.
|
||||
fn is_paragraph_break(ch: char) -> bool {
|
||||
matches!(ch, '\n' | '\r' | '\u{1C}'..='\u{1E}' | '\u{85}' | '\u{2029}')
|
||||
}
|
||||
|
||||
fn is_control(ch: char) -> bool {
|
||||
matches!(ch, '\u{061c}' | '\u{200c}'..='\u{200f}' | '\u{202a}'..='\u{202e}' | '\u{2066}'..='\u{2069}')
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub(crate) struct Subset {
|
||||
keys: BTreeMap<(u32, bool, bool, String), usize>,
|
||||
glyphs: Vec<Glyph>,
|
||||
bytes: usize,
|
||||
/// Some text on the page set a run in the CJK CID font, so the page must declare it.
|
||||
pub(crate) uses_cid: bool,
|
||||
}
|
||||
|
||||
struct Glyph {
|
||||
path: String,
|
||||
width: f32,
|
||||
source: String,
|
||||
bounds: [f32; 4],
|
||||
emboldened: bool,
|
||||
}
|
||||
|
||||
/// The Type3 glyph procedure: a filled outline, also stroked in the text colour when emboldened.
|
||||
fn glyph_procedure(glyph: &Glyph) -> String {
|
||||
if glyph.emboldened {
|
||||
format!("{} 0 d0\n{} w 1 j\n{}B\n", n(glyph.width), n(SYNTHETIC_BOLD_STROKE), glyph.path)
|
||||
} else {
|
||||
format!("{} 0 d0\n{}f\n", n(glyph.width), glyph.path)
|
||||
}
|
||||
}
|
||||
|
||||
impl Subset {
|
||||
fn insert(&mut self, font: Font, id: u32, source: String) -> Result<usize, Error> {
|
||||
let key = (id, bold(font), italic(font), source.clone());
|
||||
if let Some(index) = self.keys.get(&key) {
|
||||
return Ok(*index);
|
||||
}
|
||||
if self.glyphs.len() >= MAX_SUBSET_GLYPHS {
|
||||
return Err(Error("PDF page has too many distinct Arabic glyphs".into()));
|
||||
}
|
||||
let face = loaded_face(font)?;
|
||||
let raw = face.font()?;
|
||||
let location = skrifa::instance::LocationRef::new(face.instance.coords());
|
||||
let glyph = raw.outline_glyphs().get(id.into()).ok_or_else(|| Error("Missing Arabic PDF glyph outline".into()))?;
|
||||
let width =
|
||||
raw.glyph_metrics(Size::new(1000.0), location).advance_width(id.into()).ok_or_else(|| Error("Missing Arabic PDF glyph width".into()))?;
|
||||
let mut pen = Pen { shear: if italic(font) { 0.212_556_56 } else { 0.0 }, ..Default::default() };
|
||||
glyph.draw(DrawSettings::unhinted(Size::new(1000.0), location), &mut pen).map_err(|e| Error(format!("Cannot draw Arabic PDF glyph: {e}")))?;
|
||||
if pen.full || self.bytes.saturating_add(pen.path.len()).saturating_add(source.len().saturating_mul(2)) > MAX_SUBSET_BYTES {
|
||||
return Err(Error("Arabic PDF outlines exceed the page size limit".into()));
|
||||
}
|
||||
let index = self.glyphs.len();
|
||||
self.bytes += pen.path.len() + source.len() * 2;
|
||||
let emboldened = face.synthetic_bold;
|
||||
let grow = if emboldened { SYNTHETIC_BOLD_STROKE / 2.0 } else { 0.0 };
|
||||
let [x0, y0, x1, y1] = pen.bounds;
|
||||
self.glyphs.push(Glyph { path: pen.path, width, source, bounds: [x0 - grow, y0 - grow, x1 + grow, y1 + grow], emboldened });
|
||||
self.keys.insert(key, index);
|
||||
Ok(index)
|
||||
}
|
||||
|
||||
pub(crate) fn text(&mut self, font: Font, text: &str, size: f32, direction: TextDirection) -> Result<String, Error> {
|
||||
let layout = layout(font, text, direction)?;
|
||||
let mut out = format!("/Span << /ActualText {} >> BDC\nBT\n", unicode_string(text, true));
|
||||
for item in layout.items {
|
||||
match item {
|
||||
Item::Glyph { id, x, y, source } => {
|
||||
let index = self.insert(font, id, source)?;
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"/A{} {} Tf 1 0 0 1 {} {} Tm <{:02X}> Tj",
|
||||
index / 255 + 1,
|
||||
n(size),
|
||||
n(x * size / 1000.0),
|
||||
n(y * size / 1000.0),
|
||||
index % 255 + 1
|
||||
);
|
||||
}
|
||||
Item::Latin { text, x } => {
|
||||
let _ = writeln!(out, "/F{} {} Tf 1 0 0 1 {} 0 Tm {} Tj", font.index() + 1, n(size), n(x * size / 1000.0), pdf_string(&text));
|
||||
}
|
||||
Item::Cid { text, x } => {
|
||||
self.uses_cid = true;
|
||||
let _ = writeln!(out, "/F{} {} Tf 1 0 0 1 {} 0 Tm {} Tj", CID_FONT + 1, n(size), n(x * size / 1000.0), pdf_utf16_string(&text));
|
||||
}
|
||||
}
|
||||
}
|
||||
out.push_str("ET\nEMC");
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Writes the subset fonts into `out` and returns their page resource entries.
|
||||
pub(crate) fn write_objects(&self, next: &mut u32, out: &mut craft_pdf::classic::Writer) -> Result<String, Error> {
|
||||
let mut resources = String::new();
|
||||
for (batch, glyphs) in self.glyphs.chunks(255).enumerate() {
|
||||
let id = *next;
|
||||
let cmap_id = id + 1;
|
||||
*next += 2;
|
||||
let mut procs = String::new();
|
||||
let mut names = String::new();
|
||||
let mut widths = String::new();
|
||||
let mut mappings = Vec::new();
|
||||
let mut bounds = [0.0_f32; 4];
|
||||
for (i, glyph) in glyphs.iter().enumerate() {
|
||||
let code = i + 1;
|
||||
let _ = write!(procs, "/g{code} {} 0 R ", *next);
|
||||
let _ = write!(names, "/g{code} ");
|
||||
let _ = write!(widths, "{} ", n(glyph.width));
|
||||
let body = glyph_procedure(glyph);
|
||||
out.stream(*next, "", body.as_bytes())?;
|
||||
*next += 1;
|
||||
bounds[0] = bounds[0].min(glyph.bounds[0]);
|
||||
bounds[1] = bounds[1].min(glyph.bounds[1]);
|
||||
bounds[2] = bounds[2].max(glyph.bounds[2]);
|
||||
bounds[3] = bounds[3].max(glyph.bounds[3]);
|
||||
if !glyph.source.is_empty() {
|
||||
mappings.push(format!("<{code:02X}> {}\n", unicode_string(&glyph.source, false)));
|
||||
}
|
||||
}
|
||||
let mut cmap = "/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def\n/CMapName /GridCraftArabicUnicode def\n/CMapType 2 def\n1 begincodespacerange\n<00> <FF>\nendcodespacerange\n".to_string();
|
||||
for group in mappings.chunks(100) {
|
||||
let _ = writeln!(cmap, "{} beginbfchar", group.len());
|
||||
for mapping in group {
|
||||
cmap.push_str(mapping);
|
||||
}
|
||||
cmap.push_str("endbfchar\n");
|
||||
}
|
||||
cmap.push_str("endcmap\nCMapName currentdict /CMap defineresource pop\nend\nend\n");
|
||||
out.stream(cmap_id, "", cmap.as_bytes())?;
|
||||
out.object(id,
|
||||
&format!(
|
||||
"<< /Type /Font /Subtype /Type3 /Name /GridCraftArabic /FontBBox [{} {} {} {}] /FontMatrix [0.001 0 0 0.001 0 0] /CharProcs << {procs}>> /Encoding << /Type /Encoding /Differences [1 {names}] >> /FirstChar 1 /LastChar {} /Widths [{widths}] /Resources << >> /ToUnicode {cmap_id} 0 R >>",
|
||||
n(bounds[0]),
|
||||
n(bounds[1]),
|
||||
n(bounds[2]),
|
||||
n(bounds[3]),
|
||||
glyphs.len()
|
||||
),
|
||||
)?;
|
||||
let _ = write!(resources, "/A{} {id} 0 R ", batch + 1);
|
||||
}
|
||||
Ok(resources)
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn unicode_string(text: &str, bom: bool) -> String {
|
||||
let mut out = if bom { "<FEFF".to_string() } else { "<".to_string() };
|
||||
for unit in text.encode_utf16() {
|
||||
let _ = write!(out, "{unit:04X}");
|
||||
}
|
||||
out.push('>');
|
||||
out
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct Pen {
|
||||
path: String,
|
||||
point: [f32; 2],
|
||||
bounds: [f32; 4],
|
||||
shear: f32,
|
||||
full: bool,
|
||||
}
|
||||
|
||||
impl Pen {
|
||||
fn point(&mut self, x: f32, y: f32) -> [f32; 2] {
|
||||
let x = x + self.shear * y;
|
||||
self.bounds[0] = self.bounds[0].min(x);
|
||||
self.bounds[1] = self.bounds[1].min(y);
|
||||
self.bounds[2] = self.bounds[2].max(x);
|
||||
self.bounds[3] = self.bounds[3].max(y);
|
||||
[x, y]
|
||||
}
|
||||
fn op(&mut self, value: &str) {
|
||||
if self.path.len().saturating_add(value.len()) > MAX_OUTLINE_BYTES {
|
||||
self.full = true;
|
||||
}
|
||||
if !self.full {
|
||||
self.path.push_str(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl OutlinePen for Pen {
|
||||
fn move_to(&mut self, x: f32, y: f32) {
|
||||
let [px, py] = self.point(x, y);
|
||||
self.op(&format!("{} {} m\n", n(px), n(py)));
|
||||
self.point = [x, y];
|
||||
}
|
||||
fn line_to(&mut self, x: f32, y: f32) {
|
||||
let [px, py] = self.point(x, y);
|
||||
self.op(&format!("{} {} l\n", n(px), n(py)));
|
||||
self.point = [x, y];
|
||||
}
|
||||
fn quad_to(&mut self, cx: f32, cy: f32, x: f32, y: f32) {
|
||||
self.curve_to(
|
||||
self.point[0] + (cx - self.point[0]) * 2.0 / 3.0,
|
||||
self.point[1] + (cy - self.point[1]) * 2.0 / 3.0,
|
||||
x + (cx - x) * 2.0 / 3.0,
|
||||
y + (cy - y) * 2.0 / 3.0,
|
||||
x,
|
||||
y,
|
||||
);
|
||||
}
|
||||
fn curve_to(&mut self, cx: f32, cy: f32, dx: f32, dy: f32, x: f32, y: f32) {
|
||||
let [cx, cy] = self.point(cx, cy);
|
||||
let [dx, dy] = self.point(dx, dy);
|
||||
let [px, py] = self.point(x, y);
|
||||
self.op(&format!("{} {} {} {} {} {} c\n", n(cx), n(cy), n(dx), n(dy), n(px), n(py)));
|
||||
self.point = [x, y];
|
||||
}
|
||||
fn close(&mut self) {
|
||||
self.op("h\n");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn fallback_mirrors_only_paired_ansi_punctuation() {
|
||||
let visual: String = "(مرحبا)".chars().rev().map(super::mirror_ansi).collect();
|
||||
assert_eq!(visual, "(ابحرم)");
|
||||
assert_eq!("[(<«‹abc›»>)]".chars().rev().map(super::mirror_ansi).collect::<String>(), "[(<«‹cba›»>)]");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_bold_request_served_by_a_static_regular_face_is_emboldened() {
|
||||
assert!(super::needs_synthetic_bold("craft:Noto Sans Arabic:Regular", b"static", true));
|
||||
assert!(!super::needs_synthetic_bold("craft:Noto Sans Arabic:Regular", b"static", false));
|
||||
assert!(!super::needs_synthetic_bold("craft:Noto Sans Arabic:Bold", b"static", true));
|
||||
let glyph =
|
||||
|emboldened| super::Glyph { path: "0 0 m 10 0 l 10 10 l h\n".into(), width: 500.0, source: String::new(), bounds: [0.0; 4], emboldened };
|
||||
assert_eq!(super::glyph_procedure(&glyph(false)), "500 0 d0\n0 0 m 10 0 l 10 10 l h\nf\n");
|
||||
assert_eq!(super::glyph_procedure(&glyph(true)), "500 0 d0\n30 w 1 j\n0 0 m 10 0 l 10 10 l h\nB\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn line_breaks_never_use_the_embedded_face() {
|
||||
for ch in ['\n', '\r', '\u{2028}', '\u{2029}'] {
|
||||
assert!(!super::embeddable(true, ch), "{ch:?}");
|
||||
}
|
||||
assert!(super::embeddable(true, 'م'));
|
||||
assert!(super::embeddable(false, '\u{200f}'));
|
||||
assert!(!super::embeddable(false, 'A'));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_bundled_or_installed_face_is_not_an_error() {
|
||||
for bold in [false, true] {
|
||||
assert!(matches!(super::find_face(&[], &[], bold), Ok(None)));
|
||||
assert!(matches!(super::find_face(&[], &[std::env::temp_dir().join("gridcraft-no-fonts-here")], bold), Ok(None)));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bundled_faces_match_the_requested_weight() {
|
||||
const REGULAR: &[u8] = b"regular";
|
||||
const BOLD: &[u8] = b"bold";
|
||||
let bold_first = [("Noto Sans Arabic:Bold", BOLD), ("Noto Sans Arabic", REGULAR)];
|
||||
assert_eq!(super::bundled_match(&bold_first, false), Some(REGULAR));
|
||||
assert_eq!(super::bundled_match(&bold_first, true), Some(BOLD));
|
||||
assert_eq!(super::bundled_match(&[("Noto Sans Arabic", REGULAR)], true), None);
|
||||
assert_eq!(super::bundled_match(&[], false), None);
|
||||
assert_eq!(super::bundled_fallback(&[("Noto Sans Arabic:Bold", BOLD)], false), None);
|
||||
assert_eq!(super::bundled_fallback(&[("Noto Sans Arabic:Regular", REGULAR)], true), Some(("Noto Sans Arabic:Regular", REGULAR)));
|
||||
}
|
||||
}
|
||||
+150
-216
@@ -1,74 +1,24 @@
|
||||
//! PDF 1.7 drawing for GridCraft print/export, with shared object and xref framing.
|
||||
//! A tiny, self-contained PDF 1.7 writer for GridCraft's print and PDF export.
|
||||
//!
|
||||
//! - The 14 standard fonts (no embedding) with WinAnsiEncoding, plus approximate width tables
|
||||
//! ([`text_width`]) so callers can measure, align and wrap text. Characters outside
|
||||
//! WinAnsiEncoding (CJK and other scripts) are set in a predefined, non-embedded Adobe-GB1 CID
|
||||
//! font with the `UniGB-UTF16-H` CMap instead of being replaced by `?`. Symbol uses its own
|
||||
//! built-in encoding ([`symbol_code`]), for Greek letters and mathematical operators.
|
||||
//! - Arabic is shaped and set in embedded Type3 subsets, with exact shaped advances.
|
||||
//! - Vector drawing: rectangles, lines (solid or dashed), polygons, circles (Bézier), clipping.
|
||||
//! - RGBA images as RGB image XObjects with a soft mask for alpha (run-length encoded).
|
||||
//! - Coordinates are points with a **top-left origin** (y grows down); text `y` is the baseline.
|
||||
//!
|
||||
//! Streams are written uncompressed (images use the RunLengthDecode filter).
|
||||
//! Streams are written uncompressed (images use the trivial RunLengthDecode filter) so the crate
|
||||
//! needs no dependencies.
|
||||
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
|
||||
#![forbid(unsafe_code)]
|
||||
|
||||
mod arabic;
|
||||
mod metrics;
|
||||
mod symbol;
|
||||
|
||||
pub use symbol::{symbol_code, symbol_width};
|
||||
|
||||
/// Paragraph base direction. Context follows spreadsheet reading order: the first
|
||||
/// non-whitespace character determines direction, including digits and punctuation.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub enum TextDirection {
|
||||
#[default]
|
||||
Auto,
|
||||
Context,
|
||||
LeftToRight,
|
||||
RightToLeft,
|
||||
}
|
||||
|
||||
impl TextDirection {
|
||||
/// Resolve once for a paragraph before wrapping it into visual lines.
|
||||
pub fn resolve(self, text: &str) -> Self {
|
||||
use unicode_bidi::{BidiClass, BidiInfo, bidi_class};
|
||||
let rtl = match self {
|
||||
Self::Auto => BidiInfo::new(text, None).paragraphs.first().is_some_and(|p| p.level.is_rtl()),
|
||||
Self::Context => text.chars().find(|ch| !ch.is_whitespace()).is_some_and(|ch| matches!(bidi_class(ch), BidiClass::R | BidiClass::AL)),
|
||||
explicit => return explicit,
|
||||
};
|
||||
if rtl { Self::RightToLeft } else { Self::LeftToRight }
|
||||
}
|
||||
|
||||
fn level(self) -> Option<unicode_bidi::Level> {
|
||||
match self {
|
||||
Self::Auto => None,
|
||||
Self::LeftToRight | Self::Context => Some(unicode_bidi::Level::ltr()),
|
||||
Self::RightToLeft => Some(unicode_bidi::Level::rtl()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A PDF export could not preserve the requested text or serialize its object envelope.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Error(String);
|
||||
|
||||
impl std::fmt::Display for Error {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_str(&self.0)
|
||||
}
|
||||
}
|
||||
impl std::error::Error for Error {}
|
||||
|
||||
impl From<craft_pdf::classic::Error> for Error {
|
||||
fn from(error: craft_pdf::classic::Error) -> Self {
|
||||
Self(error.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::collections::hash_map::DefaultHasher;
|
||||
use std::fmt::Write as _;
|
||||
@@ -90,13 +40,6 @@ impl Point {
|
||||
}
|
||||
}
|
||||
|
||||
/// A text baseline origin and its clockwise rotation in radians.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq)]
|
||||
pub struct Baseline {
|
||||
pub origin: Point,
|
||||
pub angle: f32,
|
||||
}
|
||||
|
||||
/// A page-space rectangle described by its top-left corner and extent.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq)]
|
||||
pub struct Rect {
|
||||
@@ -259,29 +202,10 @@ impl Font {
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether [`text_width_with_direction`] is the sum of `text`'s character widths: not shaped,
|
||||
/// not reordered right to left and holding no bidi controls. A prefix's width is then a running sum.
|
||||
pub fn width_is_char_sum(font: Font, text: &str, direction: TextDirection) -> bool {
|
||||
let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction };
|
||||
!arabic::shaped(font, text) && arabic::is_logical_order(text, direction)
|
||||
}
|
||||
|
||||
/// Width of `text` in points when set in `font` at `size` points.
|
||||
/// Arabic uses shaped advances. If its font cannot render the text, measurement returns zero
|
||||
/// and drawing that text causes [`PdfDoc::finish`] to return the rendering error.
|
||||
pub fn text_width(font: Font, size: f32, text: &str) -> f32 {
|
||||
text_width_with_direction(font, size, text, TextDirection::Auto)
|
||||
}
|
||||
|
||||
/// Width measured with the same base direction as drawing.
|
||||
pub fn text_width_with_direction(font: Font, size: f32, text: &str, direction: TextDirection) -> f32 {
|
||||
let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction };
|
||||
if arabic::shaped(font, text) {
|
||||
return arabic::layout(font, text, direction).map(|layout| layout.width * size / 1000.0).unwrap_or(0.0);
|
||||
}
|
||||
// u64: a u32 sum overflows for ~8 million characters.
|
||||
let Ok(visual) = arabic::latin_visual(text, direction) else { return 0.0 };
|
||||
let units: u64 = visual.chars().map(|c| u64::from(font.char_width(c))).sum();
|
||||
let units: u64 = text.chars().map(|c| u64::from(font.char_width(c))).sum();
|
||||
units as f32 * size / 1000.0
|
||||
}
|
||||
|
||||
@@ -522,9 +446,6 @@ pub struct Page {
|
||||
/// `save` calls refused at the nesting limit; the same number of `restore` calls are ignored.
|
||||
refused: u32,
|
||||
links: Vec<LinkAnnotation>,
|
||||
arabic: arabic::Subset,
|
||||
error: Option<Error>,
|
||||
missing_arabic_font: bool,
|
||||
}
|
||||
|
||||
/// Most bytes of content per page before further drawing is dropped (keeps hostile inputs from
|
||||
@@ -785,132 +706,64 @@ impl Page {
|
||||
self.op(&s);
|
||||
}
|
||||
|
||||
/// Arabic ink extents above and below the baseline, in points. Standard font text returns
|
||||
/// `None`. Font errors are recorded for [`PdfDoc::finish`], just as when drawing text.
|
||||
pub fn text_vertical_extents(&mut self, font: Font, size: f32, text: &str) -> Option<(f32, f32)> {
|
||||
self.text_vertical_extents_with_direction(font, size, text, TextDirection::Auto)
|
||||
}
|
||||
|
||||
/// Arabic ink extents with an explicit paragraph base direction.
|
||||
pub fn text_vertical_extents_with_direction(&mut self, font: Font, size: f32, text: &str, direction: TextDirection) -> Option<(f32, f32)> {
|
||||
if !arabic::shaped(font, text) {
|
||||
return None;
|
||||
}
|
||||
match arabic::vertical_extents(font, text, direction) {
|
||||
Ok((ascent, descent)) => Some((ascent * size / 1000.0, descent * size / 1000.0)),
|
||||
Err(error) => {
|
||||
self.error.get_or_insert(error);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Text with its baseline starting at `(x, y)`.
|
||||
pub fn text(&mut self, x: f32, y: f32, size: f32, font: Font, color: Rgb, text: &str) {
|
||||
self.text_with_direction(Point::new(x, y), size, font, color, text, TextDirection::Auto);
|
||||
}
|
||||
|
||||
/// Text drawn with an explicit paragraph base direction.
|
||||
pub fn text_with_direction(&mut self, origin: Point, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) {
|
||||
self.text_rotated_with_direction(Baseline { origin, angle: 0.0 }, size, font, color, text, direction);
|
||||
self.text_rotated(Point::new(x, y), size, font, color, text, 0.0);
|
||||
}
|
||||
|
||||
/// Text rotated by `angle` radians (clockwise on the page, like the y-down coordinate
|
||||
/// system) about its baseline origin.
|
||||
pub fn text_rotated(&mut self, origin: Point, size: f32, font: Font, color: Rgb, text: &str, angle: f32) {
|
||||
self.text_rotated_with_direction(Baseline { origin, angle }, size, font, color, text, TextDirection::Auto);
|
||||
}
|
||||
|
||||
/// Rotated text with an explicit paragraph base direction.
|
||||
pub fn text_rotated_with_direction(&mut self, baseline: Baseline, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) {
|
||||
let Baseline { origin, angle } = baseline;
|
||||
if text.is_empty() || !extent(size) || !finite(&[origin.x, origin.y]) {
|
||||
return;
|
||||
}
|
||||
let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction };
|
||||
let fi = font.index();
|
||||
let size = n(size.min(10_000.0));
|
||||
let (sn, cs) = if angle.is_finite() { angle.sin_cos() } else { (0.0, 1.0) };
|
||||
// Clockwise in y-down = counter-clockwise negated in PDF's y-up space.
|
||||
let matrix = format!("{} {} {} {} {} {}", n(cs), n(-sn), n(sn), n(cs), n(origin.x), n(self.y(origin.y)));
|
||||
let size = size.min(10_000.0);
|
||||
let shaping = arabic::shaping(font, text);
|
||||
self.missing_arabic_font |= shaping == arabic::Shaping::NoFont;
|
||||
if shaping == arabic::Shaping::Shaped {
|
||||
self.shaped_text(&matrix, size, font, color, text, direction);
|
||||
} else {
|
||||
self.standard_text(&matrix, size, font, color, text, direction);
|
||||
}
|
||||
}
|
||||
|
||||
fn shaped_text(&mut self, matrix: &str, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) {
|
||||
if self.saved.len() >= MAX_SAVE_DEPTH {
|
||||
return;
|
||||
}
|
||||
let body = match self.arabic.text(font, text, size, direction) {
|
||||
Ok(body) => body,
|
||||
Err(error) => {
|
||||
self.error.get_or_insert(error);
|
||||
return;
|
||||
}
|
||||
};
|
||||
for slot in [Some(font.index()), self.arabic.uses_cid.then_some(CID_FONT)].into_iter().flatten() {
|
||||
if let Some(f) = self.fonts.get_mut(slot) {
|
||||
let tm = format!("{} {} {} {} {} {} Tm\n", n(cs), n(-sn), n(sn), n(cs), n(origin.x), n(self.y(origin.y)));
|
||||
// Symbol text is one run in Symbol's own encoding (the CID font has no maths symbols).
|
||||
if font == Font::Symbol {
|
||||
if let Some(f) = self.fonts.get_mut(fi) {
|
||||
*f = true;
|
||||
}
|
||||
}
|
||||
let mut s = format!("q\n{matrix} cm\n");
|
||||
push_rgb(&mut s, color, false);
|
||||
s.push(' ');
|
||||
push_rgb(&mut s, color, true);
|
||||
let _ = write!(s, "\n{body}\nQ");
|
||||
self.text_op(&s);
|
||||
}
|
||||
|
||||
fn standard_text(&mut self, matrix: &str, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) {
|
||||
let visual = match arabic::latin_visual(text, direction) {
|
||||
Ok(visual) => visual,
|
||||
Err(error) => {
|
||||
self.error.get_or_insert(error);
|
||||
if self.full() {
|
||||
return;
|
||||
}
|
||||
};
|
||||
let fi = font.index();
|
||||
let size = n(size);
|
||||
let mut runs = String::new();
|
||||
let mut s = String::new();
|
||||
self.set_fill(&mut s, color);
|
||||
let _ = write!(s, "BT\n{tm}/F{} {} Tf\n{} Tj\nET", fi + 1, size, pdf_string_in(text, true));
|
||||
self.op(&s);
|
||||
return;
|
||||
}
|
||||
// Runs of WinAnsi text use `font`; runs it cannot encode use the CID font. Each `Tj`
|
||||
// advances the text position, so the runs follow each other on the baseline.
|
||||
// Symbol text is one run in Symbol's own encoding (the CID font has no maths symbols).
|
||||
let symbol = font == Font::Symbol;
|
||||
let uses_cid = |c: char| !symbol && needs_cid(c);
|
||||
let mut rest: &str = &visual;
|
||||
let mut runs = String::new();
|
||||
let mut rest = text;
|
||||
while let Some(first) = rest.chars().next() {
|
||||
let cid = uses_cid(first);
|
||||
let end = rest.char_indices().find(|(_, c)| uses_cid(*c) != cid).map_or(rest.len(), |(i, _)| i);
|
||||
let cid = needs_cid(first);
|
||||
let end = rest.char_indices().find(|(_, c)| needs_cid(*c) != cid).map_or(rest.len(), |(i, _)| i);
|
||||
let (run, tail) = rest.split_at(end);
|
||||
let (slot, string) = if cid { (CID_FONT, pdf_utf16_string(run)) } else { (fi, pdf_string_in(run, symbol)) };
|
||||
let (slot, string) = if cid { (CID_FONT, pdf_utf16_string(run)) } else { (fi, pdf_string(run)) };
|
||||
if let Some(f) = self.fonts.get_mut(slot) {
|
||||
*f = true;
|
||||
}
|
||||
let first_run = runs.is_empty();
|
||||
let _ = writeln!(runs, "/F{} {} Tf", slot + 1, size);
|
||||
if first_run {
|
||||
let _ = writeln!(runs, "{matrix} Tm");
|
||||
runs.push_str(&tm);
|
||||
}
|
||||
let _ = writeln!(runs, "{string} Tj");
|
||||
rest = tail;
|
||||
}
|
||||
let mut s = String::new();
|
||||
self.set_fill(&mut s, color);
|
||||
let _ = write!(s, "BT\n{runs}ET");
|
||||
let s = if visual != text { format!("/Span << /ActualText {} >> BDC\n{s}\nEMC", arabic::unicode_string(text, true)) } else { s };
|
||||
self.text_op(&s);
|
||||
}
|
||||
|
||||
fn text_op(&mut self, s: &str) {
|
||||
if self.content.len().saturating_add(s.len()).saturating_add(1) > MAX_PAGE_CONTENT {
|
||||
self.error.get_or_insert_with(|| Error("PDF page text exceeds the size limit".into()));
|
||||
} else {
|
||||
self.op(s);
|
||||
if self.full() {
|
||||
return;
|
||||
}
|
||||
// The colour goes in front of the text object, so it is tracked like any other style.
|
||||
let mut colour = String::new();
|
||||
self.set_fill(&mut colour, color);
|
||||
let s = format!("{colour}BT\n{runs}ET");
|
||||
self.op(&s);
|
||||
}
|
||||
|
||||
/// Draws an RGBA image (`pw`×`ph` pixels, row-major, straight alpha) into the box
|
||||
@@ -985,7 +838,39 @@ pub struct PdfDoc {
|
||||
|
||||
/// PackBits-style run-length encoding (PDF `RunLengthDecode`).
|
||||
fn run_length(data: &[u8]) -> Vec<u8> {
|
||||
craft_stream_codecs::runlength::encode(data)
|
||||
let mut out = Vec::with_capacity(data.len() / 2 + 16);
|
||||
let mut i = 0;
|
||||
while i < data.len() {
|
||||
let b = data[i];
|
||||
let mut run = 1;
|
||||
while i + run < data.len() && run < 128 && data[i + run] == b {
|
||||
run += 1;
|
||||
}
|
||||
if run >= 2 {
|
||||
out.push((257 - run) as u8);
|
||||
out.push(b);
|
||||
i += run;
|
||||
continue;
|
||||
}
|
||||
// Literal run until the next repeat of 3+ or 128 bytes.
|
||||
let start = i;
|
||||
let mut len = 0;
|
||||
while i < data.len() && len < 128 {
|
||||
if i + 2 < data.len() && data[i] == data[i + 1] && data[i] == data[i + 2] {
|
||||
break;
|
||||
}
|
||||
i += 1;
|
||||
len += 1;
|
||||
}
|
||||
if len == 0 {
|
||||
// Next is a repeat; loop will handle it.
|
||||
continue;
|
||||
}
|
||||
out.push((len - 1) as u8);
|
||||
out.extend_from_slice(&data[start..start + len]);
|
||||
}
|
||||
out.push(128);
|
||||
out
|
||||
}
|
||||
|
||||
/// Longest Info string written, in characters; longer values are cut on a character boundary.
|
||||
@@ -1007,6 +892,49 @@ fn pdf_text_string(text: &str) -> String {
|
||||
s
|
||||
}
|
||||
|
||||
/// Starts object `id` at the current end of `out` and records its offset for the xref table.
|
||||
fn begin_obj(out: &mut Vec<u8>, offsets: &mut Vec<usize>, id: u32) {
|
||||
let i = id as usize;
|
||||
if offsets.len() <= i {
|
||||
offsets.resize(i + 1, 0);
|
||||
}
|
||||
if let Some(slot) = offsets.get_mut(i) {
|
||||
*slot = out.len();
|
||||
}
|
||||
let _ = writeln!(Utf8(out), "{id} 0 obj");
|
||||
}
|
||||
|
||||
/// Writes `id 0 obj <body> endobj`.
|
||||
fn dict_obj(out: &mut Vec<u8>, offsets: &mut Vec<usize>, id: u32, body: &str) {
|
||||
begin_obj(out, offsets, id);
|
||||
out.extend_from_slice(body.as_bytes());
|
||||
out.extend_from_slice(b"\nendobj\n");
|
||||
}
|
||||
|
||||
/// Writes a stream object: `dict` (the dictionary entries without `<<`, `>>` and `/Length`, may be
|
||||
/// empty) and `data` as the stream body.
|
||||
fn stream_obj(out: &mut Vec<u8>, offsets: &mut Vec<usize>, id: u32, dict: &str, data: &[u8]) {
|
||||
begin_obj(out, offsets, id);
|
||||
out.extend_from_slice(b"<<");
|
||||
if !dict.is_empty() {
|
||||
out.push(b' ');
|
||||
out.extend_from_slice(dict.as_bytes());
|
||||
}
|
||||
let _ = write!(Utf8(out), " /Length {} >>\nstream\n", data.len());
|
||||
out.extend_from_slice(data);
|
||||
out.extend_from_slice(b"\nendstream\nendobj\n");
|
||||
}
|
||||
|
||||
/// Lets `write!` append text to a byte buffer.
|
||||
struct Utf8<'a>(&'a mut Vec<u8>);
|
||||
|
||||
impl std::fmt::Write for Utf8<'_> {
|
||||
fn write_str(&mut self, s: &str) -> std::fmt::Result {
|
||||
self.0.extend_from_slice(s.as_bytes());
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl PdfDoc {
|
||||
pub fn new() -> PdfDoc {
|
||||
PdfDoc::default()
|
||||
@@ -1029,9 +957,6 @@ impl PdfDoc {
|
||||
style: Style::default(),
|
||||
saved: Vec::new(),
|
||||
refused: 0,
|
||||
arabic: arabic::Subset::default(),
|
||||
error: None,
|
||||
missing_arabic_font: false,
|
||||
});
|
||||
let i = self.pages.len() - 1;
|
||||
&mut self.pages[i]
|
||||
@@ -1046,12 +971,6 @@ impl PdfDoc {
|
||||
self.pages.get_mut(i)
|
||||
}
|
||||
|
||||
/// Whether some Arabic text was set in the standard and CID fonts, which have no Arabic glyphs,
|
||||
/// because no Arabic face was found for its weight.
|
||||
pub fn missing_arabic_font(&self) -> bool {
|
||||
self.pages.iter().any(|page| page.missing_arabic_font)
|
||||
}
|
||||
|
||||
/// Serializes the document. A document without pages gets one blank Letter page.
|
||||
///
|
||||
/// Every object is written straight into the output buffer (nothing is staged in an
|
||||
@@ -1059,13 +978,7 @@ impl PdfDoc {
|
||||
/// the ids are contiguous from 1. Objects are therefore in the file in the order they are
|
||||
/// numbered during writing (fonts, then per page its new images, content stream and page
|
||||
/// dictionary), with the catalog, page tree and info dictionary last.
|
||||
///
|
||||
/// Returns an error if the Arabic font is unusable, text exceeds a size limit, or the
|
||||
/// shared envelope writer refuses object counts, offsets or an allocation.
|
||||
pub fn finish(mut self) -> Result<Vec<u8>, Error> {
|
||||
if let Some(error) = self.pages.iter().find_map(|page| page.error.clone()) {
|
||||
return Err(error);
|
||||
}
|
||||
pub fn finish(mut self) -> Vec<u8> {
|
||||
if self.pages.is_empty() {
|
||||
self.add_page(612.0, 792.0);
|
||||
}
|
||||
@@ -1095,7 +1008,9 @@ impl PdfDoc {
|
||||
let contents: Vec<String> = self.pages.iter_mut().map(|p| std::mem::take(&mut p.content)).collect();
|
||||
let page_links: Vec<Vec<LinkAnnotation>> = self.pages.iter_mut().map(|p| std::mem::take(&mut p.links)).collect();
|
||||
let reserve = contents.iter().fold(4096usize, |acc, c| acc.saturating_add(c.len()).saturating_add(1024));
|
||||
let mut out = craft_pdf::classic::Writer::with_capacity(reserve)?;
|
||||
let mut out: Vec<u8> = Vec::with_capacity(reserve);
|
||||
out.extend_from_slice(b"%PDF-1.7\n%\xE2\xE3\xCF\xD3\n");
|
||||
let mut offsets: Vec<usize> = vec![0; 4];
|
||||
let mut kids = Vec::new();
|
||||
let mut annotations = Vec::new();
|
||||
let page_count = self.pages.len();
|
||||
@@ -1105,35 +1020,41 @@ impl PdfDoc {
|
||||
let _ = write!(font_dict, "/F{} {} 0 R ", i + 1, id);
|
||||
if i == CID_FONT {
|
||||
let (cid_id, desc_id) = (id + 1, id + 2);
|
||||
out.object(
|
||||
dict_obj(
|
||||
&mut out,
|
||||
&mut offsets,
|
||||
*id,
|
||||
&format!(
|
||||
"<< /Type /Font /Subtype /Type0 /BaseFont /{CID_BASE_FONT} /Encoding /UniGB-UTF16-H /DescendantFonts [{cid_id} 0 R] >>"
|
||||
),
|
||||
)?;
|
||||
out.object(cid_id,
|
||||
);
|
||||
dict_obj(
|
||||
&mut out,
|
||||
&mut offsets,
|
||||
cid_id,
|
||||
&format!(
|
||||
"<< /Type /Font /Subtype /CIDFontType0 /BaseFont /{CID_BASE_FONT} /CIDSystemInfo << /Registry (Adobe) /Ordering (GB1) /Supplement 4 >> /FontDescriptor {desc_id} 0 R /DW {CID_WIDTH} >>"
|
||||
),
|
||||
)?;
|
||||
out.object(desc_id,
|
||||
);
|
||||
dict_obj(
|
||||
&mut out,
|
||||
&mut offsets,
|
||||
desc_id,
|
||||
&format!(
|
||||
"<< /Type /FontDescriptor /FontName /{CID_BASE_FONT} /Flags 6 /FontBBox [-25 -254 1000 880] /ItalicAngle 0 /Ascent 880 /Descent -120 /CapHeight 880 /StemV 93 >>"
|
||||
),
|
||||
)?;
|
||||
);
|
||||
continue;
|
||||
}
|
||||
let name = Font::ALL.get(i).copied().unwrap_or_default().base_name();
|
||||
let enc = if name.starts_with("Symbol") { "" } else { " /Encoding /WinAnsiEncoding" };
|
||||
out.object(*id, &format!("<< /Type /Font /Subtype /Type1 /BaseFont /{name}{enc} >>"))?;
|
||||
dict_obj(&mut out, &mut offsets, *id, &format!("<< /Type /Font /Subtype /Type1 /BaseFont /{name}{enc} >>"));
|
||||
}
|
||||
}
|
||||
// Images already written, by content hash: (page, image, object id). A hash match is
|
||||
// confirmed by comparing the pixels before an object is shared.
|
||||
let mut written: HashMap<u64, Vec<(usize, usize, u32)>> = HashMap::new();
|
||||
for (pi, ((page, content), links)) in self.pages.iter().zip(contents).zip(page_links).enumerate() {
|
||||
let arabic_fonts = page.arabic.write_objects(&mut next, &mut out)?;
|
||||
let page_fonts = format!("{font_dict}{arabic_fonts}");
|
||||
let mut xobjects = String::new();
|
||||
for (k, img) in page.images.iter().enumerate() {
|
||||
let known = written.get(&img.hash).and_then(|c| {
|
||||
@@ -1158,13 +1079,13 @@ impl PdfDoc {
|
||||
let _ = write!(dict, " /SMask {id} 0 R");
|
||||
}
|
||||
dict.push_str(" /Filter /RunLengthDecode");
|
||||
out.stream(img_id, &dict, &run_length(&img.rgb))?;
|
||||
stream_obj(&mut out, &mut offsets, img_id, &dict, &run_length(&img.rgb));
|
||||
if let (Some(id), Some(a)) = (smask_id, &img.alpha) {
|
||||
let dict = format!(
|
||||
"/Type /XObject /Subtype /Image /Width {} /Height {} /ColorSpace /DeviceGray /BitsPerComponent 8 /Filter /RunLengthDecode",
|
||||
img.width, img.height
|
||||
);
|
||||
out.stream(id, &dict, &run_length(a))?;
|
||||
stream_obj(&mut out, &mut offsets, id, &dict, &run_length(a));
|
||||
}
|
||||
written.entry(img.hash).or_default().push((pi, k, img_id));
|
||||
img_id
|
||||
@@ -1175,7 +1096,7 @@ impl PdfDoc {
|
||||
let content_id = next;
|
||||
let page_id = next + 1;
|
||||
next += 2;
|
||||
out.stream(content_id, "", content.as_bytes())?;
|
||||
stream_obj(&mut out, &mut offsets, content_id, "", content.as_bytes());
|
||||
drop(content);
|
||||
let xo = if xobjects.is_empty() { String::new() } else { format!(" /XObject << {xobjects}>>") };
|
||||
let mut link_refs = String::new();
|
||||
@@ -1189,18 +1110,20 @@ impl PdfDoc {
|
||||
annotations.push((id, link));
|
||||
}
|
||||
let annots = if link_refs.is_empty() { String::new() } else { format!(" /Annots [{link_refs}]") };
|
||||
out.object(
|
||||
dict_obj(
|
||||
&mut out,
|
||||
&mut offsets,
|
||||
page_id,
|
||||
&format!(
|
||||
"<< /Type /Page /Parent 2 0 R /MediaBox [0 0 {} {}] /Resources << /Font << {}>>{} >> /Contents {} 0 R{} >>",
|
||||
n(page.width),
|
||||
n(page.height),
|
||||
page_fonts,
|
||||
font_dict,
|
||||
xo,
|
||||
content_id,
|
||||
annots
|
||||
),
|
||||
)?;
|
||||
);
|
||||
kids.push(page_id);
|
||||
}
|
||||
for (id, link) in annotations {
|
||||
@@ -1213,11 +1136,16 @@ impl PdfDoc {
|
||||
format!("/Dest [{page_id} 0 R /XYZ {} {} null]", n(x), n(height - y))
|
||||
}
|
||||
};
|
||||
out.object(id, &format!("<< /Type /Annot /Subtype /Link /Rect [{} {} {} {}] /Border [0 0 0] {action} >>", n(x0), n(y0), n(x1), n(y1)))?;
|
||||
dict_obj(
|
||||
&mut out,
|
||||
&mut offsets,
|
||||
id,
|
||||
&format!("<< /Type /Annot /Subtype /Link /Rect [{} {} {} {}] /Border [0 0 0] {action} >>", n(x0), n(y0), n(x1), n(y1)),
|
||||
);
|
||||
}
|
||||
out.object(1, "<< /Type /Catalog /Pages 2 0 R >>")?;
|
||||
dict_obj(&mut out, &mut offsets, 1, "<< /Type /Catalog /Pages 2 0 R >>");
|
||||
let kids_s: Vec<String> = kids.iter().map(|k| format!("{k} 0 R")).collect();
|
||||
out.object(2, &format!("<< /Type /Pages /Kids [{}] /Count {} >>", kids_s.join(" "), kids.len()))?;
|
||||
dict_obj(&mut out, &mut offsets, 2, &format!("<< /Type /Pages /Kids [{}] /Count {} >>", kids_s.join(" "), kids.len()));
|
||||
let creator = if self.info.creator.is_empty() { "GridCraft" } else { &self.info.creator };
|
||||
let mut info = format!("<< /Producer {} /Creator {}", pdf_text_string("GridCraft PDF"), pdf_text_string(creator));
|
||||
if !self.info.title.is_empty() {
|
||||
@@ -1227,9 +1155,15 @@ impl PdfDoc {
|
||||
let _ = write!(info, " /Author {}", pdf_text_string(&self.info.author));
|
||||
}
|
||||
info.push_str(" >>");
|
||||
out.object(3, &info)?;
|
||||
dict_obj(&mut out, &mut offsets, 3, &info);
|
||||
|
||||
out.finish(1, Some(3)).map_err(Error::from)
|
||||
let xref = out.len();
|
||||
let _ = write!(Utf8(&mut out), "xref\n0 {}\n0000000000 65535 f \n", next);
|
||||
for off in offsets.iter().skip(1) {
|
||||
let _ = writeln!(Utf8(&mut out), "{off:010} 00000 n ");
|
||||
}
|
||||
let _ = write!(Utf8(&mut out), "trailer\n<< /Size {} /Root 1 0 R /Info 3 0 R >>\nstartxref\n{}\n%%EOF\n", next, xref);
|
||||
out
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+25
-363
@@ -5,36 +5,6 @@ use std::io;
|
||||
mod reference;
|
||||
use reference::{OldPage, interpret};
|
||||
|
||||
#[test]
|
||||
fn rtl_marked_text_limit_fails_without_appending_partial_content() {
|
||||
let mut doc = PdfDoc::new();
|
||||
let page = doc.add_page(600.0, 300.0);
|
||||
page.content = " ".repeat(MAX_PAGE_CONTENT - 8);
|
||||
let before = page.content.len();
|
||||
page.text_with_direction(Point::new(10.0, 20.0), 12.0, Font::Helvetica, [0, 0, 0], "ABC !", TextDirection::RightToLeft);
|
||||
assert_eq!(page.content.len(), before, "the marked-content block must append atomically");
|
||||
assert!(doc.finish().unwrap_err().to_string().contains("size limit"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_paragraph_separator_keeps_right_to_left_latin_on_one_line() {
|
||||
let visual = |text| arabic::latin_visual(text, TextDirection::RightToLeft).unwrap().into_owned();
|
||||
assert_eq!(visual("ABC\r"), visual("ABC "));
|
||||
assert_eq!(visual("ABC\u{2029}DEF"), visual("ABC DEF"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cjk_in_a_right_to_left_cell_keeps_the_cid_font() {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(600.0, 300.0).text_with_direction(Point::new(10.0, 20.0), 12.0, Font::Helvetica, [0, 0, 0], "编号!", TextDirection::RightToLeft);
|
||||
let pdf = doc.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
let cjk = find(&pdf, b"<7F1653F7> Tj").expect("CJK run set in the CID font");
|
||||
assert!(find(&pdf, b"/Encoding /UniGB-UTF16-H").is_some());
|
||||
assert!(find(&pdf, b"(!) Tj").is_some_and(|bang| bang < cjk), "the trailing ! is drawn left of the CJK run");
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), "编号!");
|
||||
}
|
||||
|
||||
fn find(hay: &[u8], needle: &[u8]) -> Option<usize> {
|
||||
hay.windows(needle.len()).position(|w| w == needle)
|
||||
}
|
||||
@@ -73,7 +43,7 @@ fn check_xref(pdf: &[u8]) -> Result<usize, Box<dyn Error>> {
|
||||
|
||||
#[test]
|
||||
fn minimal_document() -> Result<(), Box<dyn Error>> {
|
||||
let pdf = PdfDoc::new().finish()?;
|
||||
let pdf = PdfDoc::new().finish();
|
||||
assert!(pdf.starts_with(b"%PDF-1.7"));
|
||||
assert!(pdf.ends_with(b"%%EOF\n"));
|
||||
assert!(check_xref(&pdf)? >= 5);
|
||||
@@ -99,7 +69,7 @@ fn drawing_and_text() -> Result<(), Box<dyn Error>> {
|
||||
let p2 = d.add_page(842.0, 595.0);
|
||||
p2.text(10.0, 20.0, 10.0, Font::CourierBold, [0, 0, 0], "Second");
|
||||
assert_eq!(d.page_count(), 2);
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
assert!(find(&pdf, b"(Hello \\(world\\) \\\\ caf\\351 \\2005) Tj").is_some());
|
||||
assert!(find(&pdf, b"(Second) Tj").is_some());
|
||||
@@ -125,7 +95,7 @@ fn uri_and_page_links_are_real_pdf_annotations() -> Result<(), Box<dyn Error>> {
|
||||
first.link_uri(0.0, 0.0, 10.0, 10.0, "javascript:alert(1)");
|
||||
let second = d.add_page(100.0, 200.0);
|
||||
second.link_page(Rect::new(0.0, 0.0, 10.0, 10.0), 99, Point::new(0.0, 0.0));
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
let s = String::from_utf8_lossy(&pdf);
|
||||
assert_eq!(s.matches("/Subtype /Link").count(), 3);
|
||||
@@ -149,7 +119,7 @@ fn images_with_alpha() -> Result<(), Box<dyn Error>> {
|
||||
p.image_rgba(Rect::new(10.0, 10.0, 40.0, 40.0), &px, [4, 4]);
|
||||
p.image_rgba(Rect::new(10.0, 10.0, 40.0, 40.0), &[255; 16], [2, 2]); // opaque: no mask
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 1.0, 1.0), &[1, 2, 3], [4, 4]); // too short: ignored
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
assert!(find(&pdf, b"/SMask").is_some());
|
||||
assert!(find(&pdf, b"/Im1 Do").is_some());
|
||||
@@ -217,7 +187,7 @@ fn hostile_inputs_never_panic() -> Result<(), Box<dyn Error>> {
|
||||
p.restore();
|
||||
p.save();
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 10.0, 10.0), &[], [u32::MAX, u32::MAX]);
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -457,7 +427,7 @@ fn corpus_doc(seed: u64) -> (Vec<u8>, Vec<String>) {
|
||||
}
|
||||
old_pages.push(old.content);
|
||||
}
|
||||
(doc.finish().unwrap(), old_pages)
|
||||
(doc.finish(), old_pages)
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -501,7 +471,7 @@ fn structure_is_valid_for_all_documents() -> Result<(), Box<dyn Error>> {
|
||||
check_xref(&pdf)?;
|
||||
parse_objects(&pdf); // every /Length matches its data
|
||||
}
|
||||
let empty = PdfDoc::new().finish()?;
|
||||
let empty = PdfDoc::new().finish();
|
||||
check_xref(&empty)?;
|
||||
parse_objects(&empty);
|
||||
Ok(())
|
||||
@@ -517,7 +487,7 @@ fn images_decode_to_their_pixels() {
|
||||
p.image_rgba(Rect::new(1.0, 1.0, 20.0, 20.0), px, [*w, *h]);
|
||||
}
|
||||
}
|
||||
let pdf = d.finish().unwrap();
|
||||
let pdf = d.finish();
|
||||
let (objs, pages) = parse_pages(&pdf);
|
||||
assert_eq!(pages.len(), 2);
|
||||
for page in &pages {
|
||||
@@ -544,7 +514,7 @@ fn opaque_images_have_no_soft_mask() {
|
||||
let p = d.add_page(100.0, 100.0);
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 10.0, 10.0), &[255; 4 * 12], [4, 3]);
|
||||
assert!(p.images[0].alpha.is_none());
|
||||
let pdf = d.finish().unwrap();
|
||||
let pdf = d.finish();
|
||||
assert!(find(&pdf, b"/SMask").is_none());
|
||||
assert_eq!(pdf.windows(15).filter(|w| *w == b"/Subtype /Image").count(), 1);
|
||||
|
||||
@@ -553,7 +523,7 @@ fn opaque_images_have_no_soft_mask() {
|
||||
px[translucent * 4 + 3] = 7;
|
||||
let mut d = PdfDoc::new();
|
||||
d.add_page(100.0, 100.0).image_rgba(Rect::new(0.0, 0.0, 10.0, 10.0), &px, [4, 3]);
|
||||
let (objs, pages) = parse_pages(&d.finish().unwrap());
|
||||
let (objs, pages) = parse_pages(&d.finish());
|
||||
let (_, _, _, alpha) = decode_image(&objs, pages[0].xobjects[0].1);
|
||||
let mut want = vec![255u8; 12];
|
||||
want[translucent] = 7;
|
||||
@@ -572,7 +542,7 @@ fn identical_images_are_stored_once() -> Result<(), Box<dyn Error>> {
|
||||
p.image_rgba(Rect::new(1.0, 1.0, 20.0, 20.0), px, [*w, *h]);
|
||||
p.image_rgba(Rect::new(30.0, 1.0, 20.0, 20.0), px, [*w, *h]); // twice on one page
|
||||
}
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
assert_eq!(pdf.windows(15).filter(|w| *w == b"/Subtype /Image").count(), 2, "one image + one soft mask");
|
||||
let (_, pages) = parse_pages(&pdf);
|
||||
@@ -597,7 +567,7 @@ fn different_images_are_not_merged() {
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 5.0, 5.0), &b, [4, 1]);
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 5.0, 5.0), &a, [2, 2]);
|
||||
d.add_page(100.0, 100.0).image_rgba(Rect::new(0.0, 0.0, 5.0, 5.0), &a, [4, 1]);
|
||||
let pdf = d.finish().unwrap();
|
||||
let pdf = d.finish();
|
||||
assert_eq!(pdf.windows(15).filter(|w| *w == b"/Subtype /Image").count(), 6, "three distinct pictures, each with a soft mask (alpha 50)");
|
||||
}
|
||||
|
||||
@@ -617,7 +587,7 @@ fn many_distinct_images_on_one_page_are_not_compared_pairwise() {
|
||||
assert_eq!(p.images.len(), N as usize);
|
||||
assert!(p.content.ends_with("/Im1 Do Q\n"), "the repeated picture reuses /Im1");
|
||||
assert!(p.image_comparisons <= 1, "{} pixel comparisons for {N} distinct pictures", p.image_comparisons);
|
||||
let pdf = d.finish().unwrap();
|
||||
let pdf = d.finish();
|
||||
assert_eq!(pdf.windows(15).filter(|w| *w == b"/Subtype /Image").count(), N as usize);
|
||||
}
|
||||
|
||||
@@ -631,7 +601,7 @@ fn hash_collisions_do_not_merge_images() {
|
||||
for p in 0..2 {
|
||||
d.page_mut(p).unwrap().images[0].hash = 42; // forced collision
|
||||
}
|
||||
let (objs, pages) = parse_pages(&d.finish().unwrap());
|
||||
let (objs, pages) = parse_pages(&d.finish());
|
||||
let ids: Vec<usize> = pages.iter().map(|p| p.xobjects[0].1).collect();
|
||||
assert_ne!(ids[0], ids[1]);
|
||||
assert_eq!(decode_image(&objs, ids[0]).2, vec![10; 12]);
|
||||
@@ -736,7 +706,7 @@ fn save_nesting_is_limited_to_28() -> Result<(), Box<dyn Error>> {
|
||||
p.restore();
|
||||
p.image_rgba(Rect::new(0.0, 0.0, 5.0, 5.0), &[9; 16], [2, 2]);
|
||||
assert!(p.content.contains(" Do"));
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -749,7 +719,7 @@ fn finish_closes_open_saves() -> Result<(), Box<dyn Error>> {
|
||||
for _ in 0..33 {
|
||||
p.save();
|
||||
}
|
||||
let (_, pages) = parse_pages(&d.finish()?);
|
||||
let (_, pages) = parse_pages(&d.finish());
|
||||
let i = interpret(&pages[0].content);
|
||||
assert!(i.balanced);
|
||||
assert_eq!(i.qs, 28);
|
||||
@@ -855,7 +825,7 @@ fn every_draw_method_survives_hostile_numbers() -> Result<(), Box<dyn Error>> {
|
||||
p.stroke_line_dashed(Point::new(0.0, 0.0), Point::new(1.0, 1.0), 1.0, [0, 0, 0], &[0.0; 100]);
|
||||
let c = page_content(&d);
|
||||
assert!(!c.contains("NaN") && !c.contains("inf"));
|
||||
let pdf = d.finish()?;
|
||||
let pdf = d.finish();
|
||||
check_xref(&pdf)?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -878,7 +848,7 @@ fn info_strings_with_non_ascii_are_utf16be() -> Result<(), Box<dyn Error>> {
|
||||
doc.add_page(200.0, 200.0);
|
||||
doc.info.title = "Übersicht €5 – “Q1” 日本 😀".into();
|
||||
doc.info.author = "Müller & Søn".into();
|
||||
let pdf = doc.finish()?;
|
||||
let pdf = doc.finish();
|
||||
assert_eq!(utf16_entry(&pdf, "/Title")?, "Übersicht €5 – “Q1” 日本 😀");
|
||||
assert_eq!(utf16_entry(&pdf, "/Author")?, "Müller & Søn");
|
||||
Ok(())
|
||||
@@ -889,7 +859,7 @@ fn ascii_info_strings_stay_literal_and_escaped() {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(200.0, 200.0);
|
||||
doc.info.title = r"Q1 (draft) a\b".into();
|
||||
let pdf = doc.finish().unwrap();
|
||||
let pdf = doc.finish();
|
||||
assert!(find(&pdf, br"/Title (Q1 \(draft\) a\\b)").is_some());
|
||||
assert!(find(&pdf, b"/Producer (GridCraft PDF)").is_some());
|
||||
}
|
||||
@@ -899,7 +869,7 @@ fn info_strings_are_capped() -> Result<(), Box<dyn Error>> {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(200.0, 200.0);
|
||||
doc.info.title = "日".repeat(100_000);
|
||||
let pdf = doc.finish()?;
|
||||
let pdf = doc.finish();
|
||||
assert_eq!(utf16_entry(&pdf, "/Title")?.chars().count(), MAX_INFO_CHARS);
|
||||
Ok(())
|
||||
}
|
||||
@@ -910,7 +880,7 @@ fn cjk_text_is_not_replaced_by_question_marks() -> Result<(), Box<dyn Error>> {
|
||||
let p = doc.add_page(612.0, 792.0);
|
||||
p.text(10.0, 20.0, 10.0, Font::Helvetica, [0, 0, 0], "签字清单");
|
||||
p.text(10.0, 40.0, 10.0, Font::Helvetica, [0, 0, 0], "No. 编号 2");
|
||||
let pdf = doc.finish()?;
|
||||
let pdf = doc.finish();
|
||||
check_xref(&pdf)?;
|
||||
assert!(find(&pdf, b"(????) Tj").is_none(), "CJK text written as question marks");
|
||||
assert!(find(&pdf, b"<7B7E5B576E055355> Tj").is_some());
|
||||
@@ -923,287 +893,12 @@ fn cjk_text_is_not_replaced_by_question_marks() -> Result<(), Box<dyn Error>> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_is_shaped_and_preserved_or_falls_back_without_a_font() {
|
||||
let text = "مَرْحَبًا 123 (ABC)";
|
||||
let mut doc = PdfDoc::new();
|
||||
let page = doc.add_page(600.0, 300.0);
|
||||
page.text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text);
|
||||
let layout = arabic::layout(Font::Helvetica, text, TextDirection::Auto);
|
||||
let Ok(layout) = layout else {
|
||||
assert!(doc.missing_arabic_font());
|
||||
check_xref(&doc.finish().unwrap()).unwrap();
|
||||
return;
|
||||
};
|
||||
assert!(layout.width > 0.0);
|
||||
assert!((text_width(Font::Helvetica, 20.0, text) - layout.width * 0.02).abs() < 0.001);
|
||||
let pdf = doc.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text);
|
||||
assert!(find(&pdf, b"/Subtype /Type3").is_some());
|
||||
assert!(find(&pdf, b"/ToUnicode").is_some());
|
||||
assert!(find(&pdf, b"beginbfchar").is_some());
|
||||
assert!(find(&pdf, b"(?) Tj").is_none());
|
||||
assert!(find(&pdf, b"/UniGB-UTF16-H").is_none(), "Arabic is never set in the CJK font");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn latin_inside_arabic_text_declares_its_page_font() {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return;
|
||||
}
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], "مرحبا\u{2028}عالم");
|
||||
let pdf = doc.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
assert!(find(&pdf, b"/F1 20 Tf").is_some(), "the line break is drawn as a Helvetica space");
|
||||
assert!(find(&pdf, b"/Font << /F1 ").is_some(), "the page declares the font its Latin run uses");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cjk_inside_arabic_text_uses_the_cid_font() {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return;
|
||||
}
|
||||
let text = "مرحبا 编号";
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text);
|
||||
let pdf = doc.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
assert!(find(&pdf, b"<7F1653F7> Tj").is_some(), "the CJK run is set in the CID font");
|
||||
assert!(find(&pdf, b"/Encoding /UniGB-UTF16-H").is_some(), "the page declares the CID font");
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text);
|
||||
assert!(text_width(Font::Helvetica, 20.0, text) >= text_width(Font::Helvetica, 20.0, "مرحبا") + 40.0, "two full-width ideographs");
|
||||
for (text, cid_run) in [("مرحبا 😀", &b"<D83DDE00> Tj"[..]), ("مرحبا Привет", &b"<041F04400438043204350442> Tj"[..])] {
|
||||
let mut uncovered = PdfDoc::new();
|
||||
uncovered.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text);
|
||||
assert!(!uncovered.missing_arabic_font());
|
||||
let pdf = uncovered.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
assert!(find(&pdf, cid_run).is_some(), "{text}: characters the Arabic face lacks fall back like non-Arabic text");
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oversized_arabic_text_is_an_error_instead_of_partial_pdf() {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(600.0, 300.0).text(0.0, 50.0, 10.0, Font::Helvetica, [0, 0, 0], &"ب".repeat(65_537));
|
||||
if doc.missing_arabic_font() {
|
||||
check_xref(&doc.finish().unwrap()).unwrap();
|
||||
return;
|
||||
}
|
||||
assert!(doc.finish().unwrap_err().to_string().contains("128 KiB"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_joining_marks_styles_and_rotation() {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return;
|
||||
}
|
||||
for (text, expected) in [("مرحبا 123 (ABC)", "(ABC)"), ("مرحبا [ABC]", "[ABC]"), ("مرحبا <ABC>", "<ABC>")] {
|
||||
let mixed = arabic::layout(Font::Helvetica, text, TextDirection::Auto).unwrap();
|
||||
let latin: String = mixed
|
||||
.items
|
||||
.iter()
|
||||
.filter_map(|item| match item {
|
||||
arabic::Item::Latin { text, .. } => Some(text.as_str()),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
if !latin.is_empty() {
|
||||
assert_eq!(latin, expected);
|
||||
}
|
||||
}
|
||||
let mut metrics = PdfDoc::new();
|
||||
let (ascent, descent) = metrics.add_page(100.0, 100.0).text_vertical_extents(Font::Helvetica, 20.0, "كمثرى").unwrap();
|
||||
assert!(ascent > 0.0 && descent > 20.0 * 0.22, "Arabic descenders exceed the old Latin baseline allowance");
|
||||
assert!(
|
||||
metrics.page_mut(0).unwrap().text_vertical_extents(Font::Helvetica, 20.0, "مرحبا 123 (ABC)").is_some(),
|
||||
"spaces in variable fonts have empty outlines"
|
||||
);
|
||||
metrics.finish().unwrap();
|
||||
let joined = arabic::layout(Font::Helvetica, "سلام", TextDirection::Auto).unwrap();
|
||||
let separate_width: f32 = "سلام".chars().map(|c| text_width(Font::Helvetica, 1000.0, &c.to_string())).sum();
|
||||
assert!((joined.width - separate_width).abs() > 10.0, "joining changes advances");
|
||||
let marked = arabic::layout(Font::Helvetica, "مَرْحَبًا", TextDirection::Auto).unwrap();
|
||||
let plain = arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).unwrap();
|
||||
assert!(marked.items.len() > plain.items.len());
|
||||
assert!(marked.items.iter().any(|item| matches!(item, arabic::Item::Glyph { y, .. } if *y != 0.0)));
|
||||
let bold_available = match arabic::layout(Font::HelveticaBold, "مرحبا", TextDirection::Auto) {
|
||||
Ok(bold) if arabic::bold_face_is_synthetic() => {
|
||||
assert!(bold.width >= plain.width, "synthetic bold keeps the regular advances");
|
||||
true
|
||||
}
|
||||
Ok(bold) => {
|
||||
assert!(bold.width > plain.width, "bold metrics use the bold font instance");
|
||||
true
|
||||
}
|
||||
Err(e) => {
|
||||
assert!(arabic::ARABIC_FONTS.is_empty(), "a bundled face always serves bold text: {e:?}");
|
||||
false
|
||||
}
|
||||
};
|
||||
let mut regular = PdfDoc::new();
|
||||
regular.add_page(500.0, 300.0).text(30.0, 60.0, 20.0, Font::Helvetica, [0, 0, 0], "مرحبا");
|
||||
let regular = regular.finish().unwrap();
|
||||
let mut italic = PdfDoc::new();
|
||||
italic.add_page(500.0, 300.0).text(30.0, 60.0, 20.0, Font::HelveticaOblique, [0, 0, 0], "مرحبا");
|
||||
let italic = italic.finish().unwrap();
|
||||
assert_ne!(regular, italic, "italic shears the actual outlines");
|
||||
let rotated_font = if bold_available { Font::HelveticaBoldOblique } else { Font::HelveticaOblique };
|
||||
let mut rotated = PdfDoc::new();
|
||||
rotated.add_page(500.0, 300.0).text_rotated(Point::new(100.0, 100.0), 20.0, rotated_font, [0, 0, 0], "مرحبا 123", -std::f32::consts::FRAC_PI_2);
|
||||
let rotated = rotated.finish().unwrap();
|
||||
check_xref(&rotated).unwrap();
|
||||
assert_eq!(utf16_entry(&rotated, "/ActualText").unwrap(), "مرحبا 123");
|
||||
assert!(find(&rotated, b"0 1 -1 0 100 200 cm").is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn line_breaks_in_arabic_text_draw_as_spaces() {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return;
|
||||
}
|
||||
for (text, direction) in ["مرحبا\r\nعالم", "مرحبا\u{2028}عالم", "مرحبا\u{2029}ABC\r"]
|
||||
.into_iter()
|
||||
.flat_map(|text| [TextDirection::Auto, TextDirection::LeftToRight, TextDirection::RightToLeft].map(|direction| (text, direction)))
|
||||
{
|
||||
let layout = arabic::layout(Font::Helvetica, text, direction).unwrap();
|
||||
for item in &layout.items {
|
||||
if let arabic::Item::Latin { text: drawn, .. } = item {
|
||||
assert!(!drawn.chars().any(|ch| matches!(ch, '\n' | '\r' | '\u{2028}' | '\u{2029}')), "{drawn:?} from {text:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
let drawn = |text: &str| format!("{:?}", arabic::layout(Font::Helvetica, text, TextDirection::RightToLeft).unwrap().items);
|
||||
assert_eq!(drawn("مرحبا\u{2029}عالم"), drawn("مرحبا عالم"), "a paragraph separator keeps right-to-left reading order");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_text_respects_the_save_nesting_limit() -> Result<(), Box<dyn Error>> {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
let mut d = PdfDoc::new();
|
||||
let p = d.add_page(100.0, 100.0);
|
||||
for _ in 0..28 {
|
||||
p.save();
|
||||
}
|
||||
p.text(10.0, 50.0, 12.0, Font::Helvetica, [0, 0, 0], "مرحبا");
|
||||
assert_eq!(interpret(&p.content).max_depth, 28);
|
||||
p.restore();
|
||||
p.text(10.0, 50.0, 12.0, Font::Helvetica, [0, 0, 0], "مرحبا");
|
||||
assert!(p.content.contains("/ActualText"));
|
||||
check_xref(&d.finish()?)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_subsets_split_after_255_character_codes() -> Result<(), Box<dyn Error>> {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
let mut doc = PdfDoc::new();
|
||||
let page = doc.add_page(600.0, 300.0);
|
||||
let marks = ['َ', 'ُ', 'ِ', 'ّ', 'ْ', 'ً', 'ٌ', 'ٍ'];
|
||||
for i in 0..260 {
|
||||
let text = format!("ب{}{}{}", marks[i % 8], marks[(i / 8) % 8], marks[(i / 64) % 8]);
|
||||
page.text(20.0, 50.0, 10.0, Font::Helvetica, [0, 0, 0], &text);
|
||||
}
|
||||
let pdf = doc.finish().unwrap();
|
||||
check_xref(&pdf).unwrap();
|
||||
assert!(find(&pdf, b"/A2 ").is_some());
|
||||
assert!(find(&pdf, b"/LastChar 255").is_some());
|
||||
assert!(find(&pdf, b"<100> Tj").is_none(), "Type3 codes are always one byte");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn spreadsheet_context_is_first_character_not_first_strong() {
|
||||
use TextDirection::{Auto, Context, LeftToRight as Ltr, RightToLeft as Rtl};
|
||||
for (text, expected) in [(" مرحبا", Rtl), ("123 مرحبا", Ltr), ("(مرحبا)", Ltr), (" ١٢٣ مرحبا", Ltr), ("\t\n", Ltr)] {
|
||||
assert_eq!(Context.resolve(text), expected, "{text}");
|
||||
}
|
||||
assert_eq!(Auto.resolve("123 مرحبا"), Rtl);
|
||||
assert_eq!(Auto.resolve("(مرحبا)"), Rtl);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_rtl_standard_text_reorders_without_an_arabic_font() {
|
||||
let source = "ABC !";
|
||||
let mut doc = PdfDoc::new();
|
||||
let page = doc.add_page(300.0, 100.0);
|
||||
page.text_with_direction(Point::new(10.0, 30.0), 12.0, Font::Helvetica, [0, 0, 0], source, TextDirection::RightToLeft);
|
||||
assert!(page.content.contains("(! ABC) Tj"), "{}", page.content);
|
||||
let mut objects = craft_pdf::classic::Writer::with_capacity(0).unwrap();
|
||||
let mut next = 4;
|
||||
assert!(page.arabic.write_objects(&mut next, &mut objects).unwrap().is_empty());
|
||||
assert_eq!(next, 4, "Latin-only RTL text must not allocate Arabic font objects");
|
||||
assert_eq!(text_width_with_direction(Font::Helvetica, 12.0, source, TextDirection::RightToLeft), text_width(Font::Helvetica, 12.0, source));
|
||||
let pdf = doc.finish().unwrap();
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), source);
|
||||
assert!(find(&pdf, b"/Subtype /Type3").is_none());
|
||||
|
||||
let mut huge = PdfDoc::new();
|
||||
huge.add_page(300.0, 100.0).text_with_direction(
|
||||
Point::new(10.0, 30.0),
|
||||
12.0,
|
||||
Font::Helvetica,
|
||||
[0, 0, 0],
|
||||
&"A".repeat(128 * 1024 + 1),
|
||||
TextDirection::RightToLeft,
|
||||
);
|
||||
assert!(huge.finish().unwrap_err().to_string().contains("128 KiB"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn arabic_explicit_base_changes_visual_order_and_preserves_logical_text() {
|
||||
if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() {
|
||||
return;
|
||||
}
|
||||
let sources = |text: &str, direction| {
|
||||
arabic::layout(Font::Helvetica, text, direction)
|
||||
.unwrap()
|
||||
.items
|
||||
.into_iter()
|
||||
.map(|item| match item {
|
||||
arabic::Item::Glyph { source, .. } => source,
|
||||
arabic::Item::Latin { text, .. } | arabic::Item::Cid { text, .. } => text,
|
||||
})
|
||||
.collect::<String>()
|
||||
};
|
||||
let text = "مرحبا ABC";
|
||||
let ltr = sources(text, TextDirection::LeftToRight);
|
||||
let rtl = sources(text, TextDirection::RightToLeft);
|
||||
assert!(ltr.ends_with("ABC"), "{ltr}");
|
||||
assert!(rtl.starts_with("ABC"), "{rtl}");
|
||||
assert_ne!(ltr, rtl);
|
||||
assert_eq!(sources("123 مرحبا", TextDirection::Context), sources("123 مرحبا", TextDirection::LeftToRight));
|
||||
let mut documents = Vec::new();
|
||||
for direction in [TextDirection::LeftToRight, TextDirection::RightToLeft] {
|
||||
let mut doc = PdfDoc::new();
|
||||
doc.add_page(300.0, 100.0).text_rotated_with_direction(
|
||||
Baseline { origin: Point::new(30.0, 70.0), angle: 0.3 },
|
||||
20.0,
|
||||
Font::Helvetica,
|
||||
[0, 0, 0],
|
||||
text,
|
||||
direction,
|
||||
);
|
||||
let pdf = doc.finish().unwrap();
|
||||
assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text);
|
||||
documents.push(pdf);
|
||||
}
|
||||
assert_ne!(documents[0], documents[1]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn many_alternating_runs_share_one_text_matrix() {
|
||||
let mut doc = PdfDoc::new();
|
||||
let p = doc.add_page(612.0, 792.0);
|
||||
p.text(10.0, 20.0, 10.0, Font::Helvetica, [0, 0, 0], &"a\u{4e2d}".repeat(2000));
|
||||
let pdf = doc.finish().unwrap();
|
||||
let pdf = doc.finish();
|
||||
let count = |needle: &[u8]| pdf.windows(needle.len()).filter(|w| *w == needle).count();
|
||||
assert_eq!(count(b" Tm\n"), 1, "the position is set once, before the first run");
|
||||
assert_eq!(count(b" Tf\n"), 4000, "every run selects its font");
|
||||
@@ -1211,52 +906,19 @@ fn many_alternating_runs_share_one_text_matrix() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symbol_font_draws_maths_in_its_own_encoding() -> Result<(), Box<dyn Error>> {
|
||||
fn symbol_font_draws_maths_in_its_own_encoding() {
|
||||
let mut doc = PdfDoc::new();
|
||||
let p = doc.add_page(200.0, 200.0);
|
||||
p.text(10.0, 50.0, 12.0, Font::Symbol, [0, 0, 0], "\u{2211}\u{03B1}\u{2264}\u{221E}x");
|
||||
p.text(10.0, 80.0, 12.0, Font::TimesItalic, [0, 0, 0], "x");
|
||||
let pdf = doc.finish()?;
|
||||
let pdf = doc.finish();
|
||||
let s = String::from_utf8_lossy(&pdf);
|
||||
assert!(s.contains("/BaseFont /Symbol >>"), "Symbol has no WinAnsi encoding");
|
||||
assert!(s.contains("/BaseFont /Times-Italic /Encoding /WinAnsiEncoding"));
|
||||
// The sum, alpha, less-or-equal and infinity codes; x is not in Symbol and becomes `?`.
|
||||
assert!(s.contains("(\\345a\\243\\245?) Tj"), "{s}");
|
||||
check_xref(&pdf)?;
|
||||
check_xref(&pdf).unwrap();
|
||||
assert!(Font::Symbol.can_encode('\u{2211}') && !Font::Symbol.can_encode('x'));
|
||||
assert!(Font::TimesRoman.can_encode('x') && !Font::TimesRoman.can_encode('\u{2211}'));
|
||||
assert_eq!(text_width(Font::Symbol, 10.0, "\u{2211}"), 7.13);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symbol_text_is_never_shaped_as_arabic() -> Result<(), Box<dyn Error>> {
|
||||
let mut doc = PdfDoc::new();
|
||||
let page = doc.add_page(200.0, 200.0);
|
||||
assert_eq!(page.text_vertical_extents(Font::Symbol, 12.0, "\u{03B1}ب"), None);
|
||||
page.text(10.0, 50.0, 12.0, Font::Symbol, [0, 0, 0], "\u{03B1}ب");
|
||||
let pdf = doc.finish()?;
|
||||
check_xref(&pdf)?;
|
||||
assert!(find(&pdf, b"(a?) Tj").is_some());
|
||||
assert!(find(&pdf, b"/ActualText").is_none());
|
||||
assert_eq!(text_width(Font::Symbol, 10.0, "\u{03B1}ب"), f32::from(Font::Symbol.char_width('\u{03B1}') + Font::Symbol.char_width('ب')) / 100.0);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_run_length_preserves_pixels_at_packet_boundaries() {
|
||||
for len in [0, 1, 2, 3, 127, 128, 129, 255, 256, 257, 1024] {
|
||||
for seed in [0u8, 127, 128, 255] {
|
||||
let repeats = vec![seed; len];
|
||||
let literals: Vec<u8> = (0..len).map(|i| seed.wrapping_add(i as u8)).collect();
|
||||
let pairs: Vec<u8> = (0..len).map(|i| (i / 2) as u8).collect();
|
||||
for pixels in [repeats, literals, pairs] {
|
||||
let encoded = run_length(&pixels);
|
||||
assert_eq!(encoded.last(), Some(&128));
|
||||
assert_eq!(rle_decode(&encoded), pixels);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Two equal bytes may now terminate a literal packet. PDF pixel values stay exact.
|
||||
assert_eq!(run_length(&[1, 2, 2, 3]), [0, 1, 255, 2, 0, 3, 128]);
|
||||
}
|
||||
|
||||
@@ -268,38 +268,12 @@ const TIOCLINUX: u64 = libc::TIOCLINUX as u64;
|
||||
const IOC_WRITE: u64 = 0x4000_0000;
|
||||
/// Changes a directory, though its number says it only reads, as the kernel's headers have it.
|
||||
const FS_IOC_SET_ENCRYPTION_POLICY: u64 = 0x800C_6613;
|
||||
#[allow(clippy::unnecessary_cast)]
|
||||
const F_SETOWN: u64 = libc::F_SETOWN as u64;
|
||||
#[allow(clippy::unnecessary_cast)]
|
||||
const F_SETFL: u64 = libc::F_SETFL as u64;
|
||||
#[allow(clippy::unnecessary_cast)]
|
||||
const O_ASYNC: u64 = libc::O_ASYNC as u64;
|
||||
/// The two `fcntl` commands of the same family that the kernel's headers name and `libc` doesn't;
|
||||
/// the numbers are the same on every architecture (`asm-generic/fcntl.h`).
|
||||
const F_SETOWN_EX: u64 = 15;
|
||||
const F_SETSIG: u64 = 10;
|
||||
/// Socket ioctls that do what those commands do: `FIOSETOWN` and `SIOCSPGRP` name the process to
|
||||
/// notify, and `FIOASYNC` switches the notification on. Their requests carry no data-direction
|
||||
/// bit, so the [`IOC_WRITE`] rule doesn't name them. `libc` doesn't name them; the numbers are
|
||||
/// the kernel's, the same on every architecture (`asm-generic/sockios.h`).
|
||||
const FIOSETOWN: u64 = 0x8901;
|
||||
const SIOCSPGRP: u64 = 0x8902;
|
||||
const FIOASYNC: u64 = 0x5452;
|
||||
|
||||
/// What the main filter refuses with `EPERM`: the calls above, and these when their arguments match.
|
||||
/// - `clone` without `CLONE_THREAD`: a new process.
|
||||
/// - A signal to any process but `me`, whose ID `exec` keeps. Landlock's signal scope needs a newer
|
||||
/// kernel than the rest (ABI 6), and `kill(-1, 9)` must not get through on an older one.
|
||||
/// - A change to the limits, priority or scheduling of any process but `me`.
|
||||
/// - The `fcntl` commands that arrange asynchronous notification: naming the process to notify
|
||||
/// (`F_SETOWN`, `F_SETOWN_EX`), choosing its signal (`F_SETSIG`), and `F_SETFL` when it sets
|
||||
/// `O_ASYNC`, the switch without which nothing is sent. None is a signal call, and the only rule
|
||||
/// that would cover them is Landlock's signal scope, which needs ABI 6, newer than a launch
|
||||
/// requires; without these a confined program could have the kernel signal any process of its
|
||||
/// user. `F_SETFL` itself still works, as `O_NONBLOCK` comes from it. A socket answers the same
|
||||
/// arrangement through ioctls — `FIOSETOWN` and `SIOCSPGRP` to name the process, `FIOASYNC` to
|
||||
/// switch the notification on — and those requests carry no data-direction bit, so they are
|
||||
/// named alongside the others.
|
||||
/// - `TIOCSTI` and `TIOCLINUX`, which type into a terminal the program inherited, as when
|
||||
/// `gridcraft-cli sandbox-check` runs a program from a shell.
|
||||
/// - An `ioctl` that hands the kernel data ([`IOC_WRITE`]), as those that change a file's flags or
|
||||
@@ -333,22 +307,10 @@ fn main_rules(me: u32) -> Result<BTreeMap<i64, Vec<SeccompRule>>> {
|
||||
vec![
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, TIOCSTI)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, TIOCLINUX)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, FIOSETOWN)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, SIOCSPGRP)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, FIOASYNC)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::MaskedEq(IOC_WRITE), IOC_WRITE)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, FS_IOC_SET_ENCRYPTION_POLICY)?])?,
|
||||
],
|
||||
);
|
||||
rules.insert(
|
||||
libc::SYS_fcntl,
|
||||
vec![
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, F_SETOWN)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, F_SETOWN_EX)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, F_SETSIG)?])?,
|
||||
rule(vec![word(1, SeccompCmpOp::Eq, F_SETFL)?, word(2, SeccompCmpOp::MaskedEq(O_ASYNC), O_ASYNC)?])?,
|
||||
],
|
||||
);
|
||||
Ok(rules)
|
||||
}
|
||||
|
||||
@@ -416,9 +378,6 @@ mod tests {
|
||||
#[test]
|
||||
fn the_calls_that_reach_another_process_have_rules() {
|
||||
let rules = main_rules(4242).unwrap();
|
||||
// `fcntl`'s notification commands: naming the owner to notify, both ways, choosing its
|
||||
// signal, and the switch itself.
|
||||
assert_eq!(rules.get(&libc::SYS_fcntl).map(Vec::len), Some(4), "the asynchronous-notification commands");
|
||||
for nr in [
|
||||
libc::SYS_kill,
|
||||
libc::SYS_tkill,
|
||||
@@ -456,9 +415,7 @@ mod tests {
|
||||
] {
|
||||
assert_eq!(rules.get(&nr).map(Vec::len), Some(0), "{nr} is refused outright");
|
||||
}
|
||||
// The terminal rules, the socket notification ioctls (`FIOSETOWN`, `SIOCSPGRP`,
|
||||
// `FIOASYNC`), the data-carrying rule and the encryption rule.
|
||||
assert_eq!(rules.get(&libc::SYS_ioctl).map(Vec::len), Some(7));
|
||||
assert_eq!(rules.get(&libc::SYS_ioctl).map(Vec::len), Some(4));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -44,8 +44,6 @@ pub fn enforcement(canary: &Path, exe: &Path, target: u32) -> Vec<Check> {
|
||||
Check { name: "TCP connection", outcome: denied(tcp_probe()) },
|
||||
Check { name: "start a process", outcome: spawn_probe(exe) },
|
||||
Check { name: "signal another process", outcome: signal_probe(target) },
|
||||
#[cfg(target_os = "linux")]
|
||||
Check { name: "switch a descriptor's notifications on", outcome: async_probe() },
|
||||
]
|
||||
}
|
||||
|
||||
@@ -130,20 +128,6 @@ fn write_probe(dir: &Path) -> Outcome {
|
||||
denied(r.map(drop))
|
||||
}
|
||||
|
||||
/// `O_ASYNC` on a descriptor of the program's own: the switch that has the kernel signal the
|
||||
/// descriptor's owner when its state changes. The owner may be a process the program didn't name, a
|
||||
/// standard stream the parent made, so on Linux the filter refuses setting it, the same way it
|
||||
/// refuses the commands that name another owner. Naming one can't be asked here without `fcntl`'s
|
||||
/// variable-argument form, which no safe API wraps; the rules refuse those commands, and the
|
||||
/// confined-program test covers them.
|
||||
#[cfg(target_os = "linux")]
|
||||
fn async_probe() -> Outcome {
|
||||
let r = nix::unistd::pipe().map_err(std::io::Error::from).and_then(|(_, write)| {
|
||||
nix::fcntl::fcntl(write, nix::fcntl::FcntlArg::F_SETFL(nix::fcntl::OFlag::O_ASYNC)).map(drop).map_err(std::io::Error::from)
|
||||
});
|
||||
denied(r)
|
||||
}
|
||||
|
||||
fn tcp_probe() -> std::io::Result<()> {
|
||||
TcpStream::connect_timeout(&SocketAddr::from(TCP_TARGET), Duration::from_secs(2)).map(drop)
|
||||
}
|
||||
@@ -232,15 +216,6 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
/// Unconfined, the notification probe reports what the system allows; confined, the launch
|
||||
/// check needs it `Denied`. Either way it comes out of the same three calls, so this proves
|
||||
/// the probe runs and classifies rather than failing outright.
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn the_notification_probe_classifies() {
|
||||
assert!(matches!(async_probe(), Outcome::Allowed(_)), "unconfined the switch can be set");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_checks_on_the_canary_change_nothing_where_they_are_allowed() {
|
||||
let canary = crate::Canary::create().unwrap();
|
||||
|
||||
@@ -455,7 +455,7 @@ pub fn open_format(app: &SheetApp, params: &Json) -> Option<Dialog> {
|
||||
"print": c.print,
|
||||
"locked": c.locked,
|
||||
});
|
||||
let title = if text_only { "Edit Text".to_string() } else { app.ui.language.tr_fill("Format Control: {name}", &[("name", &c.display_name())]) };
|
||||
let title = if text_only { "Edit Text".to_string() } else { format!("Format Control: {}", c.display_name()) };
|
||||
Some(Dialog::custom("formatControl", &title, v))
|
||||
}
|
||||
|
||||
@@ -567,25 +567,3 @@ pub fn format_dialog(app: &mut SheetApp, ui: &mut Ui, d: &mut Dialog, open: &mut
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod format_title_tests {
|
||||
use super::*;
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::Session;
|
||||
|
||||
#[test]
|
||||
fn the_format_control_title_follows_the_interface_language() {
|
||||
let mut session = Session::new();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
let v = app.run("insert.button", json!({"at": "B2", "text": "Go"})).unwrap();
|
||||
let id = v["control"].as_u64().unwrap();
|
||||
let name = control(&app, id as u32).unwrap().display_name();
|
||||
assert_eq!(open_format(&app, &json!({"id": id})).unwrap().title, format!("Format Control: {name}"));
|
||||
app.ui.language = Language::It;
|
||||
let want = Language::It.tr("Format Control: {name}").replace("{name}", &name);
|
||||
assert_eq!(open_format(&app, &json!({"id": id})).unwrap().title, want);
|
||||
assert!(!want.starts_with("Format Control"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -359,7 +359,7 @@ impl Dialog {
|
||||
vec![
|
||||
Number { key: "to", label: "Before sheet (position, 0 = first):" },
|
||||
Check { key: "copy", label: "Create a copy" },
|
||||
Note(app.ui.language.tr_fill("Sheets: {sheets}", &[("sheets", &sheets.join(", "))])),
|
||||
Note(format!("Sheets: {}", sheets.join(", "))),
|
||||
],
|
||||
json!({"to": 0, "copy": false}),
|
||||
);
|
||||
@@ -476,10 +476,7 @@ impl Dialog {
|
||||
"unhideSheet",
|
||||
"Unhide",
|
||||
"sheet.unhide",
|
||||
vec![
|
||||
Text { key: "sheet", label: "Unhide sheet:" },
|
||||
Note(app.ui.language.tr_fill("Hidden: {sheets}", &[("sheets", &opts.join(", "))])),
|
||||
],
|
||||
vec![Text { key: "sheet", label: "Unhide sheet:" }, Note(format!("Hidden: {}", opts.join(", ")))],
|
||||
json!({"sheet": first}),
|
||||
);
|
||||
d.values.insert("sheet".into(), json!(first));
|
||||
@@ -1143,51 +1140,6 @@ impl Dialog {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// The text of the dialog's note.
|
||||
fn note(d: &Dialog) -> String {
|
||||
d.fields.iter().find_map(|f| if let Field::Note(text) = f { Some(text.clone()) } else { None }).unwrap_or_default()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sheet_notes_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
let mut session = gridcraft_engine::Session::default();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
app.run("home.insertSheet", json!({})).unwrap();
|
||||
let unhide = json!({"sheets": ["Sheet2"]});
|
||||
assert_eq!(note(&Dialog::open(&mut app, "moveSheet", json!({})).unwrap()), "Sheets: Sheet1, Sheet2");
|
||||
assert_eq!(note(&Dialog::open(&mut app, "unhideSheet", unhide.clone()).unwrap()), "Hidden: Sheet2");
|
||||
let it = Language::It;
|
||||
app.ui.language = it;
|
||||
let moved = note(&Dialog::open(&mut app, "moveSheet", json!({})).unwrap());
|
||||
assert_eq!(moved, it.tr("Sheets: {sheets}").replace("{sheets}", "Sheet1, Sheet2"));
|
||||
assert!(!moved.starts_with("Sheets"));
|
||||
let hidden = note(&Dialog::open(&mut app, "unhideSheet", unhide).unwrap());
|
||||
assert_eq!(hidden, it.tr("Hidden: {sheets}").replace("{sheets}", "Sheet2"));
|
||||
assert!(!hidden.starts_with("Hidden"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn goal_seek_success_toast_follows_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
let mut session = gridcraft_engine::Session::default();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
app.run("cell.set", json!({"cell": "B1", "input": "=A1*2"})).unwrap();
|
||||
let it = Language::It;
|
||||
app.ui.language = it;
|
||||
let mut d = Dialog::custom("goalSeek", "Goal Seek", json!({"set": "B1", "to": "10", "changing": "A1"}));
|
||||
let ctx = egui::Context::default();
|
||||
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| analysis::goal_seek(&mut app, ui, &mut d, &mut true, &mut true));
|
||||
out.textures_delta.clear();
|
||||
assert_eq!(app.message, None);
|
||||
// The value is shown as before (the JSON number the command returns).
|
||||
let want = it.tr("Goal Seeking found a solution: {value}").replace("{value}", "5.0");
|
||||
assert_eq!(app.toast.map(|t| t.0), Some(want.clone()));
|
||||
assert!(!want.starts_with("Goal Seeking"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn remove_duplicates_prefills_the_selection_and_submits_the_edited_range() {
|
||||
let mut session = gridcraft_engine::Session::default();
|
||||
|
||||
@@ -34,10 +34,7 @@ pub(super) fn goal_seek(app: &mut SheetApp, ui: &mut egui::Ui, d: &mut Dialog, c
|
||||
}
|
||||
if *confirm {
|
||||
match app.run("data.goalSeek", json!({"set": set, "to": to.parse::<f64>().unwrap_or(0.0), "changing": changing})) {
|
||||
Ok(r) => {
|
||||
let text = app.ui.language.tr_fill("Goal Seeking found a solution: {value}", &[("value", &r["value"].to_string())]);
|
||||
app.toast = Some((text, crate::now_ms()));
|
||||
}
|
||||
Ok(r) => app.toast = Some((format!("Goal Seeking found a solution: {}", r["value"]), crate::now_ms())),
|
||||
Err(e) => app.message = Some(("Goal Seek".into(), crate::clean_error(&e))),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,70 +129,6 @@ fn insert_snippet(ctx: &egui::Context, id: egui::Id, text: &mut String, snippet:
|
||||
ctx.data_mut(|m| m.insert_temp(id.with("refocus"), true));
|
||||
}
|
||||
|
||||
/// The RaTeX parser messages that carry a piece of the source (a command, a token, a count).
|
||||
/// RaTeX reports an error only as finished English text, so a message is matched against these
|
||||
/// shapes (from `ratex-parser` 0.1.14) and the catalog's template is filled with the same pieces;
|
||||
/// RaTeX's fixed messages are plain catalog keys. A shape comes before a shorter one that also
|
||||
/// matches its messages, and a message of any other shape stays as RaTeX wrote it.
|
||||
const RATEX_TEMPLATES: &[&str] = &[
|
||||
"Undefined control sequence: {name}",
|
||||
"Expected '{expected}', got '{got}'",
|
||||
"Expected group after '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'",
|
||||
"Expected group as argument to '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript",
|
||||
"Got function '{function}' with no arguments as subscript",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'",
|
||||
"Got function '{function}' with no arguments as \\tag",
|
||||
"Can't use function '{function}' in text mode",
|
||||
"Can't use function '{function}' in math mode",
|
||||
"Invalid color: '{color}'",
|
||||
"Invalid size: '{size}'",
|
||||
"Invalid unit: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'",
|
||||
"Invalid delimiter type '{type}'",
|
||||
"No such environment: {name}",
|
||||
"Expected argument to \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}",
|
||||
"{command} valid only within array environment",
|
||||
"Mismatched {command}",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'",
|
||||
"Unknown column alignment: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}",
|
||||
"Unknown CD directive: @{directive}",
|
||||
"Expected argument for {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available",
|
||||
"{command} valid only as a supported bussproofs command within prooftree",
|
||||
"prooftree ended with {count} proof stack item(s), expected 1",
|
||||
"\\@char has non-numeric argument {argument}",
|
||||
"\\@char with invalid code point {code}",
|
||||
"Invalid environment name character: {character}",
|
||||
];
|
||||
|
||||
/// A parse error message in the interface language: GridCraft's own checks and RaTeX's fixed
|
||||
/// messages by their catalog key, RaTeX's messages with a piece of the source by their template.
|
||||
fn parse_error_message(lang: crate::i18n::Language, message: &str) -> String {
|
||||
let translated = lang.tr_error(message);
|
||||
if translated != message {
|
||||
return translated;
|
||||
}
|
||||
RATEX_TEMPLATES
|
||||
.iter()
|
||||
.find_map(|template| crate::i18n::unfill(template, message).map(|values| lang.tr_fill(template, &values)))
|
||||
.unwrap_or(translated)
|
||||
}
|
||||
|
||||
/// The line under the equation source for a parse error: where it is (the 1-based character),
|
||||
/// then the message, both in the interface language.
|
||||
fn parse_error_text(lang: crate::i18n::Language, position: Option<usize>, message: &str) -> String {
|
||||
let message = parse_error_message(lang, message);
|
||||
match position {
|
||||
Some(p) => lang.tr_fill("Error at character {position}: {message}", &[("position", &p.to_string()), ("message", &message)]),
|
||||
None => message,
|
||||
}
|
||||
}
|
||||
|
||||
/// The editor's body: quick-insert buttons, the LaTeX source with its error underlined, a live
|
||||
/// preview on a sheet-coloured card, and OK/Cancel.
|
||||
pub fn editor(app: &mut SheetApp, ui: &mut egui::Ui, d: &mut Dialog, confirm: &mut bool, open: &mut bool) {
|
||||
@@ -228,7 +164,10 @@ pub fn editor(app: &mut SheetApp, ui: &mut egui::Ui, d: &mut Dialog, confirm: &m
|
||||
ui.add_space(4.0);
|
||||
match &pv.result {
|
||||
Err(e) if !text.trim().is_empty() => {
|
||||
let msg = parse_error_text(app.ui.language, e.char_pos(&text), &e.message);
|
||||
let msg = match e.char_pos(&text) {
|
||||
Some(p) => format!("Error at character {p}: {}", e.message),
|
||||
None => e.message.clone(),
|
||||
};
|
||||
ui.colored_label(t.danger, msg);
|
||||
}
|
||||
_ => {
|
||||
@@ -561,202 +500,6 @@ fn triangulate(pts: &[Pos2]) -> Vec<[usize; 3]> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parse_errors_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
assert_eq!(parse_error_text(Language::En, Some(3), "Missing }"), "Error at character 3: Missing }");
|
||||
assert_eq!(parse_error_text(Language::En, None, "Empty {group}"), "Empty {group}");
|
||||
let it = Language::It;
|
||||
// The message is filled in once: its own `{message}` stays as it is.
|
||||
let want = it.tr("Error at character {position}: {message}").replace("{position}", "3").replace("{message}", "Bad {message}");
|
||||
assert_eq!(parse_error_text(it, Some(3), "Bad {message}"), want);
|
||||
assert!(!want.starts_with("Error at character"));
|
||||
}
|
||||
|
||||
/// RaTeX's fixed parser messages that an equation can reach; each is a catalog key.
|
||||
const RATEX_MESSAGES: &[&str] = &[
|
||||
"Double superscript",
|
||||
"Double subscript",
|
||||
"Extra }",
|
||||
"Unexpected end of input in a macro argument",
|
||||
"Expected \\right after \\left",
|
||||
"\\middle must be within \\left and \\right",
|
||||
"Invalid environment name",
|
||||
"Expected \\end after environment body",
|
||||
"Expected URL",
|
||||
"\\tag requires an argument",
|
||||
"only one infix operator per group",
|
||||
"Expected color token",
|
||||
"Expected size for \\raisebox",
|
||||
"Expected size for \\rule width",
|
||||
"Expected size for \\rule height",
|
||||
"Cannot use both \\tag and \\nonumber in the same row",
|
||||
"Multiple \\tag in a row",
|
||||
"\\tag must appear at the end of the row after the equation body",
|
||||
"Multiple \\nonumber in a row",
|
||||
"\\nonumber must appear at the end of the row",
|
||||
"Too many tab characters: &",
|
||||
"Invalid column alignment for array",
|
||||
"Expected column alignment character",
|
||||
"Expected l or c or r",
|
||||
"Expected ]",
|
||||
"Unexpected end of CD row after @",
|
||||
"Invalid column alignment for subarray",
|
||||
"{subarray} can contain only one column",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command",
|
||||
"Recursion limit exceeded",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting",
|
||||
"Expected raw style for \\htmlStyle",
|
||||
"\\verb assertion failed",
|
||||
];
|
||||
|
||||
/// RaTeX's messages, as `layout` reports them for real sources, follow the interface language:
|
||||
/// a fixed message by its catalog key, a message with a piece of the source by its template
|
||||
/// with the same pieces filled in. The English is checked first, so a reworded RaTeX message
|
||||
/// fails here instead of silently staying English.
|
||||
#[test]
|
||||
fn ratex_parse_errors_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::math::layout;
|
||||
/// Source, RaTeX's English message, its catalog key or template, and the template's pieces.
|
||||
type Case = (&'static str, &'static str, &'static str, &'static [(&'static str, &'static str)]);
|
||||
#[rustfmt::skip]
|
||||
let cases: &[Case] = &[
|
||||
("x^1^2", "Double superscript", "Double superscript", &[]),
|
||||
("x_1_2", "Double subscript", "Double subscript", &[]),
|
||||
("x^\\frac", "Unexpected end of input in a macro argument", "Unexpected end of input in a macro argument", &[]),
|
||||
("\\middle|", "\\middle must be within \\left and \\right", "\\middle must be within \\left and \\right", &[]),
|
||||
("a \\over b \\over c", "only one infix operator per group", "only one infix operator per group", &[]),
|
||||
("\\begin{array}{l}a&b\\end{array}", "Too many tab characters: &", "Too many tab characters: &", &[]),
|
||||
("\\begin{subarray}{lc}x\\end{subarray}", "{subarray} can contain only one column", "{subarray} can contain only one column", &[]),
|
||||
("\\begin{aligned}a\\tag1\\tag2\\end{aligned}", "Multiple \\tag in a row", "Multiple \\tag in a row", &[]),
|
||||
("\\begin{CD}A @", "Unexpected end of CD row after @", "Unexpected end of CD row after @", &[]),
|
||||
("\\verb", "\\verb assertion failed", "\\verb assertion failed", &[]),
|
||||
("\\foo", "Undefined control sequence: \\foo", "Undefined control sequence: {name}", &[("name", "\\foo")]),
|
||||
("x^{2", "Expected '}', got 'EOF'", "Expected '{expected}', got '{got}'", &[("expected", "}"), ("got", "EOF")]),
|
||||
("x^", "Expected group after '^'", "Expected group after '{symbol}'", &[("symbol", "^")]),
|
||||
("\\left\\frac x\\right)", "Expected delimiter as argument to '\\left'", "Expected delimiter as argument to '{function}'", &[("function", "\\left")]),
|
||||
("\\text{\\frac12}", "Can't use function '\\frac' in text mode", "Can't use function '{function}' in text mode", &[("function", "\\frac")]),
|
||||
("\\)", "Can't use function '\\)' in math mode", "Can't use function '{function}' in math mode", &[("function", "\\)")]),
|
||||
("\\color{zz!}{x}", "Invalid color: 'zz!'", "Invalid color: '{color}'", &[("color", "zz!")]),
|
||||
("\\rule{abc}{1em}", "Invalid size: 'abc'", "Invalid size: '{size}'", &[("size", "abc")]),
|
||||
("\\rule{1xx}{1em}", "Invalid unit: 'xx'", "Invalid unit: '{unit}'", &[("unit", "xx")]),
|
||||
("\\bigl x", "Invalid delimiter 'x' after '\\bigl'", "Invalid delimiter '{delimiter}' after '{function}'", &[("delimiter", "x"), ("function", "\\bigl")]),
|
||||
("\\bigl{x}", "Invalid delimiter type 'ordgroup' after '\\bigl'", "Invalid delimiter type '{type}' after '{function}'", &[("type", "ordgroup"), ("function", "\\bigl")]),
|
||||
("\\begin{foo}x\\end{foo}", "No such environment: foo", "No such environment: {name}", &[("name", "foo")]),
|
||||
("\\begin{matrix}x\\end{pmatrix}", "Mismatch: \\begin{matrix} matched by \\end{pmatrix}", "Mismatch: \\begin{{begin}} matched by \\end{{end}}", &[("begin", "matrix"), ("end", "pmatrix")]),
|
||||
("\\hline", "\\hline valid only within array environment", "{command} valid only within array environment", &[("command", "\\hline")]),
|
||||
("\\begin{matrix}a", "Expected & or \\\\ or \\cr or \\end, got 'EOF'", "Expected & or \\\\ or \\cr or \\end, got '{got}'", &[("got", "EOF")]),
|
||||
("\\begin{array}{q}x\\end{array}", "Unknown column alignment: q", "Unknown column alignment: {alignment}", &[("alignment", "q")]),
|
||||
("\\begin{alignedat}{1}a&b&c&d\\end{alignedat}", "Too many math in a row: expected 1, but got 2", "Too many math in a row: expected {expected}, but got {got}", &[("expected", "1"), ("got", "2")]),
|
||||
("\\begin{CD}A @Q B\\end{CD}", "Unknown CD directive: @Q", "Unknown CD directive: @{directive}", &[("directive", "Q")]),
|
||||
("\\begin{prooftree}\\BinaryInfC{x}\\end{prooftree}", "\\BinaryInfC needs 2 premise(s), but only 0 available", "{command} needs {count} premise(s), but only {available} available", &[("command", "\\BinaryInfC"), ("count", "2"), ("available", "0")]),
|
||||
("\\begin{prooftree}\\frac\\end{prooftree}", "\\frac valid only as a supported bussproofs command within prooftree", "{command} valid only as a supported bussproofs command within prooftree", &[("command", "\\frac")]),
|
||||
("\\begin{prooftree}\\AxiomC{x}\\AxiomC{y}\\end{prooftree}", "prooftree ended with 2 proof stack item(s), expected 1", "prooftree ended with {count} proof stack item(s), expected 1", &[("count", "2")]),
|
||||
("\\char\"FFFFFFF", "\\@char with invalid code point 268435455", "\\@char with invalid code point {code}", &[("code", "268435455")]),
|
||||
];
|
||||
let it = Language::It;
|
||||
for (src, english, template, values) in cases {
|
||||
let message = layout(src).err().unwrap_or_else(|| panic!("{src:?} lays out")).message;
|
||||
assert_eq!(&message, english, "{src:?}");
|
||||
assert_eq!(parse_error_message(Language::En, &message), message, "English stays as RaTeX wrote it");
|
||||
let want = values.iter().fold(it.tr(template).to_string(), |text, (name, value)| text.replace(&format!("{{{name}}}"), value));
|
||||
assert_eq!(parse_error_message(it, &message), want, "{src:?}");
|
||||
assert_ne!(want, message, "{src:?} stays English in Italian");
|
||||
}
|
||||
let want = it.tr("Error at character {position}: {message}").replace("{position}", "2").replace("{message}", it.tr("Double superscript"));
|
||||
assert_eq!(parse_error_text(it, Some(2), "Double superscript"), want);
|
||||
}
|
||||
|
||||
/// Every RaTeX shape is read by its own template (not by a shorter one listed earlier), and
|
||||
/// every catalog translates it with the same placeholders; every fixed message is translated in
|
||||
/// every catalog.
|
||||
#[test]
|
||||
fn ratex_messages_are_translated_in_every_catalog() {
|
||||
use crate::i18n::{Language, fill, unfill};
|
||||
let placeholders = |s: &str| {
|
||||
let mut names = s.split('{').skip(1).filter_map(|rest| rest.split_once('}').map(|(name, _)| name.to_string())).collect::<Vec<_>>();
|
||||
names.sort();
|
||||
names
|
||||
};
|
||||
for template in RATEX_TEMPLATES {
|
||||
// A sample piece per placeholder: `\a1`, `\a2`, …
|
||||
let names = unfill(template, template).unwrap_or_else(|| panic!("{template:?} does not read itself"));
|
||||
let samples = (1..=names.len()).map(|i| format!("\\a{i}")).collect::<Vec<_>>();
|
||||
let values = names.iter().zip(&samples).map(|((name, _), sample)| (*name, sample.as_str())).collect::<Vec<_>>();
|
||||
let message = fill(template, &values);
|
||||
let first = RATEX_TEMPLATES.iter().find(|t| unfill(t, &message).is_some());
|
||||
assert_eq!(first, Some(template), "{message:?}");
|
||||
assert_eq!(parse_error_message(Language::En, &message), message);
|
||||
for language in Language::ALL.into_iter().filter(|l| *l != Language::En) {
|
||||
let text = language.tr(template);
|
||||
assert_eq!(placeholders(text), placeholders(template), "{}: {template:?} => {text:?}", language.code());
|
||||
assert!(!text.contains('\n'), "{}: {template:?} => {text:?}", language.code());
|
||||
assert_eq!(parse_error_message(language, &message), fill(text, &values), "{}", language.code());
|
||||
assert_ne!(parse_error_message(language, &message), message, "{} leaves {template:?} in English", language.code());
|
||||
}
|
||||
}
|
||||
for message in RATEX_MESSAGES {
|
||||
for language in Language::ALL.into_iter().filter(|l| *l != Language::En) {
|
||||
let shown = parse_error_message(language, message);
|
||||
assert_ne!(&shown, message, "{} leaves {message:?} in English", language.code());
|
||||
assert_eq!(placeholders(&shown), placeholders(message), "{}: {message:?} => {shown:?}", language.code());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A message of no known shape, such as RaTeX's internal ones or the chemistry parser's, stays
|
||||
/// as RaTeX wrote it in every language.
|
||||
#[test]
|
||||
fn unknown_parser_messages_stay_as_ratex_wrote_them() {
|
||||
use crate::i18n::Language;
|
||||
for message in ["Null argument, please report this as a bug", "\\ce: unexpected token", "Expected group as atom", ""] {
|
||||
for language in Language::ALL {
|
||||
assert_eq!(parse_error_message(language, message), message, "{}", language.code());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The equation checks' own messages are translated in every catalog. Each comes from the real check, and the expected English is
|
||||
/// built from the limits, so a changed limit fails here instead of silently falling back to
|
||||
/// English (the catalogs key the message with the number in it).
|
||||
#[test]
|
||||
fn equation_check_messages_are_translated_in_every_catalog() {
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::math::{MAX_CELLS, MAX_DEPTH, MAX_SOURCE_BYTES, layout};
|
||||
let cases = [
|
||||
("\\def\\x{1} x".to_string(), "Macro definitions are not supported in equations.".to_string()),
|
||||
("50% \\href{https://example.com}{x}".to_string(), "A % can't be combined with a link in an equation.".to_string()),
|
||||
(format!("{}x{}", "{".repeat(MAX_DEPTH + 1), "}".repeat(MAX_DEPTH + 1)), format!("Equations can nest at most {MAX_DEPTH} levels deep.")),
|
||||
("x".repeat(MAX_SOURCE_BYTES + 1), format!("An equation can be at most {MAX_SOURCE_BYTES} bytes long.")),
|
||||
(
|
||||
"\\begin{alignedat}{99999999}a\\end{alignedat}".to_string(),
|
||||
format!("An equation can have at most {MAX_CELLS} matrix cells (rows times the widest row)."),
|
||||
),
|
||||
("\\rule{99999999em}{1em}".to_string(), "This equation is too large to draw.".to_string()),
|
||||
];
|
||||
let mut messages = Vec::new();
|
||||
for (src, want) in cases {
|
||||
let got = layout(&src).err().unwrap_or_else(|| panic!("{src:?} lays out")).message;
|
||||
assert_eq!(got, want, "{src:?} hits another check");
|
||||
messages.push(got);
|
||||
}
|
||||
// Only a panic inside the layout reaches this one.
|
||||
messages.push("This equation could not be laid out.".to_string());
|
||||
for message in &messages {
|
||||
for language in Language::ALL {
|
||||
let shown = parse_error_text(language, None, message);
|
||||
assert!(!shown.contains('\n'), "{}: {message:?} => {shown:?}", language.code());
|
||||
if language != Language::En {
|
||||
assert_ne!(&shown, message, "{} leaves {message:?} in English", language.code());
|
||||
}
|
||||
}
|
||||
}
|
||||
let it = Language::It;
|
||||
let want = it.tr("Error at character {position}: {message}").replace("{position}", "1").replace("{message}", it.tr(&messages[0]));
|
||||
assert_eq!(parse_error_text(it, Some(1), &messages[0]), want);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ear_clipping_covers_a_concave_polygon() {
|
||||
// An L shape: area 3 unit squares.
|
||||
|
||||
@@ -280,8 +280,7 @@ fn active_input(app: &SheetApp) -> String {
|
||||
let Some(sh) = d.wb.active() else { return String::new() };
|
||||
let a = sh.merge_at(d.selection.active).map(|m| m.start).unwrap_or(d.selection.active);
|
||||
if let Some(picture) = sh.cell_pictures.get(&a) {
|
||||
let lang = app.ui.language;
|
||||
return if picture.alt.is_empty() { lang.tr("Picture in cell").into() } else { lang.tr_fill("Picture: {alt}", &[("alt", &picture.alt)]) };
|
||||
return if picture.alt.is_empty() { "Picture in cell".into() } else { format!("Picture: {}", picture.alt) };
|
||||
}
|
||||
// Python code is shown as it is: it isn't a formula to translate or a value to format. Like
|
||||
// a formula, it stays out of view in a Hidden cell on a protected sheet.
|
||||
@@ -943,31 +942,6 @@ mod spill_tests {
|
||||
SheetApp::new(s, Default::default())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_picture_in_a_cell_is_named_in_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::core::CellRef;
|
||||
use gridcraft_engine::model::CellPicture;
|
||||
let mut app = app();
|
||||
let put = |app: &mut SheetApp, cell: &str, alt: &str| {
|
||||
let at = CellRef::parse(cell).unwrap();
|
||||
let picture = std::sync::Arc::new(CellPicture { data: vec![], mime: "image/png".into(), alt: alt.into() });
|
||||
std::sync::Arc::make_mut(&mut app.session.active_mut().unwrap().wb).sheet_mut(0).unwrap().set_picture(at, picture);
|
||||
};
|
||||
put(&mut app, "A1", "");
|
||||
put(&mut app, "A2", "Logo {alt}");
|
||||
select(&mut app, "A1");
|
||||
assert_eq!(active_input(&app), "Picture in cell");
|
||||
select(&mut app, "A2");
|
||||
assert_eq!(active_input(&app), "Picture: Logo {alt}");
|
||||
app.ui.language = Language::It;
|
||||
select(&mut app, "A1");
|
||||
assert_eq!(active_input(&app), Language::It.tr("Picture in cell"));
|
||||
assert_ne!(active_input(&app), "Picture in cell");
|
||||
select(&mut app, "A2");
|
||||
assert_eq!(active_input(&app), Language::It.tr("Picture: {alt}").replace("{alt}", "Logo {alt}"));
|
||||
}
|
||||
|
||||
fn set(app: &mut SheetApp, cell: &str, input: &str) {
|
||||
app.run("cell.set", json!({"cell": cell, "input": input})).unwrap();
|
||||
}
|
||||
|
||||
@@ -711,7 +711,8 @@ fn handle_dragging(app: &mut SheetApp, input: &InteractionInput<'_>) {
|
||||
}
|
||||
Drag::ResizeCol { col, start, orig, to } => {
|
||||
let w = nan_safe_size(orig + (p.x - start) / geo.z);
|
||||
app.toast = Some((column_width_tip(app.ui.language, w), crate::now_ms()));
|
||||
app.toast =
|
||||
Some((format!("Width: {:.2} ({} pixels)", gridcraft_engine::cmd::format::points_to_chars(w as f64), w.round()), crate::now_ms()));
|
||||
// Preview on the dragged column only; the release applies it to the selection. A
|
||||
// rejected size leaves the last shown preview (and `to`) as it was.
|
||||
let ok = app.session.run("home.columnWidth", json!({"cols": RangeRef::cols(col, col).a1(), "width": w.round()})).is_ok();
|
||||
@@ -720,7 +721,7 @@ fn handle_dragging(app: &mut SheetApp, input: &InteractionInput<'_>) {
|
||||
}
|
||||
Drag::ResizeRow { row, start, orig, to } => {
|
||||
let h = nan_safe_size(orig + (p.y - start) / geo.z);
|
||||
app.toast = Some((row_height_tip(app.ui.language, h), crate::now_ms()));
|
||||
app.toast = Some((format!("Height: {:.2} ({} pixels)", h * 0.75, h.round()), crate::now_ms()));
|
||||
let ok = app.session.run("home.rowHeight", json!({"rows": format!("{}:{}", row + 1, row + 1), "height": h.round()})).is_ok();
|
||||
coalesce_resize_undo(app);
|
||||
app.grid.drag = Drag::ResizeRow { row, start, orig, to: if ok { Some(h) } else { to } };
|
||||
@@ -1030,20 +1031,6 @@ fn scroll_by(app: &mut SheetApp, d: egui::Vec2) {
|
||||
}
|
||||
}
|
||||
|
||||
/// The tip while a column border is dragged to `width` pixels: the width in characters, then in
|
||||
/// pixels (`Width: 8.43 (64 pixels)`).
|
||||
pub(crate) fn column_width_tip(lang: crate::i18n::Language, width: f32) -> String {
|
||||
let chars = format!("{:.2}", gridcraft_engine::cmd::format::points_to_chars(f64::from(width)));
|
||||
lang.tr_fill("Width: {chars} ({pixels} pixels)", &[("chars", &chars), ("pixels", &width.round().to_string())])
|
||||
}
|
||||
|
||||
/// The tip while a row border is dragged to `height` pixels: the height in points, then in pixels
|
||||
/// (`Height: 15.00 (20 pixels)`).
|
||||
pub(crate) fn row_height_tip(lang: crate::i18n::Language, height: f32) -> String {
|
||||
let points = format!("{:.2}", height * 0.75);
|
||||
lang.tr_fill("Height: {points} ({pixels} pixels)", &[("points", &points), ("pixels", &height.round().to_string())])
|
||||
}
|
||||
|
||||
fn fill_target(src: RangeRef, pc: CellRef) -> RangeRef {
|
||||
let below = pc.row as i64 - src.end.row as i64;
|
||||
let above = src.start.row as i64 - pc.row as i64;
|
||||
@@ -1275,17 +1262,6 @@ mod resize_tests {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn resize_tips_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
assert_eq!(column_width_tip(Language::En, 64.0), "Width: 8.43 (64 pixels)");
|
||||
assert_eq!(row_height_tip(Language::En, 20.0), "Height: 15.00 (20 pixels)");
|
||||
let de = Language::De;
|
||||
assert_eq!(column_width_tip(de, 64.0), de.tr("Width: {chars} ({pixels} pixels)").replace("{chars}", "8.43").replace("{pixels}", "64"));
|
||||
assert_eq!(row_height_tip(de, 20.0), de.tr("Height: {points} ({pixels} pixels)").replace("{points}", "15.00").replace("{pixels}", "20"));
|
||||
assert!(!column_width_tip(de, 64.0).starts_with("Width"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_pen_preview_is_the_ink_the_stroke_commits() {
|
||||
// #1786: the preview was always blue at 2 pt, whatever the pen.
|
||||
|
||||
@@ -222,11 +222,6 @@ impl Language {
|
||||
}
|
||||
}
|
||||
|
||||
/// Translates `template`, then fills in its `{name}` placeholders (see [`fill`]).
|
||||
pub fn tr_fill(self, template: &str, values: &[(&str, &str)]) -> String {
|
||||
fill(self.tr(template), values)
|
||||
}
|
||||
|
||||
pub(crate) fn tr_error(self, message: &str) -> String {
|
||||
let message = if message.starts_with("command `") { crate::clean_error(message) } else { message.to_owned() };
|
||||
|
||||
@@ -257,76 +252,6 @@ impl Language {
|
||||
}
|
||||
}
|
||||
|
||||
/// Fills in the `{name}` placeholders of a translated template in one pass, so a value that itself
|
||||
/// holds `{…}` (a macro or sheet name) is shown as it is and never filled again. A placeholder
|
||||
/// without a value stays as written.
|
||||
pub fn fill(template: &str, values: &[(&str, &str)]) -> String {
|
||||
let mut out = String::with_capacity(template.len());
|
||||
let mut rest = template;
|
||||
while let Some((before, after)) = rest.split_once('{') {
|
||||
out.push_str(before);
|
||||
let value = after.split_once('}').and_then(|(name, tail)| values.iter().find(|(key, _)| *key == name).map(|(_, value)| (*value, tail)));
|
||||
match value {
|
||||
Some((value, tail)) => {
|
||||
out.push_str(value);
|
||||
rest = tail;
|
||||
}
|
||||
None => {
|
||||
out.push('{');
|
||||
rest = after;
|
||||
}
|
||||
}
|
||||
}
|
||||
out.push_str(rest);
|
||||
out
|
||||
}
|
||||
|
||||
/// The values that [`fill`] puts into `template` to give `text`, or `None` when `text` has
|
||||
/// another shape. A `{name}` of lowercase letters and `_` is a placeholder; any other `{` is
|
||||
/// text. Each placeholder takes the text up to the first copy of the literal after it (the last
|
||||
/// one takes the rest), and a match counts only when filling the values back in gives `text`.
|
||||
pub fn unfill<'a>(template: &'a str, text: &'a str) -> Option<Vec<(&'a str, &'a str)>> {
|
||||
enum Part<'a> {
|
||||
Text(String),
|
||||
Value(&'a str),
|
||||
}
|
||||
let mut parts = Vec::new();
|
||||
let mut literal = String::new();
|
||||
let mut rest = template;
|
||||
while let Some((before, after)) = rest.split_once('{') {
|
||||
literal.push_str(before);
|
||||
match after.split_once('}').filter(|(name, _)| !name.is_empty() && name.bytes().all(|b| b.is_ascii_lowercase() || b == b'_')) {
|
||||
Some((name, tail)) => {
|
||||
parts.push(Part::Text(std::mem::take(&mut literal)));
|
||||
parts.push(Part::Value(name));
|
||||
rest = tail;
|
||||
}
|
||||
None => {
|
||||
literal.push('{');
|
||||
rest = after;
|
||||
}
|
||||
}
|
||||
}
|
||||
literal.push_str(rest);
|
||||
parts.push(Part::Text(literal));
|
||||
|
||||
// `parts` alternates text and placeholder, starting and ending with (maybe empty) text.
|
||||
let mut values = Vec::new();
|
||||
let mut rest = text;
|
||||
for (i, part) in parts.iter().enumerate() {
|
||||
match part {
|
||||
Part::Text(literal) => rest = rest.strip_prefix(literal.as_str())?,
|
||||
Part::Value(name) => {
|
||||
let Some(Part::Text(next)) = parts.get(i + 1) else { return None };
|
||||
let len = if i + 2 == parts.len() { rest.strip_suffix(next.as_str())?.len() } else { rest.find(next.as_str())? };
|
||||
values.push((*name, &rest[..len]));
|
||||
rest = &rest[len..];
|
||||
}
|
||||
}
|
||||
}
|
||||
(rest.is_empty() && fill(template, &values) == text).then_some(values)
|
||||
}
|
||||
|
||||
/// English text and its translation, sorted by the English.
|
||||
type HelpTable = &'static [(&'static str, &'static str)];
|
||||
|
||||
@@ -493,67 +418,6 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fill_puts_each_value_in_once() {
|
||||
// A value holding a placeholder (a macro named `{steps}`) is shown as it is.
|
||||
assert_eq!(fill("Ran macro “{name}” ({steps} steps)", &[("name", "{steps}"), ("steps", "3")]), "Ran macro “{steps}” (3 steps)");
|
||||
assert_eq!(fill("{a} and {b}, {a}", &[("a", "1")]), "1 and {b}, 1", "a placeholder without a value stays");
|
||||
assert_eq!(fill("{ unclosed", &[("unclosed", "x")]), "{ unclosed");
|
||||
assert_eq!(fill("50% {}", &[]), "50% {}");
|
||||
assert_eq!(Language::En.tr_fill("Sheets: {sheets}", &[("sheets", "Sheet1, Sheet2")]), "Sheets: Sheet1, Sheet2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unfill_reads_back_what_fill_put_in() {
|
||||
assert_eq!(unfill("Expected '{expected}', got '{got}'", "Expected '}', got 'EOF'"), Some(vec![("expected", "}"), ("got", "EOF")]));
|
||||
assert_eq!(
|
||||
unfill("Mismatch: \\begin{{begin}} matched by \\end{{end}}", "Mismatch: \\begin{a} matched by \\end{b}"),
|
||||
Some(vec![("begin", "a"), ("end", "b")])
|
||||
);
|
||||
assert_eq!(unfill("{command} valid only here", "\\hline valid only here"), Some(vec![("command", "\\hline")]));
|
||||
assert_eq!(unfill("Undefined control sequence: {name}", "Undefined control sequence: \\foo"), Some(vec![("name", "\\foo")]));
|
||||
assert_eq!(unfill("Double superscript", "Double superscript"), Some(vec![]));
|
||||
// The last placeholder runs to the closing literal, so a longer message is read whole.
|
||||
assert_eq!(unfill("Invalid type '{type}'", "Invalid type 'a' after 'b'"), Some(vec![("type", "a' after 'b")]));
|
||||
assert_eq!(unfill("Expected '{expected}', got '{got}'", "Expected } here"), None);
|
||||
assert_eq!(unfill("Expected '{expected}'", "Expected 'x' later"), None);
|
||||
assert_eq!(unfill("Mismatched {command}", "Mismatch: x"), None);
|
||||
}
|
||||
|
||||
/// The templates the UI translates first and fills in after (status bar, toasts, dialog
|
||||
/// notes and titles) keep their placeholders in every catalog, so no value goes missing.
|
||||
#[test]
|
||||
fn filled_in_templates_keep_their_placeholders() {
|
||||
let placeholders = |s: &str| {
|
||||
let mut names = s.split('{').skip(1).filter_map(|rest| rest.split_once('}').map(|(name, _)| name.to_string())).collect::<Vec<_>>();
|
||||
names.sort();
|
||||
names
|
||||
};
|
||||
for template in [
|
||||
"Circular References: {cell}",
|
||||
"Goal Seeking found a solution: {value}",
|
||||
"Width: {chars} ({pixels} pixels)",
|
||||
"Height: {points} ({pixels} pixels)",
|
||||
"Picture: {alt}",
|
||||
"Sheets: {sheets}",
|
||||
"Hidden: {sheets}",
|
||||
"Format Control: {name}",
|
||||
"Error at character {position}: {message}",
|
||||
"Saved macro “{name}” ({steps} step)",
|
||||
"Saved macro “{name}” ({steps} steps)",
|
||||
"without {key}: another macro took it while recording",
|
||||
"Macro “{name}” stopped: {message}",
|
||||
"Ran macro “{name}” ({steps} step)",
|
||||
"Ran macro “{name}” ({steps} steps)",
|
||||
] {
|
||||
for language in Language::ALL {
|
||||
let text = language.tr(template);
|
||||
assert_eq!(placeholders(text), placeholders(template), "{}: {template:?} => {text:?}", language.code());
|
||||
assert!(!text.contains('\n'), "{}: {template:?} => {text:?}", language.code());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn translations_never_show_the_context_prefix() {
|
||||
// `tr` returns a found translation as it is, so a catalog that keeps `context|` in its
|
||||
|
||||
@@ -600,114 +600,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Zobrazit",
|
||||
"Collapse dialog" => "Sbalit dialogové okno",
|
||||
"Expand dialog" => "Rozbalit dialogové okno",
|
||||
"Numerical Count" => "Počet čísel",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maximum",
|
||||
"Circular References: {cell}" => "Cyklické odkazy: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Šířka: {chars} (pixelů: {pixels})",
|
||||
"Height: {points} ({pixels} pixels)" => "Výška: {points} (pixelů: {pixels})",
|
||||
"Picture in cell" => "Obrázek v buňce",
|
||||
"Picture: {alt}" => "Obrázek: {alt}",
|
||||
"Format Control: {name}" => "Formát ovládacího prvku: {name}",
|
||||
"Error at character {position}: {message}" => "Chyba na znaku {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Definice maker nejsou v rovnicích podporovány.",
|
||||
"A % can't be combined with a link in an equation." => "Znak % nelze v rovnici kombinovat s odkazem.",
|
||||
"Equations can nest at most 32 levels deep." => "Rovnice lze vnořit nejvýše do 32 úrovní.",
|
||||
"An equation can be at most 4096 bytes long." => "Rovnice může mít nejvýše 4096 bajtů.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Rovnice může mít nejvýše 2500 buněk matice (řádky krát nejširší řádek)."
|
||||
}
|
||||
"This equation is too large to draw." => "Tato rovnice je příliš velká na vykreslení.",
|
||||
"This equation could not be laid out." => "Tuto rovnici nelze vysázet.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Makro „{name}“ uloženo ({steps} krok)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Makro „{name}“ uloženo (počet kroků: {steps})",
|
||||
"without {key}: another macro took it while recording" => "bez {key}: během záznamu ji převzalo jiné makro",
|
||||
"Recording stopped" => "Záznam zastaven",
|
||||
"Macro “{name}” stopped: {message}" => "Makro „{name}“ se zastavilo: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Makro „{name}“ spuštěno ({steps} krok)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Makro „{name}“ spuštěno (počet kroků: {steps})",
|
||||
"Average" => "Průměr",
|
||||
"Count" => "Počet",
|
||||
"Sum" => "Součet",
|
||||
"Goal Seeking found a solution: {value}" => "Hledání řešení našlo výsledek: {value}",
|
||||
"Sheets: {sheets}" => "Listy: {sheets}",
|
||||
"Hidden: {sheets}" => "Skryté: {sheets}",
|
||||
"Double superscript" => "Dvojitý horní index",
|
||||
"Double subscript" => "Dvojitý dolní index",
|
||||
"Extra }" => "Nadbytečná }",
|
||||
"Unexpected end of input in a macro argument" => "Neočekávaný konec vstupu v argumentu makra",
|
||||
"Expected \\right after \\left" => "Po \\left se očekává \\right",
|
||||
"\\middle must be within \\left and \\right" => "\\middle musí být mezi \\left a \\right",
|
||||
"Invalid environment name" => "Neplatný název prostředí",
|
||||
"Expected \\end after environment body" => "Po obsahu prostředí se očekává \\end",
|
||||
"Expected URL" => "Očekává se adresa URL",
|
||||
"\\tag requires an argument" => "\\tag vyžaduje argument",
|
||||
"only one infix operator per group" => "Ve skupině smí být jen jeden infixový operátor",
|
||||
"Expected color token" => "Očekává se barva",
|
||||
"Expected size for \\raisebox" => "Pro \\raisebox se očekává velikost",
|
||||
"Expected size for \\rule width" => "Pro šířku \\rule se očekává velikost",
|
||||
"Expected size for \\rule height" => "Pro výšku \\rule se očekává velikost",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag a \\nonumber nelze použít ve stejném řádku",
|
||||
"Multiple \\tag in a row" => "Více \\tag v jednom řádku",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag musí být na konci řádku za obsahem rovnice",
|
||||
"Multiple \\nonumber in a row" => "Více \\nonumber v jednom řádku",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber musí být na konci řádku",
|
||||
"Too many tab characters: &" => "Příliš mnoho tabulačních znaků: &",
|
||||
"Invalid column alignment for array" => "Neplatné zarovnání sloupců pro array",
|
||||
"Expected column alignment character" => "Očekává se znak zarovnání sloupce",
|
||||
"Expected l or c or r" => "Očekává se l, c nebo r",
|
||||
"Expected ]" => "Očekává se ]",
|
||||
"Unexpected end of CD row after @" => "Neočekávaný konec řádku CD po @",
|
||||
"Invalid column alignment for subarray" => "Neplatné zarovnání sloupců pro subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} může obsahovat jen jeden sloupec",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree obsahuje \\LeftLabel nebo \\RightLabel bez následujícího odvozovacího příkazu"
|
||||
}
|
||||
"Recursion limit exceeded" => "Překročen limit rekurze",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Příliš mnoho rozvinutí maker: nekonečná smyčka nebo příliš nízké nastavení maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Pro \\htmlStyle se očekává surový styl",
|
||||
"\\verb assertion failed" => "Kontrola \\verb selhala",
|
||||
"Undefined control sequence: {name}" => "Nedefinovaná řídicí sekvence: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Očekává se '{expected}', nalezeno '{got}'",
|
||||
"Expected group after '{symbol}'" => "Po '{symbol}' se očekává skupina",
|
||||
"Expected delimiter as argument to '{function}'" => "Jako argument '{function}' se očekává oddělovač",
|
||||
"Expected group as argument to '{function}'" => "Jako argument '{function}' se očekává skupina",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funkce '{function}' bez argumentů použita jako horní index",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funkce '{function}' bez argumentů použita jako dolní index",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Funkce '{function}' bez argumentů použita jako argument '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funkce '{function}' bez argumentů použita jako \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Funkci '{function}' nelze použít v textovém režimu",
|
||||
"Can't use function '{function}' in math mode" => "Funkci '{function}' nelze použít v matematickém režimu",
|
||||
"Invalid color: '{color}'" => "Neplatná barva: '{color}'",
|
||||
"Invalid size: '{size}'" => "Neplatná velikost: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Neplatná jednotka: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Neplatný oddělovač '{delimiter}' po '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Neplatný typ oddělovače '{type}' po '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Neplatný typ oddělovače '{type}'",
|
||||
"No such environment: {name}" => "Neznámé prostředí: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Pro \\begin{{name}} se očekává argument",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Neshoda: \\begin{{begin}} uzavřeno pomocí \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} je platné jen uvnitř prostředí array",
|
||||
"Mismatched {command}" => "{command} bez protějšku",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Očekává se &, \\\\, \\cr nebo \\end, nalezeno '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Neznámé zarovnání sloupce: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Příliš mnoho vzorců v řádku: očekáváno {expected}, nalezeno {got}",
|
||||
"Unknown CD directive: @{directive}" => "Neznámá direktiva CD: @{directive}",
|
||||
"Expected argument for {command}" => "Pro {command} se očekává argument",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} potřebuje {count} předpoklad(ů), ale k dispozici je jen {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} je v prooftree platné jen jako podporovaný příkaz bussproofs"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree skončilo s {count} položkami v zásobníku důkazu, očekávána 1",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char má nečíselný argument {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char s neplatným kódovým bodem {code}",
|
||||
"Invalid environment name character: {character}" => "Neplatný znak v názvu prostředí: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -520,114 +520,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Anzeigen",
|
||||
"Collapse dialog" => "Dialogfeld reduzieren",
|
||||
"Expand dialog" => "Dialogfeld erweitern",
|
||||
"Numerical Count" => "Numerische Zählung",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maximum",
|
||||
"Circular References: {cell}" => "Zirkelbezüge: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Breite: {chars} ({pixels} Pixel)",
|
||||
"Height: {points} ({pixels} pixels)" => "Höhe: {points} ({pixels} Pixel)",
|
||||
"Picture in cell" => "Bild in Zelle",
|
||||
"Picture: {alt}" => "Bild: {alt}",
|
||||
"Format Control: {name}" => "Steuerelement formatieren: {name}",
|
||||
"Error at character {position}: {message}" => "Fehler bei Zeichen {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Makrodefinitionen werden in Formeln nicht unterstützt.",
|
||||
"A % can't be combined with a link in an equation." => "Ein % kann in einer Formel nicht mit einem Link kombiniert werden.",
|
||||
"Equations can nest at most 32 levels deep." => "Formeln können höchstens 32 Ebenen tief verschachtelt werden.",
|
||||
"An equation can be at most 4096 bytes long." => "Eine Formel darf höchstens 4096 Byte lang sein.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Eine Formel darf höchstens 2500 Matrixzellen haben (Zeilen mal breiteste Zeile)."
|
||||
}
|
||||
"This equation is too large to draw." => "Diese Formel ist zu groß zum Zeichnen.",
|
||||
"This equation could not be laid out." => "Diese Formel konnte nicht gesetzt werden.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Makro „{name}“ gespeichert ({steps} Schritt)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Makro „{name}“ gespeichert ({steps} Schritte)",
|
||||
"without {key}: another macro took it while recording" => {
|
||||
"ohne {key}: ein anderes Makro hat die Tastenkombination während der Aufzeichnung übernommen"
|
||||
}
|
||||
"Recording stopped" => "Aufzeichnung beendet",
|
||||
"Macro “{name}” stopped: {message}" => "Makro „{name}“ angehalten: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Makro „{name}“ ausgeführt ({steps} Schritt)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Makro „{name}“ ausgeführt ({steps} Schritte)",
|
||||
"Average" => "Mittelwert",
|
||||
"Count" => "Anzahl",
|
||||
"Sum" => "Summe",
|
||||
"Goal Seeking found a solution: {value}" => "Zielwertsuche hat eine Lösung gefunden: {value}",
|
||||
"Sheets: {sheets}" => "Blätter: {sheets}",
|
||||
"Hidden: {sheets}" => "Ausgeblendet: {sheets}",
|
||||
"Double superscript" => "Doppelter Exponent",
|
||||
"Double subscript" => "Doppelter Index",
|
||||
"Extra }" => "Überzählige }",
|
||||
"Unexpected end of input in a macro argument" => "Unerwartetes Ende der Eingabe in einem Makroargument",
|
||||
"Expected \\right after \\left" => "\\right nach \\left erwartet",
|
||||
"\\middle must be within \\left and \\right" => "\\middle muss zwischen \\left und \\right stehen",
|
||||
"Invalid environment name" => "Ungültiger Umgebungsname",
|
||||
"Expected \\end after environment body" => "\\end nach dem Umgebungsinhalt erwartet",
|
||||
"Expected URL" => "URL erwartet",
|
||||
"\\tag requires an argument" => "\\tag benötigt ein Argument",
|
||||
"only one infix operator per group" => "Nur ein Infix-Operator pro Gruppe",
|
||||
"Expected color token" => "Farbangabe erwartet",
|
||||
"Expected size for \\raisebox" => "Größe für \\raisebox erwartet",
|
||||
"Expected size for \\rule width" => "Größe für die Breite von \\rule erwartet",
|
||||
"Expected size for \\rule height" => "Größe für die Höhe von \\rule erwartet",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag und \\nonumber können nicht in derselben Zeile stehen",
|
||||
"Multiple \\tag in a row" => "Mehrere \\tag in einer Zeile",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag muss am Ende der Zeile nach dem Formelinhalt stehen",
|
||||
"Multiple \\nonumber in a row" => "Mehrere \\nonumber in einer Zeile",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber muss am Ende der Zeile stehen",
|
||||
"Too many tab characters: &" => "Zu viele Tabulatorzeichen: &",
|
||||
"Invalid column alignment for array" => "Ungültige Spaltenausrichtung für array",
|
||||
"Expected column alignment character" => "Zeichen für die Spaltenausrichtung erwartet",
|
||||
"Expected l or c or r" => "l, c oder r erwartet",
|
||||
"Expected ]" => "] erwartet",
|
||||
"Unexpected end of CD row after @" => "Unerwartetes Ende der CD-Zeile nach @",
|
||||
"Invalid column alignment for subarray" => "Ungültige Spaltenausrichtung für subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} darf nur eine Spalte enthalten",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree enthält \\LeftLabel oder \\RightLabel ohne folgenden Schlussbefehl"
|
||||
}
|
||||
"Recursion limit exceeded" => "Rekursionsgrenze überschritten",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Zu viele Makroexpansionen: Endlosschleife oder maxExpand-Einstellung zu niedrig"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Rohstil für \\htmlStyle erwartet",
|
||||
"\\verb assertion failed" => "Prüfung für \\verb fehlgeschlagen",
|
||||
"Undefined control sequence: {name}" => "Unbekannte Steuersequenz: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' erwartet, '{got}' gefunden",
|
||||
"Expected group after '{symbol}'" => "Gruppe nach '{symbol}' erwartet",
|
||||
"Expected delimiter as argument to '{function}'" => "Begrenzer als Argument für '{function}' erwartet",
|
||||
"Expected group as argument to '{function}'" => "Gruppe als Argument für '{function}' erwartet",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funktion '{function}' ohne Argumente als Exponent",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funktion '{function}' ohne Argumente als Index",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => "Funktion '{function}' ohne Argumente als Argument für '{parent}'",
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funktion '{function}' ohne Argumente als \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Funktion '{function}' ist im Textmodus nicht verwendbar",
|
||||
"Can't use function '{function}' in math mode" => "Funktion '{function}' ist im Mathematikmodus nicht verwendbar",
|
||||
"Invalid color: '{color}'" => "Ungültige Farbe: '{color}'",
|
||||
"Invalid size: '{size}'" => "Ungültige Größe: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Ungültige Einheit: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Ungültiger Begrenzer '{delimiter}' nach '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Ungültiger Begrenzertyp '{type}' nach '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Ungültiger Begrenzertyp '{type}'",
|
||||
"No such environment: {name}" => "Unbekannte Umgebung: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Argument für \\begin{{name}} erwartet",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Keine Übereinstimmung: \\begin{{begin}} wird mit \\end{{end}} geschlossen",
|
||||
"{command} valid only within array environment" => "{command} ist nur in einer array-Umgebung gültig",
|
||||
"Mismatched {command}" => "{command} ohne Gegenstück",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr oder \\end erwartet, '{got}' gefunden",
|
||||
"Unknown column alignment: {alignment}" => "Unbekannte Spaltenausrichtung: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Zu viele Formeln in einer Zeile: {expected} erwartet, {got} gefunden",
|
||||
"Unknown CD directive: @{directive}" => "Unbekannte CD-Anweisung: @{directive}",
|
||||
"Expected argument for {command}" => "Argument für {command} erwartet",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} braucht {count} Prämisse(n), aber nur {available} vorhanden"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} ist in prooftree nur als unterstützter bussproofs-Befehl gültig"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree endete mit {count} Beweisstapel-Element(en), erwartet 1",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char hat ein nicht numerisches Argument {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char mit ungültigem Codepunkt {code}",
|
||||
"Invalid environment name character: {character}" => "Ungültiges Zeichen im Umgebungsnamen: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1015,112 +1015,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Εμφάνιση",
|
||||
"Collapse dialog" => "Σύμπτυξη παραθύρου διαλόγου",
|
||||
"Expand dialog" => "Ανάπτυξη παραθύρου διαλόγου",
|
||||
"Numerical Count" => "Αριθμητικό πλήθος",
|
||||
"Minimum" => "Ελάχιστο",
|
||||
"Maximum" => "Μέγιστο",
|
||||
"Circular References: {cell}" => "Κυκλικές αναφορές: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Πλάτος: {chars} ({pixels} pixel)",
|
||||
"Height: {points} ({pixels} pixels)" => "Ύψος: {points} ({pixels} pixel)",
|
||||
"Picture in cell" => "Εικόνα σε κελί",
|
||||
"Picture: {alt}" => "Εικόνα: {alt}",
|
||||
"Format Control: {name}" => "Μορφοποίηση στοιχείου ελέγχου: {name}",
|
||||
"Error at character {position}: {message}" => "Σφάλμα στον χαρακτήρα {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Οι ορισμοί μακροεντολών δεν υποστηρίζονται στις εξισώσεις.",
|
||||
"A % can't be combined with a link in an equation." => "Ένα % δεν μπορεί να συνδυαστεί με σύνδεσμο σε μια εξίσωση.",
|
||||
"Equations can nest at most 32 levels deep." => "Οι εξισώσεις μπορούν να έχουν έως 32 επίπεδα ένθεσης.",
|
||||
"An equation can be at most 4096 bytes long." => "Μια εξίσωση μπορεί να έχει έως 4096 byte.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Μια εξίσωση μπορεί να έχει έως 2500 κελιά πίνακα (γραμμές επί τη φαρδύτερη γραμμή)."
|
||||
}
|
||||
"This equation is too large to draw." => "Αυτή η εξίσωση είναι πολύ μεγάλη για να σχεδιαστεί.",
|
||||
"This equation could not be laid out." => "Δεν ήταν δυνατή η στοιχειοθέτηση αυτής της εξίσωσης.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Η μακροεντολή «{name}» αποθηκεύτηκε ({steps} βήμα)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Η μακροεντολή «{name}» αποθηκεύτηκε ({steps} βήματα)",
|
||||
"without {key}: another macro took it while recording" => "χωρίς {key}: το πήρε άλλη μακροεντολή κατά την καταγραφή",
|
||||
"Recording stopped" => "Η καταγραφή σταμάτησε",
|
||||
"Macro “{name}” stopped: {message}" => "Η μακροεντολή «{name}» σταμάτησε: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Η μακροεντολή «{name}» εκτελέστηκε ({steps} βήμα)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Η μακροεντολή «{name}» εκτελέστηκε ({steps} βήματα)",
|
||||
"Double superscript" => "Διπλός εκθέτης",
|
||||
"Double subscript" => "Διπλός δείκτης",
|
||||
"Extra }" => "Περιττό }",
|
||||
"Unexpected end of input in a macro argument" => "Απρόσμενο τέλος εισόδου σε όρισμα μακροεντολής",
|
||||
"Expected \\right after \\left" => "Αναμενόταν \\right μετά από \\left",
|
||||
"\\middle must be within \\left and \\right" => "Το \\middle πρέπει να βρίσκεται μεταξύ \\left και \\right",
|
||||
"Invalid environment name" => "Μη έγκυρο όνομα περιβάλλοντος",
|
||||
"Expected \\end after environment body" => "Αναμενόταν \\end μετά το σώμα του περιβάλλοντος",
|
||||
"Expected URL" => "Αναμενόταν URL",
|
||||
"\\tag requires an argument" => "Το \\tag απαιτεί όρισμα",
|
||||
"only one infix operator per group" => "Μόνο ένας ενδοθετικός τελεστής ανά ομάδα",
|
||||
"Expected color token" => "Αναμενόταν χρώμα",
|
||||
"Expected size for \\raisebox" => "Αναμενόταν μέγεθος για το \\raisebox",
|
||||
"Expected size for \\rule width" => "Αναμενόταν μέγεθος για το πλάτος του \\rule",
|
||||
"Expected size for \\rule height" => "Αναμενόταν μέγεθος για το ύψος του \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Δεν μπορούν να χρησιμοποιηθούν \\tag και \\nonumber στην ίδια γραμμή",
|
||||
"Multiple \\tag in a row" => "Πολλά \\tag σε μία γραμμή",
|
||||
"\\tag must appear at the end of the row after the equation body" => {
|
||||
"Το \\tag πρέπει να βρίσκεται στο τέλος της γραμμής, μετά το σώμα της εξίσωσης"
|
||||
}
|
||||
"Multiple \\nonumber in a row" => "Πολλά \\nonumber σε μία γραμμή",
|
||||
"\\nonumber must appear at the end of the row" => "Το \\nonumber πρέπει να βρίσκεται στο τέλος της γραμμής",
|
||||
"Too many tab characters: &" => "Πάρα πολλοί χαρακτήρες στηλοθέτη: &",
|
||||
"Invalid column alignment for array" => "Μη έγκυρη στοίχιση στηλών για array",
|
||||
"Expected column alignment character" => "Αναμενόταν χαρακτήρας στοίχισης στήλης",
|
||||
"Expected l or c or r" => "Αναμενόταν l, c ή r",
|
||||
"Expected ]" => "Αναμενόταν ]",
|
||||
"Unexpected end of CD row after @" => "Απρόσμενο τέλος γραμμής CD μετά το @",
|
||||
"Invalid column alignment for subarray" => "Μη έγκυρη στοίχιση στηλών για subarray",
|
||||
"{subarray} can contain only one column" => "Το {subarray} μπορεί να περιέχει μόνο μία στήλη",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"Το prooftree έχει \\LeftLabel ή \\RightLabel χωρίς επόμενη εντολή συμπερασμού"
|
||||
}
|
||||
"Recursion limit exceeded" => "Υπέρβαση ορίου αναδρομής",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Πάρα πολλές αναπτύξεις μακροεντολών: ατέρμων βρόχος ή πολύ χαμηλή ρύθμιση maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Αναμενόταν ακατέργαστο στυλ για το \\htmlStyle",
|
||||
"\\verb assertion failed" => "Αποτυχία ελέγχου του \\verb",
|
||||
"Undefined control sequence: {name}" => "Μη ορισμένη ακολουθία ελέγχου: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Αναμενόταν '{expected}', βρέθηκε '{got}'",
|
||||
"Expected group after '{symbol}'" => "Αναμενόταν ομάδα μετά από '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Αναμενόταν οριοθέτης ως όρισμα του '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Αναμενόταν ομάδα ως όρισμα του '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Η συνάρτηση '{function}' χωρίς ορίσματα χρησιμοποιήθηκε ως εκθέτης",
|
||||
"Got function '{function}' with no arguments as subscript" => "Η συνάρτηση '{function}' χωρίς ορίσματα χρησιμοποιήθηκε ως δείκτης",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Η συνάρτηση '{function}' χωρίς ορίσματα χρησιμοποιήθηκε ως όρισμα του '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Η συνάρτηση '{function}' χωρίς ορίσματα χρησιμοποιήθηκε ως \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Η συνάρτηση '{function}' δεν μπορεί να χρησιμοποιηθεί σε λειτουργία κειμένου",
|
||||
"Can't use function '{function}' in math mode" => "Η συνάρτηση '{function}' δεν μπορεί να χρησιμοποιηθεί σε μαθηματική λειτουργία",
|
||||
"Invalid color: '{color}'" => "Μη έγκυρο χρώμα: '{color}'",
|
||||
"Invalid size: '{size}'" => "Μη έγκυρο μέγεθος: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Μη έγκυρη μονάδα: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Μη έγκυρος οριοθέτης '{delimiter}' μετά από '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Μη έγκυρος τύπος οριοθέτη '{type}' μετά από '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Μη έγκυρος τύπος οριοθέτη '{type}'",
|
||||
"No such environment: {name}" => "Άγνωστο περιβάλλον: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Αναμενόταν όρισμα για το \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Αναντιστοιχία: το \\begin{{begin}} κλείνει με \\end{{end}}",
|
||||
"{command} valid only within array environment" => "Το {command} ισχύει μόνο μέσα σε περιβάλλον array",
|
||||
"Mismatched {command}" => "{command} χωρίς αντίστοιχο",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Αναμενόταν &, \\\\, \\cr ή \\end, βρέθηκε '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Άγνωστη στοίχιση στήλης: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Πάρα πολλοί τύποι σε μία γραμμή: αναμένονταν {expected}, βρέθηκαν {got}",
|
||||
"Unknown CD directive: @{directive}" => "Άγνωστη οδηγία CD: @{directive}",
|
||||
"Expected argument for {command}" => "Αναμενόταν όρισμα για το {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"Το {command} χρειάζεται {count} προκείμενες, αλλά υπάρχουν μόνο {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"Το {command} ισχύει στο prooftree μόνο ως υποστηριζόμενη εντολή bussproofs"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"Το prooftree τελείωσε με {count} στοιχεία στη στοίβα απόδειξης, αναμενόταν 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "Το \\@char έχει μη αριθμητικό όρισμα {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char με μη έγκυρο σημείο κώδικα {code}",
|
||||
"Invalid environment name character: {character}" => "Μη έγκυρος χαρακτήρας στο όνομα περιβάλλοντος: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -526,114 +526,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Mostrar",
|
||||
"Collapse dialog" => "Contraer diálogo",
|
||||
"Expand dialog" => "Expandir diálogo",
|
||||
"Numerical Count" => "Recuento numérico",
|
||||
"Minimum" => "Mínimo",
|
||||
"Maximum" => "Máximo",
|
||||
"Circular References: {cell}" => "Referencias circulares: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Ancho: {chars} ({pixels} píxeles)",
|
||||
"Height: {points} ({pixels} pixels)" => "Alto: {points} ({pixels} píxeles)",
|
||||
"Picture in cell" => "Imagen en celda",
|
||||
"Picture: {alt}" => "Imagen: {alt}",
|
||||
"Format Control: {name}" => "Formato de control: {name}",
|
||||
"Error at character {position}: {message}" => "Error en el carácter {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Las definiciones de macros no se admiten en las ecuaciones.",
|
||||
"A % can't be combined with a link in an equation." => "Un % no se puede combinar con un vínculo en una ecuación.",
|
||||
"Equations can nest at most 32 levels deep." => "Las ecuaciones pueden anidarse como máximo 32 niveles.",
|
||||
"An equation can be at most 4096 bytes long." => "Una ecuación puede tener como máximo 4096 bytes.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Una ecuación puede tener como máximo 2500 celdas de matriz (filas por la fila más ancha)."
|
||||
}
|
||||
"This equation is too large to draw." => "Esta ecuación es demasiado grande para dibujarla.",
|
||||
"This equation could not be laid out." => "No se pudo componer esta ecuación.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macro “{name}” guardada ({steps} paso)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macro “{name}” guardada ({steps} pasos)",
|
||||
"without {key}: another macro took it while recording" => "sin {key}: otra macro lo tomó durante la grabación",
|
||||
"Recording stopped" => "Grabación detenida",
|
||||
"Macro “{name}” stopped: {message}" => "La macro “{name}” se detuvo: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macro “{name}” ejecutada ({steps} paso)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macro “{name}” ejecutada ({steps} pasos)",
|
||||
"Average" => "Promedio",
|
||||
"Count" => "Recuento",
|
||||
"Sum" => "Suma",
|
||||
"Goal Seeking found a solution: {value}" => "Buscar objetivo encontró una solución: {value}",
|
||||
"Sheets: {sheets}" => "Hojas: {sheets}",
|
||||
"Hidden: {sheets}" => "Ocultas: {sheets}",
|
||||
"Double superscript" => "Superíndice doble",
|
||||
"Double subscript" => "Subíndice doble",
|
||||
"Extra }" => "} sobrante",
|
||||
"Unexpected end of input in a macro argument" => "Fin inesperado de la entrada en un argumento de macro",
|
||||
"Expected \\right after \\left" => "Se esperaba \\right después de \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle debe estar entre \\left y \\right",
|
||||
"Invalid environment name" => "Nombre de entorno no válido",
|
||||
"Expected \\end after environment body" => "Se esperaba \\end después del cuerpo del entorno",
|
||||
"Expected URL" => "Se esperaba una URL",
|
||||
"\\tag requires an argument" => "\\tag requiere un argumento",
|
||||
"only one infix operator per group" => "Solo un operador infijo por grupo",
|
||||
"Expected color token" => "Se esperaba un color",
|
||||
"Expected size for \\raisebox" => "Se esperaba un tamaño para \\raisebox",
|
||||
"Expected size for \\rule width" => "Se esperaba un tamaño para el ancho de \\rule",
|
||||
"Expected size for \\rule height" => "Se esperaba un tamaño para el alto de \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "No se pueden usar \\tag y \\nonumber en la misma fila",
|
||||
"Multiple \\tag in a row" => "Varios \\tag en una fila",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag debe ir al final de la fila, después del cuerpo de la ecuación",
|
||||
"Multiple \\nonumber in a row" => "Varios \\nonumber en una fila",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber debe ir al final de la fila",
|
||||
"Too many tab characters: &" => "Demasiados caracteres de tabulación: &",
|
||||
"Invalid column alignment for array" => "Alineación de columna no válida para array",
|
||||
"Expected column alignment character" => "Se esperaba un carácter de alineación de columna",
|
||||
"Expected l or c or r" => "Se esperaba l, c o r",
|
||||
"Expected ]" => "Se esperaba ]",
|
||||
"Unexpected end of CD row after @" => "Fin inesperado de la fila CD después de @",
|
||||
"Invalid column alignment for subarray" => "Alineación de columna no válida para subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} solo puede contener una columna",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree tiene un \\LeftLabel o \\RightLabel sin un comando de inferencia a continuación"
|
||||
}
|
||||
"Recursion limit exceeded" => "Se superó el límite de recursión",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Demasiadas expansiones de macros: bucle infinito o ajuste maxExpand demasiado bajo"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Se esperaba un estilo sin formato para \\htmlStyle",
|
||||
"\\verb assertion failed" => "Falló la comprobación de \\verb",
|
||||
"Undefined control sequence: {name}" => "Secuencia de control no definida: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Se esperaba '{expected}', se encontró '{got}'",
|
||||
"Expected group after '{symbol}'" => "Se esperaba un grupo después de '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Se esperaba un delimitador como argumento de '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Se esperaba un grupo como argumento de '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Función '{function}' sin argumentos usada como superíndice",
|
||||
"Got function '{function}' with no arguments as subscript" => "Función '{function}' sin argumentos usada como subíndice",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Función '{function}' sin argumentos usada como argumento de '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Función '{function}' sin argumentos usada como \\tag",
|
||||
"Can't use function '{function}' in text mode" => "No se puede usar la función '{function}' en modo texto",
|
||||
"Can't use function '{function}' in math mode" => "No se puede usar la función '{function}' en modo matemático",
|
||||
"Invalid color: '{color}'" => "Color no válido: '{color}'",
|
||||
"Invalid size: '{size}'" => "Tamaño no válido: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Unidad no válida: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Delimitador '{delimiter}' no válido después de '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Tipo de delimitador '{type}' no válido después de '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Tipo de delimitador '{type}' no válido",
|
||||
"No such environment: {name}" => "Entorno desconocido: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Se esperaba un argumento para \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "No coinciden: \\begin{{begin}} cerrado con \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} solo es válido dentro de un entorno array",
|
||||
"Mismatched {command}" => "{command} sin pareja",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Se esperaba &, \\\\, \\cr o \\end, se encontró '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Alineación de columna desconocida: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Demasiadas fórmulas en una fila: se esperaban {expected}, hay {got}",
|
||||
"Unknown CD directive: @{directive}" => "Directiva CD desconocida: @{directive}",
|
||||
"Expected argument for {command}" => "Se esperaba un argumento para {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => "{command} necesita {count} premisa(s), pero solo hay {available}",
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} solo es válido como comando bussproofs admitido dentro de prooftree"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree terminó con {count} elemento(s) en la pila de prueba; se esperaba 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char tiene un argumento no numérico {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char con un punto de código no válido {code}",
|
||||
"Invalid environment name character: {character}" => "Carácter no válido en el nombre del entorno: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -486,116 +486,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Afficher",
|
||||
"Collapse dialog" => "Réduire la boîte de dialogue",
|
||||
"Expand dialog" => "Développer la boîte de dialogue",
|
||||
"Numerical Count" => "Nombre de valeurs numériques",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maximum",
|
||||
"Circular References: {cell}" => "Références circulaires : {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Largeur : {chars} ({pixels} pixels)",
|
||||
"Height: {points} ({pixels} pixels)" => "Hauteur : {points} ({pixels} pixels)",
|
||||
"Picture in cell" => "Image dans la cellule",
|
||||
"Picture: {alt}" => "Image : {alt}",
|
||||
"Format Control: {name}" => "Format de contrôle : {name}",
|
||||
"Error at character {position}: {message}" => "Erreur au caractère {position} : {message}",
|
||||
"Macro definitions are not supported in equations." => "Les définitions de macros ne sont pas prises en charge dans les équations.",
|
||||
"A % can't be combined with a link in an equation." => "Un % ne peut pas être combiné avec un lien dans une équation.",
|
||||
"Equations can nest at most 32 levels deep." => "Les équations peuvent comporter au plus 32 niveaux d’imbrication.",
|
||||
"An equation can be at most 4096 bytes long." => "Une équation peut contenir au plus 4096 octets.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Une équation peut contenir au plus 2500 cellules de matrice (lignes multipliées par la ligne la plus large)."
|
||||
}
|
||||
"This equation is too large to draw." => "Cette équation est trop grande pour être dessinée.",
|
||||
"This equation could not be laid out." => "Impossible de mettre en page cette équation.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macro « {name} » enregistrée ({steps} étape)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macro « {name} » enregistrée ({steps} étapes)",
|
||||
"without {key}: another macro took it while recording" => "sans {key} : une autre macro l’a pris pendant l’enregistrement",
|
||||
"Recording stopped" => "Enregistrement arrêté",
|
||||
"Macro “{name}” stopped: {message}" => "Macro « {name} » arrêtée : {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macro « {name} » exécutée ({steps} étape)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macro « {name} » exécutée ({steps} étapes)",
|
||||
"Average" => "Moyenne",
|
||||
"Count" => "Nombre",
|
||||
"Sum" => "Somme",
|
||||
"Goal Seeking found a solution: {value}" => "Valeur cible a trouvé une solution : {value}",
|
||||
"Sheets: {sheets}" => "Feuilles : {sheets}",
|
||||
"Hidden: {sheets}" => "Masquées : {sheets}",
|
||||
"Double superscript" => "Exposant double",
|
||||
"Double subscript" => "Indice double",
|
||||
"Extra }" => "} en trop",
|
||||
"Unexpected end of input in a macro argument" => "Fin inattendue de l'entrée dans un argument de macro",
|
||||
"Expected \\right after \\left" => "\\right attendu après \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle doit se trouver entre \\left et \\right",
|
||||
"Invalid environment name" => "Nom d'environnement non valide",
|
||||
"Expected \\end after environment body" => "\\end attendu après le corps de l'environnement",
|
||||
"Expected URL" => "URL attendue",
|
||||
"\\tag requires an argument" => "\\tag nécessite un argument",
|
||||
"only one infix operator per group" => "Un seul opérateur infixe par groupe",
|
||||
"Expected color token" => "Couleur attendue",
|
||||
"Expected size for \\raisebox" => "Taille attendue pour \\raisebox",
|
||||
"Expected size for \\rule width" => "Taille attendue pour la largeur de \\rule",
|
||||
"Expected size for \\rule height" => "Taille attendue pour la hauteur de \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag et \\nonumber ne peuvent pas figurer dans la même ligne",
|
||||
"Multiple \\tag in a row" => "Plusieurs \\tag dans une ligne",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag doit figurer à la fin de la ligne, après le corps de l'équation",
|
||||
"Multiple \\nonumber in a row" => "Plusieurs \\nonumber dans une ligne",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber doit figurer à la fin de la ligne",
|
||||
"Too many tab characters: &" => "Trop de caractères de tabulation : &",
|
||||
"Invalid column alignment for array" => "Alignement de colonne non valide pour array",
|
||||
"Expected column alignment character" => "Caractère d'alignement de colonne attendu",
|
||||
"Expected l or c or r" => "l, c ou r attendu",
|
||||
"Expected ]" => "] attendu",
|
||||
"Unexpected end of CD row after @" => "Fin inattendue de la ligne CD après @",
|
||||
"Invalid column alignment for subarray" => "Alignement de colonne non valide pour subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} ne peut contenir qu'une seule colonne",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree contient un \\LeftLabel ou \\RightLabel sans commande d'inférence qui le suit"
|
||||
}
|
||||
"Recursion limit exceeded" => "Limite de récursion dépassée",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Trop d'expansions de macros : boucle infinie ou paramètre maxExpand trop bas"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Style brut attendu pour \\htmlStyle",
|
||||
"\\verb assertion failed" => "Échec de la vérification de \\verb",
|
||||
"Undefined control sequence: {name}" => "Séquence de contrôle non définie : {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' attendu, '{got}' trouvé",
|
||||
"Expected group after '{symbol}'" => "Groupe attendu après '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Délimiteur attendu comme argument de '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Groupe attendu comme argument de '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Fonction '{function}' sans arguments utilisée comme exposant",
|
||||
"Got function '{function}' with no arguments as subscript" => "Fonction '{function}' sans arguments utilisée comme indice",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Fonction '{function}' sans arguments utilisée comme argument de '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Fonction '{function}' sans arguments utilisée comme \\tag",
|
||||
"Can't use function '{function}' in text mode" => "La fonction '{function}' n'est pas utilisable en mode texte",
|
||||
"Can't use function '{function}' in math mode" => "La fonction '{function}' n'est pas utilisable en mode mathématique",
|
||||
"Invalid color: '{color}'" => "Couleur non valide : '{color}'",
|
||||
"Invalid size: '{size}'" => "Taille non valide : '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Unité non valide : '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Délimiteur '{delimiter}' non valide après '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Type de délimiteur '{type}' non valide après '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Type de délimiteur '{type}' non valide",
|
||||
"No such environment: {name}" => "Environnement inconnu : {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Argument attendu pour \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Non-correspondance : \\begin{{begin}} fermé par \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} n'est valide que dans un environnement array",
|
||||
"Mismatched {command}" => "{command} sans correspondance",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr ou \\end attendu, '{got}' trouvé",
|
||||
"Unknown column alignment: {alignment}" => "Alignement de colonne inconnu : {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Trop de formules dans une ligne : {expected} attendues, {got} trouvées",
|
||||
"Unknown CD directive: @{directive}" => "Directive CD inconnue : @{directive}",
|
||||
"Expected argument for {command}" => "Argument attendu pour {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} nécessite {count} prémisse(s), mais seulement {available} disponible(s)"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} n'est valide dans prooftree que comme commande bussproofs prise en charge"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree s'est terminé avec {count} élément(s) sur la pile de preuve, 1 attendu"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char a un argument non numérique {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char avec un point de code non valide {code}",
|
||||
"Invalid environment name character: {character}" => "Caractère non valide dans le nom d'environnement : {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1021,110 +1021,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Mostra",
|
||||
"Collapse dialog" => "Comprimi finestra di dialogo",
|
||||
"Expand dialog" => "Espandi finestra di dialogo",
|
||||
"Numerical Count" => "Conteggio numeri",
|
||||
"Minimum" => "Minimo",
|
||||
"Maximum" => "Massimo",
|
||||
"Circular References: {cell}" => "Riferimenti circolari: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Larghezza: {chars} ({pixels} pixel)",
|
||||
"Height: {points} ({pixels} pixels)" => "Altezza: {points} ({pixels} pixel)",
|
||||
"Picture in cell" => "Immagine nella cella",
|
||||
"Picture: {alt}" => "Immagine: {alt}",
|
||||
"Format Control: {name}" => "Formato controllo: {name}",
|
||||
"Error at character {position}: {message}" => "Errore al carattere {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Le definizioni di macro non sono supportate nelle equazioni.",
|
||||
"A % can't be combined with a link in an equation." => "Un % non può essere combinato con un collegamento in un'equazione.",
|
||||
"Equations can nest at most 32 levels deep." => "Le equazioni possono essere annidate al massimo su 32 livelli.",
|
||||
"An equation can be at most 4096 bytes long." => "Un'equazione può essere lunga al massimo 4096 byte.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Un'equazione può avere al massimo 2500 celle di matrice (righe per la riga più larga)."
|
||||
}
|
||||
"This equation is too large to draw." => "Questa equazione è troppo grande per essere disegnata.",
|
||||
"This equation could not be laid out." => "Impossibile impaginare questa equazione.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macro “{name}” salvata ({steps} passaggio)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macro “{name}” salvata ({steps} passaggi)",
|
||||
"without {key}: another macro took it while recording" => "senza {key}: un’altra macro l’ha preso durante la registrazione",
|
||||
"Recording stopped" => "Registrazione interrotta",
|
||||
"Macro “{name}” stopped: {message}" => "Macro “{name}” interrotta: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macro “{name}” eseguita ({steps} passaggio)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macro “{name}” eseguita ({steps} passaggi)",
|
||||
"Double superscript" => "Apice doppio",
|
||||
"Double subscript" => "Pedice doppio",
|
||||
"Extra }" => "} in eccesso",
|
||||
"Unexpected end of input in a macro argument" => "Fine imprevista dell'input in un argomento di macro",
|
||||
"Expected \\right after \\left" => "Previsto \\right dopo \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle deve trovarsi tra \\left e \\right",
|
||||
"Invalid environment name" => "Nome di ambiente non valido",
|
||||
"Expected \\end after environment body" => "Previsto \\end dopo il corpo dell'ambiente",
|
||||
"Expected URL" => "Previsto un URL",
|
||||
"\\tag requires an argument" => "\\tag richiede un argomento",
|
||||
"only one infix operator per group" => "Un solo operatore infisso per gruppo",
|
||||
"Expected color token" => "Previsto un colore",
|
||||
"Expected size for \\raisebox" => "Prevista una dimensione per \\raisebox",
|
||||
"Expected size for \\rule width" => "Prevista una dimensione per la larghezza di \\rule",
|
||||
"Expected size for \\rule height" => "Prevista una dimensione per l'altezza di \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Non si possono usare \\tag e \\nonumber nella stessa riga",
|
||||
"Multiple \\tag in a row" => "Più \\tag in una riga",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag deve trovarsi alla fine della riga, dopo il corpo dell'equazione",
|
||||
"Multiple \\nonumber in a row" => "Più \\nonumber in una riga",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber deve trovarsi alla fine della riga",
|
||||
"Too many tab characters: &" => "Troppi caratteri di tabulazione: &",
|
||||
"Invalid column alignment for array" => "Allineamento di colonna non valido per array",
|
||||
"Expected column alignment character" => "Previsto un carattere di allineamento di colonna",
|
||||
"Expected l or c or r" => "Previsto l, c o r",
|
||||
"Expected ]" => "Prevista ]",
|
||||
"Unexpected end of CD row after @" => "Fine imprevista della riga CD dopo @",
|
||||
"Invalid column alignment for subarray" => "Allineamento di colonna non valido per subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} può contenere una sola colonna",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree ha un \\LeftLabel o \\RightLabel senza un comando di inferenza successivo"
|
||||
}
|
||||
"Recursion limit exceeded" => "Limite di ricorsione superato",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Troppe espansioni di macro: ciclo infinito o impostazione maxExpand troppo bassa"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Previsto uno stile grezzo per \\htmlStyle",
|
||||
"\\verb assertion failed" => "Verifica di \\verb non riuscita",
|
||||
"Undefined control sequence: {name}" => "Sequenza di controllo non definita: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Previsto '{expected}', trovato '{got}'",
|
||||
"Expected group after '{symbol}'" => "Previsto un gruppo dopo '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Previsto un delimitatore come argomento di '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Previsto un gruppo come argomento di '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funzione '{function}' senza argomenti usata come apice",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funzione '{function}' senza argomenti usata come pedice",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Funzione '{function}' senza argomenti usata come argomento di '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funzione '{function}' senza argomenti usata come \\tag",
|
||||
"Can't use function '{function}' in text mode" => "La funzione '{function}' non si può usare in modalità testo",
|
||||
"Can't use function '{function}' in math mode" => "La funzione '{function}' non si può usare in modalità matematica",
|
||||
"Invalid color: '{color}'" => "Colore non valido: '{color}'",
|
||||
"Invalid size: '{size}'" => "Dimensione non valida: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Unità non valida: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Delimitatore '{delimiter}' non valido dopo '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Tipo di delimitatore '{type}' non valido dopo '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Tipo di delimitatore '{type}' non valido",
|
||||
"No such environment: {name}" => "Ambiente sconosciuto: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Previsto un argomento per \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Mancata corrispondenza: \\begin{{begin}} chiuso da \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} è valido solo in un ambiente array",
|
||||
"Mismatched {command}" => "{command} senza corrispondenza",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Previsto &, \\\\, \\cr o \\end, trovato '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Allineamento di colonna sconosciuto: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Troppe formule in una riga: previste {expected}, trovate {got}",
|
||||
"Unknown CD directive: @{directive}" => "Direttiva CD sconosciuta: @{directive}",
|
||||
"Expected argument for {command}" => "Previsto un argomento per {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} richiede {count} premessa/e, ma ne sono disponibili solo {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} è valido solo come comando bussproofs supportato in prooftree"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree è terminato con {count} elemento/i nella pila di dimostrazione, previsto 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char ha un argomento non numerico {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char con punto di codice non valido {code}",
|
||||
"Invalid environment name character: {character}" => "Carattere non valido nel nome dell'ambiente: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1021,105 +1021,6 @@ pub(super) const DIALOGS: &[(&str, &str)] = &[
|
||||
("Unprotect Sheet…", "シート保護の解除…"),
|
||||
("Collapse dialog", "ダイアログを折りたたむ"),
|
||||
("Expand dialog", "ダイアログを展開する"),
|
||||
("Numerical Count", "数値の個数"),
|
||||
("Minimum", "最小値"),
|
||||
("Maximum", "最大値"),
|
||||
("Circular References: {cell}", "循環参照: {cell}"),
|
||||
("Width: {chars} ({pixels} pixels)", "幅: {chars} ({pixels} ピクセル)"),
|
||||
("Height: {points} ({pixels} pixels)", "高さ: {points} ({pixels} ピクセル)"),
|
||||
("Picture in cell", "セル内の画像"),
|
||||
("Picture: {alt}", "画像: {alt}"),
|
||||
("Format Control: {name}", "コントロールの書式設定: {name}"),
|
||||
("Error at character {position}: {message}", "{position} 文字目でエラー: {message}"),
|
||||
("Macro definitions are not supported in equations.", "数式ではマクロ定義はサポートされていません。"),
|
||||
("A % can't be combined with a link in an equation.", "数式では % とリンクを組み合わせることはできません。"),
|
||||
("Equations can nest at most 32 levels deep.", "数式の入れ子は 32 レベルまでです。"),
|
||||
("An equation can be at most 4096 bytes long.", "数式の長さは 4096 バイトまでです。"),
|
||||
("An equation can have at most 2500 matrix cells (rows times the widest row).", "数式の行列セルは 2500 個まで (行数 × 最も長い行) です。"),
|
||||
("This equation is too large to draw.", "この数式は大きすぎて描画できません。"),
|
||||
("This equation could not be laid out.", "この数式をレイアウトできませんでした。"),
|
||||
("Saved macro “{name}” ({steps} step)", "マクロ「{name}」を保存しました ({steps} ステップ)"),
|
||||
("Saved macro “{name}” ({steps} steps)", "マクロ「{name}」を保存しました ({steps} ステップ)"),
|
||||
("without {key}: another macro took it while recording", "{key} なし: 記録中に別のマクロに割り当てられました"),
|
||||
("Recording stopped", "記録を終了しました"),
|
||||
("Macro “{name}” stopped: {message}", "マクロ「{name}」が停止しました: {message}"),
|
||||
("Ran macro “{name}” ({steps} step)", "マクロ「{name}」を実行しました ({steps} ステップ)"),
|
||||
("Ran macro “{name}” ({steps} steps)", "マクロ「{name}」を実行しました ({steps} ステップ)"),
|
||||
("Double superscript", "上付き文字が重複しています"),
|
||||
("Double subscript", "下付き文字が重複しています"),
|
||||
("Extra }", "余分な } があります"),
|
||||
("Unexpected end of input in a macro argument", "マクロ引数の途中で入力が終了しました"),
|
||||
("Expected \\right after \\left", "\\left の後に \\right が必要です"),
|
||||
("\\middle must be within \\left and \\right", "\\middle は \\left と \\right の間に置く必要があります"),
|
||||
("Invalid environment name", "環境名が無効です"),
|
||||
("Expected \\end after environment body", "環境の本体の後に \\end が必要です"),
|
||||
("Expected URL", "URL が必要です"),
|
||||
("\\tag requires an argument", "\\tag には引数が必要です"),
|
||||
("only one infix operator per group", "中置演算子はグループごとに 1 つだけです"),
|
||||
("Expected color token", "色の指定が必要です"),
|
||||
("Expected size for \\raisebox", "\\raisebox にはサイズが必要です"),
|
||||
("Expected size for \\rule width", "\\rule の幅にはサイズが必要です"),
|
||||
("Expected size for \\rule height", "\\rule の高さにはサイズが必要です"),
|
||||
("Cannot use both \\tag and \\nonumber in the same row", "同じ行で \\tag と \\nonumber は併用できません"),
|
||||
("Multiple \\tag in a row", "1 行に \\tag が複数あります"),
|
||||
("\\tag must appear at the end of the row after the equation body", "\\tag は行の末尾、数式の本体の後に置く必要があります"),
|
||||
("Multiple \\nonumber in a row", "1 行に \\nonumber が複数あります"),
|
||||
("\\nonumber must appear at the end of the row", "\\nonumber は行の末尾に置く必要があります"),
|
||||
("Too many tab characters: &", "タブ文字が多すぎます: &"),
|
||||
("Invalid column alignment for array", "array の列の配置が無効です"),
|
||||
("Expected column alignment character", "列の配置文字が必要です"),
|
||||
("Expected l or c or r", "l、c、r のいずれかが必要です"),
|
||||
("Expected ]", "] が必要です"),
|
||||
("Unexpected end of CD row after @", "@ の後で CD の行が終了しました"),
|
||||
("Invalid column alignment for subarray", "subarray の列の配置が無効です"),
|
||||
("{subarray} can contain only one column", "{subarray} に含められる列は 1 つだけです"),
|
||||
(
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command",
|
||||
"prooftree に、後に推論コマンドのない \\LeftLabel または \\RightLabel があります",
|
||||
),
|
||||
("Recursion limit exceeded", "再帰の上限を超えました"),
|
||||
(
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting",
|
||||
"マクロの展開が多すぎます: 無限ループか、maxExpand の設定が小さすぎます",
|
||||
),
|
||||
("Expected raw style for \\htmlStyle", "\\htmlStyle には生のスタイルが必要です"),
|
||||
("\\verb assertion failed", "\\verb のチェックに失敗しました"),
|
||||
("Undefined control sequence: {name}", "未定義の制御シーケンス: {name}"),
|
||||
("Expected '{expected}', got '{got}'", "'{expected}' が必要ですが、'{got}' がありました"),
|
||||
("Expected group after '{symbol}'", "'{symbol}' の後にグループが必要です"),
|
||||
("Expected delimiter as argument to '{function}'", "'{function}' の引数として区切り記号が必要です"),
|
||||
("Expected group as argument to '{function}'", "'{function}' の引数としてグループが必要です"),
|
||||
("Got function '{function}' with no arguments as superscript", "引数のない関数 '{function}' が上付き文字として使われています"),
|
||||
("Got function '{function}' with no arguments as subscript", "引数のない関数 '{function}' が下付き文字として使われています"),
|
||||
("Got function '{function}' with no arguments as argument to '{parent}'", "引数のない関数 '{function}' が '{parent}' の引数として使われています"),
|
||||
("Got function '{function}' with no arguments as \\tag", "引数のない関数 '{function}' が \\tag として使われています"),
|
||||
("Can't use function '{function}' in text mode", "関数 '{function}' はテキスト モードでは使用できません"),
|
||||
("Can't use function '{function}' in math mode", "関数 '{function}' は数式モードでは使用できません"),
|
||||
("Invalid color: '{color}'", "無効な色: '{color}'"),
|
||||
("Invalid size: '{size}'", "無効なサイズ: '{size}'"),
|
||||
("Invalid unit: '{unit}'", "無効な単位: '{unit}'"),
|
||||
("Invalid delimiter '{delimiter}' after '{function}'", "'{function}' の後の区切り記号 '{delimiter}' が無効です"),
|
||||
("Invalid delimiter type '{type}' after '{function}'", "'{function}' の後の区切り記号の種類 '{type}' が無効です"),
|
||||
("Invalid delimiter type '{type}'", "区切り記号の種類 '{type}' が無効です"),
|
||||
("No such environment: {name}", "不明な環境: {name}"),
|
||||
("Expected argument to \\begin{{name}}", "\\begin{{name}} には引数が必要です"),
|
||||
("Mismatch: \\begin{{begin}} matched by \\end{{end}}", "対応していません: \\begin{{begin}} が \\end{{end}} で閉じられています"),
|
||||
("{command} valid only within array environment", "{command} は array 環境の中でのみ有効です"),
|
||||
("Mismatched {command}", "{command} に対応するものがありません"),
|
||||
("Expected & or \\\\ or \\cr or \\end, got '{got}'", "&、\\\\、\\cr、\\end のいずれかが必要ですが、'{got}' がありました"),
|
||||
("Unknown column alignment: {alignment}", "不明な列の配置: {alignment}"),
|
||||
("Too many math in a row: expected {expected}, but got {got}", "1 行の数式が多すぎます: {expected} 個のはずが {got} 個あります"),
|
||||
("Unknown CD directive: @{directive}", "不明な CD ディレクティブ: @{directive}"),
|
||||
("Expected argument for {command}", "{command} には引数が必要です"),
|
||||
("{command} needs {count} premise(s), but only {available} available", "{command} には前提が {count} 個必要ですが、{available} 個しかありません"),
|
||||
(
|
||||
"{command} valid only as a supported bussproofs command within prooftree",
|
||||
"{command} は prooftree の中でサポートされている bussproofs コマンドとしてのみ有効です",
|
||||
),
|
||||
("prooftree ended with {count} proof stack item(s), expected 1", "prooftree が証明スタックに {count} 個の項目を残して終了しました (1 個のはず)"),
|
||||
("\\@char has non-numeric argument {argument}", "\\@char の引数 {argument} が数値ではありません"),
|
||||
("\\@char with invalid code point {code}", "\\@char のコード ポイント {code} が無効です"),
|
||||
("Invalid environment name character: {character}", "環境名に無効な文字があります: {character}"),
|
||||
];
|
||||
|
||||
/// Labels of the ribbon menus, pop-ups and palettes that the reference catalog does not cover (the
|
||||
|
||||
@@ -490,112 +490,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "표시",
|
||||
"Collapse dialog" => "대화 상자 축소",
|
||||
"Expand dialog" => "대화 상자 확장",
|
||||
"Numerical Count" => "숫자 셀 수",
|
||||
"Minimum" => "최소값",
|
||||
"Maximum" => "최대값",
|
||||
"Circular References: {cell}" => "순환 참조: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "너비: {chars} ({pixels} 픽셀)",
|
||||
"Height: {points} ({pixels} pixels)" => "높이: {points} ({pixels} 픽셀)",
|
||||
"Picture in cell" => "셀 안의 그림",
|
||||
"Picture: {alt}" => "그림: {alt}",
|
||||
"Format Control: {name}" => "컨트롤 서식: {name}",
|
||||
"Error at character {position}: {message}" => "{position}번째 문자에서 오류: {message}",
|
||||
"Macro definitions are not supported in equations." => "수식에서는 매크로 정의가 지원되지 않습니다.",
|
||||
"A % can't be combined with a link in an equation." => "수식에서 %를 링크와 함께 사용할 수 없습니다.",
|
||||
"Equations can nest at most 32 levels deep." => "수식은 최대 32단계까지 중첩할 수 있습니다.",
|
||||
"An equation can be at most 4096 bytes long." => "수식은 최대 4096바이트까지 입력할 수 있습니다.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"수식에는 최대 2500개의 행렬 셀(행 수 × 가장 넓은 행)을 넣을 수 있습니다."
|
||||
}
|
||||
"This equation is too large to draw." => "이 수식은 너무 커서 그릴 수 없습니다.",
|
||||
"This equation could not be laid out." => "이 수식을 배치할 수 없습니다.",
|
||||
"Saved macro “{name}” ({steps} step)" => "매크로 '{name}'을(를) 저장했습니다({steps}단계)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "매크로 '{name}'을(를) 저장했습니다({steps}단계)",
|
||||
"without {key}: another macro took it while recording" => "{key} 없음: 기록 중에 다른 매크로가 사용했습니다",
|
||||
"Recording stopped" => "기록이 중지되었습니다",
|
||||
"Macro “{name}” stopped: {message}" => "매크로 '{name}'이(가) 중지되었습니다: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "매크로 '{name}'을(를) 실행했습니다({steps}단계)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "매크로 '{name}'을(를) 실행했습니다({steps}단계)",
|
||||
"Average" => "평균",
|
||||
"Count" => "개수",
|
||||
"Sum" => "합계",
|
||||
"Goal Seeking found a solution: {value}" => "목표값 찾기에서 해를 찾았습니다: {value}",
|
||||
"Sheets: {sheets}" => "시트: {sheets}",
|
||||
"Hidden: {sheets}" => "숨김: {sheets}",
|
||||
"Double superscript" => "위 첨자가 중복되었습니다",
|
||||
"Double subscript" => "아래 첨자가 중복되었습니다",
|
||||
"Extra }" => "불필요한 } 이(가) 있습니다",
|
||||
"Unexpected end of input in a macro argument" => "매크로 인수 안에서 입력이 끝났습니다",
|
||||
"Expected \\right after \\left" => "\\left 뒤에 \\right 가 필요합니다",
|
||||
"\\middle must be within \\left and \\right" => "\\middle 은 \\left 와 \\right 사이에 있어야 합니다",
|
||||
"Invalid environment name" => "환경 이름이 잘못되었습니다",
|
||||
"Expected \\end after environment body" => "환경 본문 뒤에 \\end 가 필요합니다",
|
||||
"Expected URL" => "URL이 필요합니다",
|
||||
"\\tag requires an argument" => "\\tag 에는 인수가 필요합니다",
|
||||
"only one infix operator per group" => "그룹당 중위 연산자는 하나만 사용할 수 있습니다",
|
||||
"Expected color token" => "색이 필요합니다",
|
||||
"Expected size for \\raisebox" => "\\raisebox 에는 크기가 필요합니다",
|
||||
"Expected size for \\rule width" => "\\rule 너비에는 크기가 필요합니다",
|
||||
"Expected size for \\rule height" => "\\rule 높이에는 크기가 필요합니다",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "같은 행에서 \\tag 와 \\nonumber 를 함께 사용할 수 없습니다",
|
||||
"Multiple \\tag in a row" => "한 행에 \\tag 가 여러 개 있습니다",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag 는 행 끝, 수식 본문 뒤에 있어야 합니다",
|
||||
"Multiple \\nonumber in a row" => "한 행에 \\nonumber 가 여러 개 있습니다",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber 는 행 끝에 있어야 합니다",
|
||||
"Too many tab characters: &" => "탭 문자가 너무 많습니다: &",
|
||||
"Invalid column alignment for array" => "array 의 열 맞춤이 잘못되었습니다",
|
||||
"Expected column alignment character" => "열 맞춤 문자가 필요합니다",
|
||||
"Expected l or c or r" => "l, c 또는 r 이 필요합니다",
|
||||
"Expected ]" => "] 이(가) 필요합니다",
|
||||
"Unexpected end of CD row after @" => "@ 뒤에서 CD 행이 끝났습니다",
|
||||
"Invalid column alignment for subarray" => "subarray 의 열 맞춤이 잘못되었습니다",
|
||||
"{subarray} can contain only one column" => "{subarray} 에는 열을 하나만 넣을 수 있습니다",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree 에 뒤따르는 추론 명령이 없는 \\LeftLabel 또는 \\RightLabel 이 있습니다"
|
||||
}
|
||||
"Recursion limit exceeded" => "재귀 한도를 초과했습니다",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"매크로 확장이 너무 많습니다: 무한 루프이거나 maxExpand 설정이 너무 작습니다"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "\\htmlStyle 에는 원시 스타일이 필요합니다",
|
||||
"\\verb assertion failed" => "\\verb 검사에 실패했습니다",
|
||||
"Undefined control sequence: {name}" => "정의되지 않은 제어 시퀀스: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' 이(가) 필요하지만 '{got}' 이(가) 있습니다",
|
||||
"Expected group after '{symbol}'" => "'{symbol}' 뒤에 그룹이 필요합니다",
|
||||
"Expected delimiter as argument to '{function}'" => "'{function}' 의 인수로 구분 기호가 필요합니다",
|
||||
"Expected group as argument to '{function}'" => "'{function}' 의 인수로 그룹이 필요합니다",
|
||||
"Got function '{function}' with no arguments as superscript" => "인수 없는 함수 '{function}' 이(가) 위 첨자로 사용되었습니다",
|
||||
"Got function '{function}' with no arguments as subscript" => "인수 없는 함수 '{function}' 이(가) 아래 첨자로 사용되었습니다",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"인수 없는 함수 '{function}' 이(가) '{parent}' 의 인수로 사용되었습니다"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "인수 없는 함수 '{function}' 이(가) \\tag 로 사용되었습니다",
|
||||
"Can't use function '{function}' in text mode" => "함수 '{function}' 은(는) 텍스트 모드에서 사용할 수 없습니다",
|
||||
"Can't use function '{function}' in math mode" => "함수 '{function}' 은(는) 수식 모드에서 사용할 수 없습니다",
|
||||
"Invalid color: '{color}'" => "잘못된 색: '{color}'",
|
||||
"Invalid size: '{size}'" => "잘못된 크기: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "잘못된 단위: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "'{function}' 뒤의 구분 기호 '{delimiter}' 이(가) 잘못되었습니다",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "'{function}' 뒤의 구분 기호 유형 '{type}' 이(가) 잘못되었습니다",
|
||||
"Invalid delimiter type '{type}'" => "구분 기호 유형 '{type}' 이(가) 잘못되었습니다",
|
||||
"No such environment: {name}" => "알 수 없는 환경: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "\\begin{{name}} 에는 인수가 필요합니다",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "일치하지 않음: \\begin{{begin}} 이(가) \\end{{end}} 로 닫혔습니다",
|
||||
"{command} valid only within array environment" => "{command} 은(는) array 환경 안에서만 사용할 수 있습니다",
|
||||
"Mismatched {command}" => "짝이 없는 {command}",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr 또는 \\end 이(가) 필요하지만 '{got}' 이(가) 있습니다",
|
||||
"Unknown column alignment: {alignment}" => "알 수 없는 열 맞춤: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "한 행의 수식이 너무 많습니다: {expected}개여야 하지만 {got}개입니다",
|
||||
"Unknown CD directive: @{directive}" => "알 수 없는 CD 지시문: @{directive}",
|
||||
"Expected argument for {command}" => "{command} 에는 인수가 필요합니다",
|
||||
"{command} needs {count} premise(s), but only {available} available" => "{command} 에는 전제가 {count}개 필요하지만 {available}개만 있습니다",
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} 은(는) prooftree 안에서 지원되는 bussproofs 명령으로만 사용할 수 있습니다"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree 가 증명 스택에 항목 {count}개를 남기고 끝났습니다 (1개여야 함)",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char 의 인수 {argument} 이(가) 숫자가 아닙니다",
|
||||
"\\@char with invalid code point {code}" => "\\@char 의 코드 포인트 {code} 이(가) 잘못되었습니다",
|
||||
"Invalid environment name character: {character}" => "환경 이름에 잘못된 문자가 있습니다: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -561,114 +561,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Weergeven",
|
||||
"Collapse dialog" => "Dialoogvenster samenvouwen",
|
||||
"Expand dialog" => "Dialoogvenster uitvouwen",
|
||||
"Numerical Count" => "Numerieke telling",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maximum",
|
||||
"Circular References: {cell}" => "Kringverwijzingen: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Breedte: {chars} ({pixels} pixels)",
|
||||
"Height: {points} ({pixels} pixels)" => "Hoogte: {points} ({pixels} pixels)",
|
||||
"Picture in cell" => "Afbeelding in cel",
|
||||
"Picture: {alt}" => "Afbeelding: {alt}",
|
||||
"Format Control: {name}" => "Besturingselement opmaken: {name}",
|
||||
"Error at character {position}: {message}" => "Fout bij teken {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Macrodefinities worden niet ondersteund in vergelijkingen.",
|
||||
"A % can't be combined with a link in an equation." => "Een % kan niet worden gecombineerd met een koppeling in een vergelijking.",
|
||||
"Equations can nest at most 32 levels deep." => "Vergelijkingen kunnen maximaal 32 niveaus diep worden genest.",
|
||||
"An equation can be at most 4096 bytes long." => "Een vergelijking kan maximaal 4096 bytes lang zijn.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Een vergelijking kan maximaal 2500 matrixcellen hebben (rijen maal de breedste rij)."
|
||||
}
|
||||
"This equation is too large to draw." => "Deze vergelijking is te groot om te tekenen.",
|
||||
"This equation could not be laid out." => "Deze vergelijking kan niet worden opgemaakt.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macro ‘{name}’ opgeslagen ({steps} stap)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macro ‘{name}’ opgeslagen ({steps} stappen)",
|
||||
"without {key}: another macro took it while recording" => "zonder {key}: een andere macro heeft deze tijdens het opnemen overgenomen",
|
||||
"Recording stopped" => "Opname gestopt",
|
||||
"Macro “{name}” stopped: {message}" => "Macro ‘{name}’ gestopt: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macro ‘{name}’ uitgevoerd ({steps} stap)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macro ‘{name}’ uitgevoerd ({steps} stappen)",
|
||||
"Average" => "Gemiddelde",
|
||||
"Count" => "Aantal",
|
||||
"Sum" => "Som",
|
||||
"Goal Seeking found a solution: {value}" => "Doelzoeken heeft een oplossing gevonden: {value}",
|
||||
"Sheets: {sheets}" => "Bladen: {sheets}",
|
||||
"Hidden: {sheets}" => "Verborgen: {sheets}",
|
||||
"Double superscript" => "Dubbele superscript",
|
||||
"Double subscript" => "Dubbele subscript",
|
||||
"Extra }" => "Overbodige }",
|
||||
"Unexpected end of input in a macro argument" => "Onverwacht einde van de invoer in een macroargument",
|
||||
"Expected \\right after \\left" => "\\right verwacht na \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle moet tussen \\left en \\right staan",
|
||||
"Invalid environment name" => "Ongeldige omgevingsnaam",
|
||||
"Expected \\end after environment body" => "\\end verwacht na de inhoud van de omgeving",
|
||||
"Expected URL" => "URL verwacht",
|
||||
"\\tag requires an argument" => "\\tag vereist een argument",
|
||||
"only one infix operator per group" => "Slechts één infix-operator per groep",
|
||||
"Expected color token" => "Kleur verwacht",
|
||||
"Expected size for \\raisebox" => "Grootte verwacht voor \\raisebox",
|
||||
"Expected size for \\rule width" => "Grootte verwacht voor de breedte van \\rule",
|
||||
"Expected size for \\rule height" => "Grootte verwacht voor de hoogte van \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag en \\nonumber kunnen niet in dezelfde rij staan",
|
||||
"Multiple \\tag in a row" => "Meerdere \\tag in een rij",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag moet aan het einde van de rij na de vergelijking staan",
|
||||
"Multiple \\nonumber in a row" => "Meerdere \\nonumber in een rij",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber moet aan het einde van de rij staan",
|
||||
"Too many tab characters: &" => "Te veel tabtekens: &",
|
||||
"Invalid column alignment for array" => "Ongeldige kolomuitlijning voor array",
|
||||
"Expected column alignment character" => "Teken voor kolomuitlijning verwacht",
|
||||
"Expected l or c or r" => "l, c of r verwacht",
|
||||
"Expected ]" => "] verwacht",
|
||||
"Unexpected end of CD row after @" => "Onverwacht einde van de CD-rij na @",
|
||||
"Invalid column alignment for subarray" => "Ongeldige kolomuitlijning voor subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} kan maar één kolom bevatten",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree heeft een \\LeftLabel of \\RightLabel zonder volgende afleidingsopdracht"
|
||||
}
|
||||
"Recursion limit exceeded" => "Recursielimiet overschreden",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Te veel macro-uitbreidingen: oneindige lus of maxExpand-instelling te laag"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Onbewerkte stijl verwacht voor \\htmlStyle",
|
||||
"\\verb assertion failed" => "Controle van \\verb mislukt",
|
||||
"Undefined control sequence: {name}" => "Onbekende besturingsreeks: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' verwacht, '{got}' gevonden",
|
||||
"Expected group after '{symbol}'" => "Groep verwacht na '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Scheidingsteken verwacht als argument van '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Groep verwacht als argument van '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Functie '{function}' zonder argumenten gebruikt als superscript",
|
||||
"Got function '{function}' with no arguments as subscript" => "Functie '{function}' zonder argumenten gebruikt als subscript",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Functie '{function}' zonder argumenten gebruikt als argument van '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Functie '{function}' zonder argumenten gebruikt als \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Functie '{function}' kan niet in tekstmodus worden gebruikt",
|
||||
"Can't use function '{function}' in math mode" => "Functie '{function}' kan niet in wiskundemodus worden gebruikt",
|
||||
"Invalid color: '{color}'" => "Ongeldige kleur: '{color}'",
|
||||
"Invalid size: '{size}'" => "Ongeldige grootte: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Ongeldige eenheid: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Ongeldig scheidingsteken '{delimiter}' na '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Ongeldig type scheidingsteken '{type}' na '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Ongeldig type scheidingsteken '{type}'",
|
||||
"No such environment: {name}" => "Onbekende omgeving: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Argument verwacht voor \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Komt niet overeen: \\begin{{begin}} afgesloten met \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} is alleen geldig binnen een array-omgeving",
|
||||
"Mismatched {command}" => "{command} zonder tegenhanger",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr of \\end verwacht, '{got}' gevonden",
|
||||
"Unknown column alignment: {alignment}" => "Onbekende kolomuitlijning: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Te veel formules in een rij: {expected} verwacht, {got} gevonden",
|
||||
"Unknown CD directive: @{directive}" => "Onbekende CD-opdracht: @{directive}",
|
||||
"Expected argument for {command}" => "Argument verwacht voor {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} heeft {count} premisse(s) nodig, maar er zijn er maar {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} is in prooftree alleen geldig als ondersteunde bussproofs-opdracht"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree eindigde met {count} item(s) op de bewijsstapel, 1 verwacht",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char heeft een niet-numeriek argument {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char met ongeldig codepunt {code}",
|
||||
"Invalid environment name character: {character}" => "Ongeldig teken in de omgevingsnaam: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1009,110 +1009,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Pokaż",
|
||||
"Collapse dialog" => "Zwiń okno dialogowe",
|
||||
"Expand dialog" => "Rozwiń okno dialogowe",
|
||||
"Numerical Count" => "Liczba wartości liczbowych",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maksimum",
|
||||
"Circular References: {cell}" => "Odwołania cykliczne: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Szerokość: {chars} (pikseli: {pixels})",
|
||||
"Height: {points} ({pixels} pixels)" => "Wysokość: {points} (pikseli: {pixels})",
|
||||
"Picture in cell" => "Obraz w komórce",
|
||||
"Picture: {alt}" => "Obraz: {alt}",
|
||||
"Format Control: {name}" => "Formatuj formant: {name}",
|
||||
"Error at character {position}: {message}" => "Błąd przy znaku {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Definicje makr nie są obsługiwane w równaniach.",
|
||||
"A % can't be combined with a link in an equation." => "Znaku % nie można łączyć z linkiem w równaniu.",
|
||||
"Equations can nest at most 32 levels deep." => "Równania mogą być zagnieżdżone na co najwyżej 32 poziomach.",
|
||||
"An equation can be at most 4096 bytes long." => "Równanie może mieć co najwyżej 4096 bajtów.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Równanie może mieć co najwyżej 2500 komórek macierzy (wiersze razy najszerszy wiersz)."
|
||||
}
|
||||
"This equation is too large to draw." => "To równanie jest za duże, aby je narysować.",
|
||||
"This equation could not be laid out." => "Nie można złożyć tego równania.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Zapisano makro „{name}” ({steps} krok)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Zapisano makro „{name}” (liczba kroków: {steps})",
|
||||
"without {key}: another macro took it while recording" => "bez {key}: inne makro zajęło go podczas nagrywania",
|
||||
"Recording stopped" => "Nagrywanie zatrzymane",
|
||||
"Macro “{name}” stopped: {message}" => "Makro „{name}” zatrzymane: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Uruchomiono makro „{name}” ({steps} krok)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Uruchomiono makro „{name}” (liczba kroków: {steps})",
|
||||
"Double superscript" => "Podwójny indeks górny",
|
||||
"Double subscript" => "Podwójny indeks dolny",
|
||||
"Extra }" => "Nadmiarowy }",
|
||||
"Unexpected end of input in a macro argument" => "Nieoczekiwany koniec danych w argumencie makra",
|
||||
"Expected \\right after \\left" => "Oczekiwano \\right po \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle musi być między \\left a \\right",
|
||||
"Invalid environment name" => "Nieprawidłowa nazwa środowiska",
|
||||
"Expected \\end after environment body" => "Oczekiwano \\end po treści środowiska",
|
||||
"Expected URL" => "Oczekiwano adresu URL",
|
||||
"\\tag requires an argument" => "\\tag wymaga argumentu",
|
||||
"only one infix operator per group" => "Tylko jeden operator wrostkowy na grupę",
|
||||
"Expected color token" => "Oczekiwano koloru",
|
||||
"Expected size for \\raisebox" => "Oczekiwano rozmiaru dla \\raisebox",
|
||||
"Expected size for \\rule width" => "Oczekiwano rozmiaru dla szerokości \\rule",
|
||||
"Expected size for \\rule height" => "Oczekiwano rozmiaru dla wysokości \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Nie można użyć \\tag i \\nonumber w tym samym wierszu",
|
||||
"Multiple \\tag in a row" => "Wiele \\tag w jednym wierszu",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag musi stać na końcu wiersza, po treści równania",
|
||||
"Multiple \\nonumber in a row" => "Wiele \\nonumber w jednym wierszu",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber musi stać na końcu wiersza",
|
||||
"Too many tab characters: &" => "Za dużo znaków tabulacji: &",
|
||||
"Invalid column alignment for array" => "Nieprawidłowe wyrównanie kolumn dla array",
|
||||
"Expected column alignment character" => "Oczekiwano znaku wyrównania kolumny",
|
||||
"Expected l or c or r" => "Oczekiwano l, c lub r",
|
||||
"Expected ]" => "Oczekiwano ]",
|
||||
"Unexpected end of CD row after @" => "Nieoczekiwany koniec wiersza CD po @",
|
||||
"Invalid column alignment for subarray" => "Nieprawidłowe wyrównanie kolumn dla subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} może zawierać tylko jedną kolumnę",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree zawiera \\LeftLabel lub \\RightLabel bez następującego polecenia wnioskowania"
|
||||
}
|
||||
"Recursion limit exceeded" => "Przekroczono limit rekurencji",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Za dużo rozwinięć makr: nieskończona pętla lub zbyt niskie ustawienie maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Oczekiwano surowego stylu dla \\htmlStyle",
|
||||
"\\verb assertion failed" => "Sprawdzenie \\verb nie powiodło się",
|
||||
"Undefined control sequence: {name}" => "Niezdefiniowana sekwencja sterująca: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Oczekiwano '{expected}', napotkano '{got}'",
|
||||
"Expected group after '{symbol}'" => "Oczekiwano grupy po '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Oczekiwano ogranicznika jako argumentu '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Oczekiwano grupy jako argumentu '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funkcja '{function}' bez argumentów użyta jako indeks górny",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funkcja '{function}' bez argumentów użyta jako indeks dolny",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Funkcja '{function}' bez argumentów użyta jako argument '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funkcja '{function}' bez argumentów użyta jako \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Funkcji '{function}' nie można użyć w trybie tekstowym",
|
||||
"Can't use function '{function}' in math mode" => "Funkcji '{function}' nie można użyć w trybie matematycznym",
|
||||
"Invalid color: '{color}'" => "Nieprawidłowy kolor: '{color}'",
|
||||
"Invalid size: '{size}'" => "Nieprawidłowy rozmiar: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Nieprawidłowa jednostka: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Nieprawidłowy ogranicznik '{delimiter}' po '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Nieprawidłowy typ ogranicznika '{type}' po '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Nieprawidłowy typ ogranicznika '{type}'",
|
||||
"No such environment: {name}" => "Nieznane środowisko: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Oczekiwano argumentu dla \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Niezgodność: \\begin{{begin}} zamknięte przez \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} jest dozwolone tylko w środowisku array",
|
||||
"Mismatched {command}" => "{command} bez pary",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Oczekiwano &, \\\\, \\cr lub \\end, napotkano '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Nieznane wyrównanie kolumny: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Za dużo formuł w wierszu: oczekiwano {expected}, jest {got}",
|
||||
"Unknown CD directive: @{directive}" => "Nieznana dyrektywa CD: @{directive}",
|
||||
"Expected argument for {command}" => "Oczekiwano argumentu dla {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} wymaga {count} przesłanek, ale dostępnych jest tylko {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} jest dozwolone w prooftree tylko jako obsługiwane polecenie bussproofs"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree zakończyło się z {count} elementami na stosie dowodu, oczekiwano 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char ma nienumeryczny argument {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char z nieprawidłowym punktem kodowym {code}",
|
||||
"Invalid environment name character: {character}" => "Nieprawidłowy znak w nazwie środowiska: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1027,108 +1027,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Mostrar",
|
||||
"Collapse dialog" => "Recolher caixa de diálogo",
|
||||
"Expand dialog" => "Expandir caixa de diálogo",
|
||||
"Numerical Count" => "Contagem Numérica",
|
||||
"Minimum" => "Mínimo",
|
||||
"Maximum" => "Máximo",
|
||||
"Circular References: {cell}" => "Referências Circulares: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Largura: {chars} ({pixels} pixels)",
|
||||
"Height: {points} ({pixels} pixels)" => "Altura: {points} ({pixels} pixels)",
|
||||
"Picture in cell" => "Imagem na célula",
|
||||
"Picture: {alt}" => "Imagem: {alt}",
|
||||
"Format Control: {name}" => "Formatar Controle: {name}",
|
||||
"Error at character {position}: {message}" => "Erro no caractere {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Definições de macro não são compatíveis com equações.",
|
||||
"A % can't be combined with a link in an equation." => "Um % não pode ser combinado com um link em uma equação.",
|
||||
"Equations can nest at most 32 levels deep." => "As equações podem ter no máximo 32 níveis de aninhamento.",
|
||||
"An equation can be at most 4096 bytes long." => "Uma equação pode ter no máximo 4096 bytes.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Uma equação pode ter no máximo 2500 células de matriz (linhas vezes a linha mais larga)."
|
||||
}
|
||||
"This equation is too large to draw." => "Esta equação é grande demais para ser desenhada.",
|
||||
"This equation could not be laid out." => "Não foi possível diagramar esta equação.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macro “{name}” salva ({steps} etapa)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macro “{name}” salva ({steps} etapas)",
|
||||
"without {key}: another macro took it while recording" => "sem {key}: outra macro o usou durante a gravação",
|
||||
"Recording stopped" => "Gravação interrompida",
|
||||
"Macro “{name}” stopped: {message}" => "Macro “{name}” interrompida: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macro “{name}” executada ({steps} etapa)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macro “{name}” executada ({steps} etapas)",
|
||||
"Double superscript" => "Sobrescrito duplo",
|
||||
"Double subscript" => "Subscrito duplo",
|
||||
"Extra }" => "} a mais",
|
||||
"Unexpected end of input in a macro argument" => "Fim inesperado da entrada em um argumento de macro",
|
||||
"Expected \\right after \\left" => "\\right esperado após \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle deve estar entre \\left e \\right",
|
||||
"Invalid environment name" => "Nome de ambiente inválido",
|
||||
"Expected \\end after environment body" => "\\end esperado após o corpo do ambiente",
|
||||
"Expected URL" => "URL esperada",
|
||||
"\\tag requires an argument" => "\\tag requer um argumento",
|
||||
"only one infix operator per group" => "Apenas um operador infixo por grupo",
|
||||
"Expected color token" => "Cor esperada",
|
||||
"Expected size for \\raisebox" => "Tamanho esperado para \\raisebox",
|
||||
"Expected size for \\rule width" => "Tamanho esperado para a largura de \\rule",
|
||||
"Expected size for \\rule height" => "Tamanho esperado para a altura de \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Não é possível usar \\tag e \\nonumber na mesma linha",
|
||||
"Multiple \\tag in a row" => "Vários \\tag em uma linha",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag deve aparecer no fim da linha, após o corpo da equação",
|
||||
"Multiple \\nonumber in a row" => "Vários \\nonumber em uma linha",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber deve aparecer no fim da linha",
|
||||
"Too many tab characters: &" => "Caracteres de tabulação demais: &",
|
||||
"Invalid column alignment for array" => "Alinhamento de coluna inválido para array",
|
||||
"Expected column alignment character" => "Caractere de alinhamento de coluna esperado",
|
||||
"Expected l or c or r" => "l, c ou r esperado",
|
||||
"Expected ]" => "] esperado",
|
||||
"Unexpected end of CD row after @" => "Fim inesperado da linha CD após @",
|
||||
"Invalid column alignment for subarray" => "Alinhamento de coluna inválido para subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} pode conter apenas uma coluna",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree tem um \\LeftLabel ou \\RightLabel sem um comando de inferência a seguir"
|
||||
}
|
||||
"Recursion limit exceeded" => "Limite de recursão excedido",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Expansões de macro demais: laço infinito ou configuração maxExpand baixa demais"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Estilo bruto esperado para \\htmlStyle",
|
||||
"\\verb assertion failed" => "Falha na verificação de \\verb",
|
||||
"Undefined control sequence: {name}" => "Sequência de controle não definida: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' esperado, '{got}' encontrado",
|
||||
"Expected group after '{symbol}'" => "Grupo esperado após '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Delimitador esperado como argumento de '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Grupo esperado como argumento de '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Função '{function}' sem argumentos usada como sobrescrito",
|
||||
"Got function '{function}' with no arguments as subscript" => "Função '{function}' sem argumentos usada como subscrito",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Função '{function}' sem argumentos usada como argumento de '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Função '{function}' sem argumentos usada como \\tag",
|
||||
"Can't use function '{function}' in text mode" => "A função '{function}' não pode ser usada no modo de texto",
|
||||
"Can't use function '{function}' in math mode" => "A função '{function}' não pode ser usada no modo matemático",
|
||||
"Invalid color: '{color}'" => "Cor inválida: '{color}'",
|
||||
"Invalid size: '{size}'" => "Tamanho inválido: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Unidade inválida: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Delimitador '{delimiter}' inválido após '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Tipo de delimitador '{type}' inválido após '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Tipo de delimitador '{type}' inválido",
|
||||
"No such environment: {name}" => "Ambiente desconhecido: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Argumento esperado para \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Não correspondem: \\begin{{begin}} fechado por \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} só é válido dentro de um ambiente array",
|
||||
"Mismatched {command}" => "{command} sem correspondência",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr ou \\end esperado, '{got}' encontrado",
|
||||
"Unknown column alignment: {alignment}" => "Alinhamento de coluna desconhecido: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Fórmulas demais em uma linha: {expected} esperadas, {got} encontradas",
|
||||
"Unknown CD directive: @{directive}" => "Diretiva CD desconhecida: @{directive}",
|
||||
"Expected argument for {command}" => "Argumento esperado para {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} precisa de {count} premissa(s), mas só há {available} disponível(is)"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} só é válido como comando bussproofs compatível dentro de prooftree"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree terminou com {count} item(ns) na pilha de prova; esperado 1",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char tem um argumento não numérico {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char com ponto de código inválido {code}",
|
||||
"Invalid environment name character: {character}" => "Caractere inválido no nome do ambiente: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1071,110 +1071,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Afișare",
|
||||
"Collapse dialog" => "Restrângere casetă de dialog",
|
||||
"Expand dialog" => "Extindere casetă de dialog",
|
||||
"Numerical Count" => "Numărare numerică",
|
||||
"Minimum" => "Minim",
|
||||
"Maximum" => "Maxim",
|
||||
"Circular References: {cell}" => "Referințe circulare: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Lățime: {chars} ({pixels} pixeli)",
|
||||
"Height: {points} ({pixels} pixels)" => "Înălțime: {points} ({pixels} pixeli)",
|
||||
"Picture in cell" => "Imagine în celulă",
|
||||
"Picture: {alt}" => "Imagine: {alt}",
|
||||
"Format Control: {name}" => "Formatare control: {name}",
|
||||
"Error at character {position}: {message}" => "Eroare la caracterul {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Definițiile de macrocomenzi nu sunt acceptate în ecuații.",
|
||||
"A % can't be combined with a link in an equation." => "Un % nu poate fi combinat cu un link într-o ecuație.",
|
||||
"Equations can nest at most 32 levels deep." => "Ecuațiile pot fi imbricate pe cel mult 32 de niveluri.",
|
||||
"An equation can be at most 4096 bytes long." => "O ecuație poate avea cel mult 4096 de octeți.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"O ecuație poate avea cel mult 2500 de celule de matrice (rânduri înmulțite cu cel mai lat rând)."
|
||||
}
|
||||
"This equation is too large to draw." => "Această ecuație este prea mare pentru a fi desenată.",
|
||||
"This equation could not be laid out." => "Această ecuație nu a putut fi așezată în pagină.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Macrocomanda „{name}” a fost salvată ({steps} pas)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Macrocomanda „{name}” a fost salvată (pași: {steps})",
|
||||
"without {key}: another macro took it while recording" => "fără {key}: altă macrocomandă l-a preluat în timpul înregistrării",
|
||||
"Recording stopped" => "Înregistrare oprită",
|
||||
"Macro “{name}” stopped: {message}" => "Macrocomanda „{name}” s-a oprit: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Macrocomanda „{name}” a rulat ({steps} pas)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Macrocomanda „{name}” a rulat (pași: {steps})",
|
||||
"Double superscript" => "Exponent dublu",
|
||||
"Double subscript" => "Indice dublu",
|
||||
"Extra }" => "} în plus",
|
||||
"Unexpected end of input in a macro argument" => "Sfârșit neașteptat al intrării într-un argument de macro",
|
||||
"Expected \\right after \\left" => "Se aștepta \\right după \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle trebuie să fie între \\left și \\right",
|
||||
"Invalid environment name" => "Nume de mediu nevalid",
|
||||
"Expected \\end after environment body" => "Se aștepta \\end după conținutul mediului",
|
||||
"Expected URL" => "Se aștepta un URL",
|
||||
"\\tag requires an argument" => "\\tag necesită un argument",
|
||||
"only one infix operator per group" => "Un singur operator infix per grup",
|
||||
"Expected color token" => "Se aștepta o culoare",
|
||||
"Expected size for \\raisebox" => "Se aștepta o dimensiune pentru \\raisebox",
|
||||
"Expected size for \\rule width" => "Se aștepta o dimensiune pentru lățimea \\rule",
|
||||
"Expected size for \\rule height" => "Se aștepta o dimensiune pentru înălțimea \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag și \\nonumber nu pot fi folosite pe același rând",
|
||||
"Multiple \\tag in a row" => "Mai multe \\tag pe un rând",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag trebuie să fie la sfârșitul rândului, după corpul ecuației",
|
||||
"Multiple \\nonumber in a row" => "Mai multe \\nonumber pe un rând",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber trebuie să fie la sfârșitul rândului",
|
||||
"Too many tab characters: &" => "Prea multe caractere de tabulare: &",
|
||||
"Invalid column alignment for array" => "Aliniere de coloană nevalidă pentru array",
|
||||
"Expected column alignment character" => "Se aștepta un caracter de aliniere a coloanei",
|
||||
"Expected l or c or r" => "Se aștepta l, c sau r",
|
||||
"Expected ]" => "Se aștepta ]",
|
||||
"Unexpected end of CD row after @" => "Sfârșit neașteptat al rândului CD după @",
|
||||
"Invalid column alignment for subarray" => "Aliniere de coloană nevalidă pentru subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} poate conține o singură coloană",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree are un \\LeftLabel sau \\RightLabel fără o comandă de inferență după el"
|
||||
}
|
||||
"Recursion limit exceeded" => "Limita de recursivitate a fost depășită",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Prea multe expandări de macro: buclă infinită sau setarea maxExpand prea mică"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Se aștepta un stil brut pentru \\htmlStyle",
|
||||
"\\verb assertion failed" => "Verificarea \\verb a eșuat",
|
||||
"Undefined control sequence: {name}" => "Secvență de control nedefinită: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Se aștepta '{expected}', s-a găsit '{got}'",
|
||||
"Expected group after '{symbol}'" => "Se aștepta un grup după '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Se aștepta un delimitator ca argument pentru '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Se aștepta un grup ca argument pentru '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funcția '{function}' fără argumente folosită ca exponent",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funcția '{function}' fără argumente folosită ca indice",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Funcția '{function}' fără argumente folosită ca argument pentru '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funcția '{function}' fără argumente folosită ca \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Funcția '{function}' nu poate fi folosită în modul text",
|
||||
"Can't use function '{function}' in math mode" => "Funcția '{function}' nu poate fi folosită în modul matematic",
|
||||
"Invalid color: '{color}'" => "Culoare nevalidă: '{color}'",
|
||||
"Invalid size: '{size}'" => "Dimensiune nevalidă: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Unitate nevalidă: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Delimitator '{delimiter}' nevalid după '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Tip de delimitator '{type}' nevalid după '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Tip de delimitator '{type}' nevalid",
|
||||
"No such environment: {name}" => "Mediu necunoscut: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Se aștepta un argument pentru \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Nepotrivire: \\begin{{begin}} închis de \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} este valid doar într-un mediu array",
|
||||
"Mismatched {command}" => "{command} fără pereche",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Se aștepta &, \\\\, \\cr sau \\end, s-a găsit '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Aliniere de coloană necunoscută: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Prea multe formule pe un rând: se așteptau {expected}, s-au găsit {got}",
|
||||
"Unknown CD directive: @{directive}" => "Directivă CD necunoscută: @{directive}",
|
||||
"Expected argument for {command}" => "Se aștepta un argument pentru {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} necesită {count} premisă(e), dar sunt disponibile doar {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} este valid doar ca o comandă bussproofs acceptată în prooftree"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree s-a încheiat cu {count} element(e) în stiva de demonstrație, se aștepta 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char are un argument nenumeric {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char cu punct de cod nevalid {code}",
|
||||
"Invalid environment name character: {character}" => "Caracter nevalid în numele mediului: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -494,116 +494,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Показать",
|
||||
"Collapse dialog" => "Свернуть диалоговое окно",
|
||||
"Expand dialog" => "Развернуть диалоговое окно",
|
||||
"Numerical Count" => "Количество чисел",
|
||||
"Minimum" => "Минимум",
|
||||
"Maximum" => "Максимум",
|
||||
"Circular References: {cell}" => "Циклические ссылки: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Ширина: {chars} (пикселей: {pixels})",
|
||||
"Height: {points} ({pixels} pixels)" => "Высота: {points} (пикселей: {pixels})",
|
||||
"Picture in cell" => "Изображение в ячейке",
|
||||
"Picture: {alt}" => "Изображение: {alt}",
|
||||
"Format Control: {name}" => "Формат элемента управления: {name}",
|
||||
"Error at character {position}: {message}" => "Ошибка в символе {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Определения макросов в формулах не поддерживаются.",
|
||||
"A % can't be combined with a link in an equation." => "Знак % нельзя сочетать со ссылкой в формуле.",
|
||||
"Equations can nest at most 32 levels deep." => "Формулы могут иметь не более 32 уровней вложенности.",
|
||||
"An equation can be at most 4096 bytes long." => "Длина формулы не может превышать 4096 байт.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Формула может содержать не более 2500 ячеек матрицы (строки, умноженные на самую широкую строку)."
|
||||
}
|
||||
"This equation is too large to draw." => "Эта формула слишком велика для отрисовки.",
|
||||
"This equation could not be laid out." => "Не удалось построить эту формулу.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Макрос «{name}» сохранён ({steps} шаг)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Макрос «{name}» сохранён (шагов: {steps})",
|
||||
"without {key}: another macro took it while recording" => "без {key}: во время записи его занял другой макрос",
|
||||
"Recording stopped" => "Запись остановлена",
|
||||
"Macro “{name}” stopped: {message}" => "Макрос «{name}» остановлен: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Макрос «{name}» выполнен ({steps} шаг)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Макрос «{name}» выполнен (шагов: {steps})",
|
||||
"Average" => "Среднее",
|
||||
"Count" => "Количество",
|
||||
"Sum" => "Сумма",
|
||||
"Goal Seeking found a solution: {value}" => "Подбор параметра нашёл решение: {value}",
|
||||
"Sheets: {sheets}" => "Листы: {sheets}",
|
||||
"Hidden: {sheets}" => "Скрытые: {sheets}",
|
||||
"Double superscript" => "Двойной верхний индекс",
|
||||
"Double subscript" => "Двойной нижний индекс",
|
||||
"Extra }" => "Лишняя }",
|
||||
"Unexpected end of input in a macro argument" => "Неожиданный конец ввода в аргументе макроса",
|
||||
"Expected \\right after \\left" => "После \\left ожидается \\right",
|
||||
"\\middle must be within \\left and \\right" => "\\middle должен стоять между \\left и \\right",
|
||||
"Invalid environment name" => "Недопустимое имя окружения",
|
||||
"Expected \\end after environment body" => "После содержимого окружения ожидается \\end",
|
||||
"Expected URL" => "Ожидается URL-адрес",
|
||||
"\\tag requires an argument" => "Для \\tag требуется аргумент",
|
||||
"only one infix operator per group" => "В группе допускается только один инфиксный оператор",
|
||||
"Expected color token" => "Ожидается цвет",
|
||||
"Expected size for \\raisebox" => "Для \\raisebox ожидается размер",
|
||||
"Expected size for \\rule width" => "Для ширины \\rule ожидается размер",
|
||||
"Expected size for \\rule height" => "Для высоты \\rule ожидается размер",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Нельзя использовать \\tag и \\nonumber в одной строке",
|
||||
"Multiple \\tag in a row" => "Несколько \\tag в одной строке",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag должен стоять в конце строки после формулы",
|
||||
"Multiple \\nonumber in a row" => "Несколько \\nonumber в одной строке",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber должен стоять в конце строки",
|
||||
"Too many tab characters: &" => "Слишком много символов табуляции: &",
|
||||
"Invalid column alignment for array" => "Недопустимое выравнивание столбцов для array",
|
||||
"Expected column alignment character" => "Ожидается символ выравнивания столбца",
|
||||
"Expected l or c or r" => "Ожидается l, c или r",
|
||||
"Expected ]" => "Ожидается ]",
|
||||
"Unexpected end of CD row after @" => "Неожиданный конец строки CD после @",
|
||||
"Invalid column alignment for subarray" => "Недопустимое выравнивание столбцов для subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} может содержать только один столбец",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"В prooftree есть \\LeftLabel или \\RightLabel без последующей команды вывода"
|
||||
}
|
||||
"Recursion limit exceeded" => "Превышен предел рекурсии",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Слишком много раскрытий макросов: бесконечный цикл или слишком малое значение maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Для \\htmlStyle ожидается необработанный стиль",
|
||||
"\\verb assertion failed" => "Проверка \\verb не пройдена",
|
||||
"Undefined control sequence: {name}" => "Неопределённая управляющая последовательность: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Ожидается '{expected}', получено '{got}'",
|
||||
"Expected group after '{symbol}'" => "После '{symbol}' ожидается группа",
|
||||
"Expected delimiter as argument to '{function}'" => "В качестве аргумента '{function}' ожидается разделитель",
|
||||
"Expected group as argument to '{function}'" => "В качестве аргумента '{function}' ожидается группа",
|
||||
"Got function '{function}' with no arguments as superscript" => "Функция '{function}' без аргументов использована как верхний индекс",
|
||||
"Got function '{function}' with no arguments as subscript" => "Функция '{function}' без аргументов использована как нижний индекс",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Функция '{function}' без аргументов использована как аргумент '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Функция '{function}' без аргументов использована как \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Функцию '{function}' нельзя использовать в текстовом режиме",
|
||||
"Can't use function '{function}' in math mode" => "Функцию '{function}' нельзя использовать в математическом режиме",
|
||||
"Invalid color: '{color}'" => "Недопустимый цвет: '{color}'",
|
||||
"Invalid size: '{size}'" => "Недопустимый размер: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Недопустимая единица: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Недопустимый разделитель '{delimiter}' после '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Недопустимый тип разделителя '{type}' после '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Недопустимый тип разделителя '{type}'",
|
||||
"No such environment: {name}" => "Неизвестное окружение: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Для \\begin{{name}} ожидается аргумент",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Несоответствие: \\begin{{begin}} закрыт \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} допускается только в окружении array",
|
||||
"Mismatched {command}" => "{command} без пары",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Ожидается &, \\\\, \\cr или \\end, получено '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Неизвестное выравнивание столбца: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Слишком много формул в строке: ожидалось {expected}, получено {got}",
|
||||
"Unknown CD directive: @{directive}" => "Неизвестная директива CD: @{directive}",
|
||||
"Expected argument for {command}" => "Для {command} ожидается аргумент",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"Для {command} нужно посылок: {count}, но доступно только {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} допускается в prooftree только как поддерживаемая команда bussproofs"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree завершился с элементами в стеке доказательства: {count}, ожидался 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "У \\@char нечисловой аргумент {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char с недопустимой кодовой точкой {code}",
|
||||
"Invalid environment name character: {character}" => "Недопустимый символ в имени окружения: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -481,112 +481,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Prikaži",
|
||||
"Collapse dialog" => "Skupi dijalog",
|
||||
"Expand dialog" => "Proširi dijalog",
|
||||
"Numerical Count" => "Broj numeričkih vrednosti",
|
||||
"Minimum" => "Minimum",
|
||||
"Maximum" => "Maksimum",
|
||||
"Circular References: {cell}" => "Kružne reference: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Širina: {chars} (piksela: {pixels})",
|
||||
"Height: {points} ({pixels} pixels)" => "Visina: {points} (piksela: {pixels})",
|
||||
"Picture in cell" => "Slika u ćeliji",
|
||||
"Picture: {alt}" => "Slika: {alt}",
|
||||
"Format Control: {name}" => "Oblikuj kontrolu: {name}",
|
||||
"Error at character {position}: {message}" => "Greška kod znaka {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Definicije makroa nisu podržane u jednačinama.",
|
||||
"A % can't be combined with a link in an equation." => "Znak % ne može da se kombinuje sa vezom u jednačini.",
|
||||
"Equations can nest at most 32 levels deep." => "Jednačine mogu da budu ugnežđene najviše 32 nivoa.",
|
||||
"An equation can be at most 4096 bytes long." => "Jednačina može da ima najviše 4096 bajtova.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Jednačina može da ima najviše 2500 ćelija matrice (redovi puta najširi red)."
|
||||
}
|
||||
"This equation is too large to draw." => "Ova jednačina je prevelika za crtanje.",
|
||||
"This equation could not be laid out." => "Ova jednačina nije mogla da se složi.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Makro „{name}“ je sačuvan ({steps} korak)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Makro „{name}“ je sačuvan (broj koraka: {steps})",
|
||||
"without {key}: another macro took it while recording" => "bez {key}: drugi makro ga je zauzeo tokom snimanja",
|
||||
"Recording stopped" => "Snimanje je zaustavljeno",
|
||||
"Macro “{name}” stopped: {message}" => "Makro „{name}“ je zaustavljen: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Makro „{name}“ je pokrenut ({steps} korak)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Makro „{name}“ je pokrenut (broj koraka: {steps})",
|
||||
"Average" => "Prosek",
|
||||
"Count" => "Broj",
|
||||
"Sum" => "Zbir",
|
||||
"Goal Seeking found a solution: {value}" => "Traženje cilja je pronašlo rešenje: {value}",
|
||||
"Sheets: {sheets}" => "Listovi: {sheets}",
|
||||
"Hidden: {sheets}" => "Skriveni: {sheets}",
|
||||
"Double superscript" => "Dvostruki eksponent",
|
||||
"Double subscript" => "Dvostruki indeks",
|
||||
"Extra }" => "Višak }",
|
||||
"Unexpected end of input in a macro argument" => "Neočekivan kraj unosa u argumentu makroa",
|
||||
"Expected \\right after \\left" => "Posle \\left se očekuje \\right",
|
||||
"\\middle must be within \\left and \\right" => "\\middle mora biti između \\left i \\right",
|
||||
"Invalid environment name" => "Nevažeći naziv okruženja",
|
||||
"Expected \\end after environment body" => "Posle sadržaja okruženja se očekuje \\end",
|
||||
"Expected URL" => "Očekuje se URL adresa",
|
||||
"\\tag requires an argument" => "\\tag zahteva argument",
|
||||
"only one infix operator per group" => "Samo jedan infiksni operator po grupi",
|
||||
"Expected color token" => "Očekuje se boja",
|
||||
"Expected size for \\raisebox" => "Za \\raisebox se očekuje veličina",
|
||||
"Expected size for \\rule width" => "Za širinu \\rule se očekuje veličina",
|
||||
"Expected size for \\rule height" => "Za visinu \\rule se očekuje veličina",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag i \\nonumber ne mogu biti u istom redu",
|
||||
"Multiple \\tag in a row" => "Više \\tag u jednom redu",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag mora biti na kraju reda, posle sadržaja jednačine",
|
||||
"Multiple \\nonumber in a row" => "Više \\nonumber u jednom redu",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber mora biti na kraju reda",
|
||||
"Too many tab characters: &" => "Previše znakova tabulatora: &",
|
||||
"Invalid column alignment for array" => "Nevažeće poravnanje kolona za array",
|
||||
"Expected column alignment character" => "Očekuje se znak za poravnanje kolone",
|
||||
"Expected l or c or r" => "Očekuje se l, c ili r",
|
||||
"Expected ]" => "Očekuje se ]",
|
||||
"Unexpected end of CD row after @" => "Neočekivan kraj CD reda posle @",
|
||||
"Invalid column alignment for subarray" => "Nevažeće poravnanje kolona za subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} može da sadrži samo jednu kolonu",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree sadrži \\LeftLabel ili \\RightLabel bez naredne komande zaključivanja"
|
||||
}
|
||||
"Recursion limit exceeded" => "Prekoračeno ograničenje rekurzije",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Previše proširenja makroa: beskonačna petlja ili premala vrednost postavke maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Za \\htmlStyle se očekuje neobrađeni stil",
|
||||
"\\verb assertion failed" => "Provera za \\verb nije uspela",
|
||||
"Undefined control sequence: {name}" => "Nedefinisana kontrolna sekvenca: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Očekuje se '{expected}', pronađeno '{got}'",
|
||||
"Expected group after '{symbol}'" => "Posle '{symbol}' se očekuje grupa",
|
||||
"Expected delimiter as argument to '{function}'" => "Kao argument za '{function}' se očekuje graničnik",
|
||||
"Expected group as argument to '{function}'" => "Kao argument za '{function}' se očekuje grupa",
|
||||
"Got function '{function}' with no arguments as superscript" => "Funkcija '{function}' bez argumenata upotrebljena kao eksponent",
|
||||
"Got function '{function}' with no arguments as subscript" => "Funkcija '{function}' bez argumenata upotrebljena kao indeks",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Funkcija '{function}' bez argumenata upotrebljena kao argument za '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Funkcija '{function}' bez argumenata upotrebljena kao \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Funkcija '{function}' ne može da se koristi u tekstualnom režimu",
|
||||
"Can't use function '{function}' in math mode" => "Funkcija '{function}' ne može da se koristi u matematičkom režimu",
|
||||
"Invalid color: '{color}'" => "Nevažeća boja: '{color}'",
|
||||
"Invalid size: '{size}'" => "Nevažeća veličina: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Nevažeća jedinica: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Nevažeći graničnik '{delimiter}' posle '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Nevažeći tip graničnika '{type}' posle '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Nevažeći tip graničnika '{type}'",
|
||||
"No such environment: {name}" => "Nepoznato okruženje: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Za \\begin{{name}} se očekuje argument",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Neslaganje: \\begin{{begin}} zatvoreno sa \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} važi samo unutar okruženja array",
|
||||
"Mismatched {command}" => "{command} bez para",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Očekuje se &, \\\\, \\cr ili \\end, pronađeno '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Nepoznato poravnanje kolone: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Previše formula u redu: očekivano {expected}, pronađeno {got}",
|
||||
"Unknown CD directive: @{directive}" => "Nepoznata CD direktiva: @{directive}",
|
||||
"Expected argument for {command}" => "Za {command} se očekuje argument",
|
||||
"{command} needs {count} premise(s), but only {available} available" => "{command} zahteva {count} premisa, ali je dostupno samo {available}",
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} u prooftree važi samo kao podržana bussproofs komanda"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree se završio sa {count} stavki na steku dokaza, očekivana 1",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char ima nenumerički argument {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char sa nevažećom kodnom tačkom {code}",
|
||||
"Invalid environment name character: {character}" => "Nevažeći znak u nazivu okruženja: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -451,114 +451,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Göster",
|
||||
"Collapse dialog" => "İletişim kutusunu daralt",
|
||||
"Expand dialog" => "İletişim kutusunu genişlet",
|
||||
"Numerical Count" => "Sayısal Sayım",
|
||||
"Minimum" => "En Küçük",
|
||||
"Maximum" => "En Büyük",
|
||||
"Circular References: {cell}" => "Döngüsel Başvurular: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Genişlik: {chars} ({pixels} piksel)",
|
||||
"Height: {points} ({pixels} pixels)" => "Yükseklik: {points} ({pixels} piksel)",
|
||||
"Picture in cell" => "Hücredeki resim",
|
||||
"Picture: {alt}" => "Resim: {alt}",
|
||||
"Format Control: {name}" => "Denetimi Biçimlendir: {name}",
|
||||
"Error at character {position}: {message}" => "{position}. karakterde hata: {message}",
|
||||
"Macro definitions are not supported in equations." => "Denklemlerde makro tanımları desteklenmez.",
|
||||
"A % can't be combined with a link in an equation." => "Bir denklemde % bir bağlantıyla birlikte kullanılamaz.",
|
||||
"Equations can nest at most 32 levels deep." => "Denklemler en fazla 32 düzey iç içe olabilir.",
|
||||
"An equation can be at most 4096 bytes long." => "Bir denklem en fazla 4096 bayt uzunluğunda olabilir.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Bir denklemde en fazla 2500 matris hücresi olabilir (satır sayısı çarpı en geniş satır)."
|
||||
}
|
||||
"This equation is too large to draw." => "Bu denklem çizilemeyecek kadar büyük.",
|
||||
"This equation could not be laid out." => "Bu denklem dizilemedi.",
|
||||
"Saved macro “{name}” ({steps} step)" => "“{name}” makrosu kaydedildi ({steps} adım)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "“{name}” makrosu kaydedildi ({steps} adım)",
|
||||
"without {key}: another macro took it while recording" => "{key} olmadan: kayıt sırasında başka bir makro aldı",
|
||||
"Recording stopped" => "Kayıt durduruldu",
|
||||
"Macro “{name}” stopped: {message}" => "“{name}” makrosu durdu: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "“{name}” makrosu çalıştırıldı ({steps} adım)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "“{name}” makrosu çalıştırıldı ({steps} adım)",
|
||||
"Average" => "Ortalama",
|
||||
"Count" => "Sayı",
|
||||
"Sum" => "Toplam",
|
||||
"Goal Seeking found a solution: {value}" => "Hedef Ara bir çözüm buldu: {value}",
|
||||
"Sheets: {sheets}" => "Sayfalar: {sheets}",
|
||||
"Hidden: {sheets}" => "Gizli: {sheets}",
|
||||
"Double superscript" => "Çift üst simge",
|
||||
"Double subscript" => "Çift alt simge",
|
||||
"Extra }" => "Fazladan }",
|
||||
"Unexpected end of input in a macro argument" => "Makro bağımsız değişkeninde beklenmeyen giriş sonu",
|
||||
"Expected \\right after \\left" => "\\left sonrasında \\right bekleniyordu",
|
||||
"\\middle must be within \\left and \\right" => "\\middle, \\left ile \\right arasında olmalıdır",
|
||||
"Invalid environment name" => "Geçersiz ortam adı",
|
||||
"Expected \\end after environment body" => "Ortam gövdesinden sonra \\end bekleniyordu",
|
||||
"Expected URL" => "URL bekleniyordu",
|
||||
"\\tag requires an argument" => "\\tag bir bağımsız değişken gerektirir",
|
||||
"only one infix operator per group" => "Grup başına yalnızca bir ara işleç",
|
||||
"Expected color token" => "Renk bekleniyordu",
|
||||
"Expected size for \\raisebox" => "\\raisebox için boyut bekleniyordu",
|
||||
"Expected size for \\rule width" => "\\rule genişliği için boyut bekleniyordu",
|
||||
"Expected size for \\rule height" => "\\rule yüksekliği için boyut bekleniyordu",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "\\tag ve \\nonumber aynı satırda birlikte kullanılamaz",
|
||||
"Multiple \\tag in a row" => "Bir satırda birden çok \\tag",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag satırın sonunda, denklem gövdesinden sonra yer almalıdır",
|
||||
"Multiple \\nonumber in a row" => "Bir satırda birden çok \\nonumber",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber satırın sonunda yer almalıdır",
|
||||
"Too many tab characters: &" => "Çok fazla sekme karakteri: &",
|
||||
"Invalid column alignment for array" => "array için geçersiz sütun hizalaması",
|
||||
"Expected column alignment character" => "Sütun hizalama karakteri bekleniyordu",
|
||||
"Expected l or c or r" => "l, c veya r bekleniyordu",
|
||||
"Expected ]" => "] bekleniyordu",
|
||||
"Unexpected end of CD row after @" => "@ sonrasında beklenmeyen CD satırı sonu",
|
||||
"Invalid column alignment for subarray" => "subarray için geçersiz sütun hizalaması",
|
||||
"{subarray} can contain only one column" => "{subarray} yalnızca bir sütun içerebilir",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree, ardından çıkarım komutu gelmeyen bir \\LeftLabel veya \\RightLabel içeriyor"
|
||||
}
|
||||
"Recursion limit exceeded" => "Özyineleme sınırı aşıldı",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Çok fazla makro genişletmesi: sonsuz döngü veya maxExpand ayarı çok düşük"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "\\htmlStyle için ham stil bekleniyordu",
|
||||
"\\verb assertion failed" => "\\verb denetimi başarısız oldu",
|
||||
"Undefined control sequence: {name}" => "Tanımsız denetim dizisi: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "'{expected}' bekleniyordu, '{got}' bulundu",
|
||||
"Expected group after '{symbol}'" => "'{symbol}' sonrasında grup bekleniyordu",
|
||||
"Expected delimiter as argument to '{function}'" => "'{function}' bağımsız değişkeni olarak sınırlayıcı bekleniyordu",
|
||||
"Expected group as argument to '{function}'" => "'{function}' bağımsız değişkeni olarak grup bekleniyordu",
|
||||
"Got function '{function}' with no arguments as superscript" => "Bağımsız değişkensiz '{function}' işlevi üst simge olarak kullanıldı",
|
||||
"Got function '{function}' with no arguments as subscript" => "Bağımsız değişkensiz '{function}' işlevi alt simge olarak kullanıldı",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Bağımsız değişkensiz '{function}' işlevi '{parent}' bağımsız değişkeni olarak kullanıldı"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Bağımsız değişkensiz '{function}' işlevi \\tag olarak kullanıldı",
|
||||
"Can't use function '{function}' in text mode" => "'{function}' işlevi metin modunda kullanılamaz",
|
||||
"Can't use function '{function}' in math mode" => "'{function}' işlevi matematik modunda kullanılamaz",
|
||||
"Invalid color: '{color}'" => "Geçersiz renk: '{color}'",
|
||||
"Invalid size: '{size}'" => "Geçersiz boyut: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Geçersiz birim: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "'{function}' sonrasında geçersiz sınırlayıcı '{delimiter}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "'{function}' sonrasında geçersiz sınırlayıcı türü '{type}'",
|
||||
"Invalid delimiter type '{type}'" => "Geçersiz sınırlayıcı türü '{type}'",
|
||||
"No such environment: {name}" => "Bilinmeyen ortam: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "\\begin{{name}} için bağımsız değişken bekleniyordu",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Uyuşmazlık: \\begin{{begin}}, \\end{{end}} ile kapatılmış",
|
||||
"{command} valid only within array environment" => "{command} yalnızca array ortamında geçerlidir",
|
||||
"Mismatched {command}" => "Eşi olmayan {command}",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "&, \\\\, \\cr veya \\end bekleniyordu, '{got}' bulundu",
|
||||
"Unknown column alignment: {alignment}" => "Bilinmeyen sütun hizalaması: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Bir satırda çok fazla formül: {expected} bekleniyordu, {got} bulundu",
|
||||
"Unknown CD directive: @{directive}" => "Bilinmeyen CD yönergesi: @{directive}",
|
||||
"Expected argument for {command}" => "{command} için bağımsız değişken bekleniyordu",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"{command} {count} öncül gerektirir, ancak yalnızca {available} mevcut"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} prooftree içinde yalnızca desteklenen bir bussproofs komutu olarak geçerlidir"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree, ispat yığınında {count} öğeyle bitti, 1 bekleniyordu",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char sayısal olmayan bir bağımsız değişkene sahip: {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char geçersiz bir kod noktası içeriyor: {code}",
|
||||
"Invalid environment name character: {character}" => "Ortam adında geçersiz karakter: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -507,7 +507,7 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Name:" => "Name:",
|
||||
"Before sheet (position, 0 = first):" => "Before sheet (position, 0 = first):",
|
||||
"Create a copy" => "Create a copy",
|
||||
"Sheets: {sheets}" => "Аркуші: {sheets}",
|
||||
"Sheets: {sheets}" => "Sheets: {sheets}",
|
||||
"Password (optional):" => "Password (optional):",
|
||||
"Password:" => "Password:",
|
||||
"Allow all users of this sheet to:" => "Allow all users of this sheet to:",
|
||||
@@ -531,7 +531,7 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Remove the password (Modify)" => "Remove the password (Modify)",
|
||||
"'{file}' is protected." => "'{file}' is protected.",
|
||||
"Unhide sheet:" => "Unhide sheet:",
|
||||
"Hidden: {sheets}" => "Приховані: {sheets}",
|
||||
"Hidden: {sheets}" => "Hidden: {sheets}",
|
||||
"All" => "All",
|
||||
"Formulas (F)" => "Formulas (F)",
|
||||
"Values (V)" => "Values (V)",
|
||||
@@ -598,13 +598,13 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Interpolation" => "Interpolation",
|
||||
"Zeros" => "Zeros",
|
||||
"Aggregate duplicates using" => "Aggregate duplicates using",
|
||||
"Average" => "Середнє",
|
||||
"Count" => "Кількість",
|
||||
"Average" => "Average",
|
||||
"Count" => "Count",
|
||||
"CountA" => "CountA",
|
||||
"Max" => "Max",
|
||||
"Median" => "Median",
|
||||
"Min" => "Min",
|
||||
"Sum" => "Сума",
|
||||
"Sum" => "Sum",
|
||||
"Product" => "Product",
|
||||
"Include forecast statistics" => "Include forecast statistics",
|
||||
"Chart" => "Діаграма",
|
||||
@@ -808,7 +808,7 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Set cell:" => "Set cell:",
|
||||
"To value:" => "To value:",
|
||||
"By changing cell:" => "By changing cell:",
|
||||
"Goal Seeking found a solution: {value}" => "Підбір параметра знайшов розв’язок: {value}",
|
||||
"Goal Seeking found a solution: {value}" => "Goal Seeking found a solution: {value}",
|
||||
"Analysis Tools" => "Analysis Tools",
|
||||
"Anova: Single Factor" => "Anova: Single Factor",
|
||||
"Correlation" => "Correlation",
|
||||
@@ -1013,110 +1013,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Показати",
|
||||
"Collapse dialog" => "Згорнути діалогове вікно",
|
||||
"Expand dialog" => "Розгорнути діалогове вікно",
|
||||
"Numerical Count" => "Кількість чисел",
|
||||
"Minimum" => "Мінімум",
|
||||
"Maximum" => "Максимум",
|
||||
"Circular References: {cell}" => "Циклічні посилання: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Ширина: {chars} (пікселів: {pixels})",
|
||||
"Height: {points} ({pixels} pixels)" => "Висота: {points} (пікселів: {pixels})",
|
||||
"Picture in cell" => "Зображення в клітинці",
|
||||
"Picture: {alt}" => "Зображення: {alt}",
|
||||
"Format Control: {name}" => "Формат елемента керування: {name}",
|
||||
"Error at character {position}: {message}" => "Помилка в символі {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Визначення макросів у формулах не підтримуються.",
|
||||
"A % can't be combined with a link in an equation." => "Знак % не можна поєднувати з посиланням у формулі.",
|
||||
"Equations can nest at most 32 levels deep." => "Формули можуть мати не більше 32 рівнів вкладеності.",
|
||||
"An equation can be at most 4096 bytes long." => "Довжина формули не може перевищувати 4096 байт.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Формула може містити не більше 2500 клітинок матриці (рядки, помножені на найширший рядок)."
|
||||
}
|
||||
"This equation is too large to draw." => "Ця формула завелика для відображення.",
|
||||
"This equation could not be laid out." => "Не вдалося побудувати цю формулу.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Макрос «{name}» збережено ({steps} крок)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Макрос «{name}» збережено (кроків: {steps})",
|
||||
"without {key}: another macro took it while recording" => "без {key}: під час запису його зайняв інший макрос",
|
||||
"Recording stopped" => "Запис зупинено",
|
||||
"Macro “{name}” stopped: {message}" => "Макрос «{name}» зупинено: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Макрос «{name}» виконано ({steps} крок)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Макрос «{name}» виконано (кроків: {steps})",
|
||||
"Double superscript" => "Подвійний верхній індекс",
|
||||
"Double subscript" => "Подвійний нижній індекс",
|
||||
"Extra }" => "Зайва }",
|
||||
"Unexpected end of input in a macro argument" => "Неочікуваний кінець введення в аргументі макросу",
|
||||
"Expected \\right after \\left" => "Після \\left очікується \\right",
|
||||
"\\middle must be within \\left and \\right" => "\\middle має стояти між \\left і \\right",
|
||||
"Invalid environment name" => "Неприпустима назва середовища",
|
||||
"Expected \\end after environment body" => "Після вмісту середовища очікується \\end",
|
||||
"Expected URL" => "Очікується URL-адреса",
|
||||
"\\tag requires an argument" => "Для \\tag потрібен аргумент",
|
||||
"only one infix operator per group" => "У групі допускається лише один інфіксний оператор",
|
||||
"Expected color token" => "Очікується колір",
|
||||
"Expected size for \\raisebox" => "Для \\raisebox очікується розмір",
|
||||
"Expected size for \\rule width" => "Для ширини \\rule очікується розмір",
|
||||
"Expected size for \\rule height" => "Для висоти \\rule очікується розмір",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Не можна використовувати \\tag і \\nonumber в одному рядку",
|
||||
"Multiple \\tag in a row" => "Кілька \\tag в одному рядку",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag має стояти в кінці рядка після формули",
|
||||
"Multiple \\nonumber in a row" => "Кілька \\nonumber в одному рядку",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber має стояти в кінці рядка",
|
||||
"Too many tab characters: &" => "Забагато символів табуляції: &",
|
||||
"Invalid column alignment for array" => "Неприпустиме вирівнювання стовпців для array",
|
||||
"Expected column alignment character" => "Очікується символ вирівнювання стовпця",
|
||||
"Expected l or c or r" => "Очікується l, c або r",
|
||||
"Expected ]" => "Очікується ]",
|
||||
"Unexpected end of CD row after @" => "Неочікуваний кінець рядка CD після @",
|
||||
"Invalid column alignment for subarray" => "Неприпустиме вирівнювання стовпців для subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} може містити лише один стовпець",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"У prooftree є \\LeftLabel або \\RightLabel без наступної команди виведення"
|
||||
}
|
||||
"Recursion limit exceeded" => "Перевищено межу рекурсії",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Забагато розгортань макросів: нескінченний цикл або замале значення maxExpand"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Для \\htmlStyle очікується необроблений стиль",
|
||||
"\\verb assertion failed" => "Перевірку \\verb не пройдено",
|
||||
"Undefined control sequence: {name}" => "Невизначена керівна послідовність: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Очікується '{expected}', отримано '{got}'",
|
||||
"Expected group after '{symbol}'" => "Після '{symbol}' очікується група",
|
||||
"Expected delimiter as argument to '{function}'" => "Як аргумент '{function}' очікується роздільник",
|
||||
"Expected group as argument to '{function}'" => "Як аргумент '{function}' очікується група",
|
||||
"Got function '{function}' with no arguments as superscript" => "Функцію '{function}' без аргументів використано як верхній індекс",
|
||||
"Got function '{function}' with no arguments as subscript" => "Функцію '{function}' без аргументів використано як нижній індекс",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Функцію '{function}' без аргументів використано як аргумент '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Функцію '{function}' без аргументів використано як \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Функцію '{function}' не можна використовувати в текстовому режимі",
|
||||
"Can't use function '{function}' in math mode" => "Функцію '{function}' не можна використовувати в математичному режимі",
|
||||
"Invalid color: '{color}'" => "Неприпустимий колір: '{color}'",
|
||||
"Invalid size: '{size}'" => "Неприпустимий розмір: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Неприпустима одиниця: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Неприпустимий роздільник '{delimiter}' після '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Неприпустимий тип роздільника '{type}' після '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Неприпустимий тип роздільника '{type}'",
|
||||
"No such environment: {name}" => "Невідоме середовище: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Для \\begin{{name}} очікується аргумент",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Невідповідність: \\begin{{begin}} закрито \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} допускається лише в середовищі array",
|
||||
"Mismatched {command}" => "{command} без пари",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Очікується &, \\\\, \\cr або \\end, отримано '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Невідоме вирівнювання стовпця: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Забагато формул у рядку: очікувалося {expected}, отримано {got}",
|
||||
"Unknown CD directive: @{directive}" => "Невідома директива CD: @{directive}",
|
||||
"Expected argument for {command}" => "Для {command} очікується аргумент",
|
||||
"{command} needs {count} premise(s), but only {available} available" => {
|
||||
"Для {command} потрібно засновків: {count}, але доступно лише {available}"
|
||||
}
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} допускається в prooftree лише як підтримувана команда bussproofs"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => {
|
||||
"prooftree завершився з елементами в стеку доведення: {count}, очікувався 1"
|
||||
}
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char має нечисловий аргумент {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char з неприпустимою кодовою точкою {code}",
|
||||
"Invalid environment name character: {character}" => "Неприпустимий символ у назві середовища: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -451,112 +451,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "Hiện",
|
||||
"Collapse dialog" => "Thu gọn hộp thoại",
|
||||
"Expand dialog" => "Mở rộng hộp thoại",
|
||||
"Numerical Count" => "Số đếm số",
|
||||
"Minimum" => "Tối thiểu",
|
||||
"Maximum" => "Tối đa",
|
||||
"Circular References: {cell}" => "Tham chiếu vòng: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "Độ rộng: {chars} ({pixels} điểm ảnh)",
|
||||
"Height: {points} ({pixels} pixels)" => "Chiều cao: {points} ({pixels} điểm ảnh)",
|
||||
"Picture in cell" => "Ảnh trong ô",
|
||||
"Picture: {alt}" => "Ảnh: {alt}",
|
||||
"Format Control: {name}" => "Định dạng điều khiển: {name}",
|
||||
"Error at character {position}: {message}" => "Lỗi tại ký tự {position}: {message}",
|
||||
"Macro definitions are not supported in equations." => "Định nghĩa macro không được hỗ trợ trong phương trình.",
|
||||
"A % can't be combined with a link in an equation." => "Không thể kết hợp % với liên kết trong phương trình.",
|
||||
"Equations can nest at most 32 levels deep." => "Phương trình chỉ có thể lồng nhau tối đa 32 cấp.",
|
||||
"An equation can be at most 4096 bytes long." => "Phương trình chỉ có thể dài tối đa 4096 byte.",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => {
|
||||
"Phương trình chỉ có thể có tối đa 2500 ô ma trận (số hàng nhân với hàng rộng nhất)."
|
||||
}
|
||||
"This equation is too large to draw." => "Phương trình này quá lớn để vẽ.",
|
||||
"This equation could not be laid out." => "Không thể dàn trang phương trình này.",
|
||||
"Saved macro “{name}” ({steps} step)" => "Đã lưu macro “{name}” ({steps} bước)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "Đã lưu macro “{name}” ({steps} bước)",
|
||||
"without {key}: another macro took it while recording" => "không có {key}: một macro khác đã dùng phím này khi đang ghi",
|
||||
"Recording stopped" => "Đã dừng ghi",
|
||||
"Macro “{name}” stopped: {message}" => "Macro “{name}” đã dừng: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "Đã chạy macro “{name}” ({steps} bước)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "Đã chạy macro “{name}” ({steps} bước)",
|
||||
"Average" => "Trung bình",
|
||||
"Count" => "Số đếm",
|
||||
"Sum" => "Tổng",
|
||||
"Goal Seeking found a solution: {value}" => "Tìm mục tiêu đã tìm thấy nghiệm: {value}",
|
||||
"Sheets: {sheets}" => "Trang tính: {sheets}",
|
||||
"Hidden: {sheets}" => "Đang ẩn: {sheets}",
|
||||
"Double superscript" => "Chỉ số trên bị lặp",
|
||||
"Double subscript" => "Chỉ số dưới bị lặp",
|
||||
"Extra }" => "Thừa }",
|
||||
"Unexpected end of input in a macro argument" => "Dữ liệu nhập kết thúc bất ngờ trong đối số macro",
|
||||
"Expected \\right after \\left" => "Cần \\right sau \\left",
|
||||
"\\middle must be within \\left and \\right" => "\\middle phải nằm giữa \\left và \\right",
|
||||
"Invalid environment name" => "Tên môi trường không hợp lệ",
|
||||
"Expected \\end after environment body" => "Cần \\end sau phần thân môi trường",
|
||||
"Expected URL" => "Cần URL",
|
||||
"\\tag requires an argument" => "\\tag cần một đối số",
|
||||
"only one infix operator per group" => "Mỗi nhóm chỉ được có một toán tử trung tố",
|
||||
"Expected color token" => "Cần màu",
|
||||
"Expected size for \\raisebox" => "Cần kích thước cho \\raisebox",
|
||||
"Expected size for \\rule width" => "Cần kích thước cho chiều rộng \\rule",
|
||||
"Expected size for \\rule height" => "Cần kích thước cho chiều cao \\rule",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "Không thể dùng cả \\tag và \\nonumber trong cùng một hàng",
|
||||
"Multiple \\tag in a row" => "Nhiều \\tag trong một hàng",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag phải nằm ở cuối hàng, sau phần thân phương trình",
|
||||
"Multiple \\nonumber in a row" => "Nhiều \\nonumber trong một hàng",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber phải nằm ở cuối hàng",
|
||||
"Too many tab characters: &" => "Quá nhiều ký tự tab: &",
|
||||
"Invalid column alignment for array" => "Căn chỉnh cột không hợp lệ cho array",
|
||||
"Expected column alignment character" => "Cần ký tự căn chỉnh cột",
|
||||
"Expected l or c or r" => "Cần l, c hoặc r",
|
||||
"Expected ]" => "Cần ]",
|
||||
"Unexpected end of CD row after @" => "Hàng CD kết thúc bất ngờ sau @",
|
||||
"Invalid column alignment for subarray" => "Căn chỉnh cột không hợp lệ cho subarray",
|
||||
"{subarray} can contain only one column" => "{subarray} chỉ có thể chứa một cột",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree có \\LeftLabel hoặc \\RightLabel mà không có lệnh suy luận theo sau"
|
||||
}
|
||||
"Recursion limit exceeded" => "Vượt quá giới hạn đệ quy",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => {
|
||||
"Quá nhiều lần mở rộng macro: vòng lặp vô hạn hoặc thiết lập maxExpand quá thấp"
|
||||
}
|
||||
"Expected raw style for \\htmlStyle" => "Cần kiểu thô cho \\htmlStyle",
|
||||
"\\verb assertion failed" => "Kiểm tra \\verb không thành công",
|
||||
"Undefined control sequence: {name}" => "Chuỗi điều khiển chưa định nghĩa: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "Cần '{expected}', nhận được '{got}'",
|
||||
"Expected group after '{symbol}'" => "Cần nhóm sau '{symbol}'",
|
||||
"Expected delimiter as argument to '{function}'" => "Cần dấu phân cách làm đối số cho '{function}'",
|
||||
"Expected group as argument to '{function}'" => "Cần nhóm làm đối số cho '{function}'",
|
||||
"Got function '{function}' with no arguments as superscript" => "Hàm '{function}' không có đối số được dùng làm chỉ số trên",
|
||||
"Got function '{function}' with no arguments as subscript" => "Hàm '{function}' không có đối số được dùng làm chỉ số dưới",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => {
|
||||
"Hàm '{function}' không có đối số được dùng làm đối số cho '{parent}'"
|
||||
}
|
||||
"Got function '{function}' with no arguments as \\tag" => "Hàm '{function}' không có đối số được dùng làm \\tag",
|
||||
"Can't use function '{function}' in text mode" => "Không thể dùng hàm '{function}' trong chế độ văn bản",
|
||||
"Can't use function '{function}' in math mode" => "Không thể dùng hàm '{function}' trong chế độ toán",
|
||||
"Invalid color: '{color}'" => "Màu không hợp lệ: '{color}'",
|
||||
"Invalid size: '{size}'" => "Kích thước không hợp lệ: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "Đơn vị không hợp lệ: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "Dấu phân cách '{delimiter}' không hợp lệ sau '{function}'",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "Loại dấu phân cách '{type}' không hợp lệ sau '{function}'",
|
||||
"Invalid delimiter type '{type}'" => "Loại dấu phân cách '{type}' không hợp lệ",
|
||||
"No such environment: {name}" => "Môi trường không xác định: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "Cần đối số cho \\begin{{name}}",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "Không khớp: \\begin{{begin}} được đóng bằng \\end{{end}}",
|
||||
"{command} valid only within array environment" => "{command} chỉ hợp lệ bên trong môi trường array",
|
||||
"Mismatched {command}" => "{command} không có cặp",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "Cần &, \\\\, \\cr hoặc \\end, nhận được '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "Căn chỉnh cột không xác định: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "Quá nhiều công thức trong một hàng: cần {expected}, có {got}",
|
||||
"Unknown CD directive: @{directive}" => "Chỉ thị CD không xác định: @{directive}",
|
||||
"Expected argument for {command}" => "Cần đối số cho {command}",
|
||||
"{command} needs {count} premise(s), but only {available} available" => "{command} cần {count} tiền đề, nhưng chỉ có {available}",
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => {
|
||||
"{command} chỉ hợp lệ như một lệnh bussproofs được hỗ trợ bên trong prooftree"
|
||||
}
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree kết thúc với {count} mục trên ngăn xếp chứng minh, cần 1",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char có đối số không phải số {argument}",
|
||||
"\\@char with invalid code point {code}" => "\\@char có điểm mã không hợp lệ {code}",
|
||||
"Invalid environment name character: {character}" => "Ký tự không hợp lệ trong tên môi trường: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -482,104 +482,6 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
|
||||
"Show" => "显示",
|
||||
"Collapse dialog" => "折叠对话框",
|
||||
"Expand dialog" => "展开对话框",
|
||||
"Numerical Count" => "数值计数",
|
||||
"Minimum" => "最小值",
|
||||
"Maximum" => "最大值",
|
||||
"Circular References: {cell}" => "循环引用: {cell}",
|
||||
"Width: {chars} ({pixels} pixels)" => "宽度: {chars} ({pixels} 像素)",
|
||||
"Height: {points} ({pixels} pixels)" => "高度: {points} ({pixels} 像素)",
|
||||
"Picture in cell" => "单元格中的图片",
|
||||
"Picture: {alt}" => "图片: {alt}",
|
||||
"Format Control: {name}" => "设置控件格式: {name}",
|
||||
"Error at character {position}: {message}" => "第 {position} 个字符处出错: {message}",
|
||||
"Macro definitions are not supported in equations." => "公式中不支持宏定义。",
|
||||
"A % can't be combined with a link in an equation." => "公式中的 % 不能与链接同时使用。",
|
||||
"Equations can nest at most 32 levels deep." => "公式最多只能嵌套 32 层。",
|
||||
"An equation can be at most 4096 bytes long." => "公式最长为 4096 字节。",
|
||||
"An equation can have at most 2500 matrix cells (rows times the widest row)." => "公式最多只能有 2500 个矩阵单元格(行数乘以最宽的行)。",
|
||||
"This equation is too large to draw." => "此公式太大,无法绘制。",
|
||||
"This equation could not be laid out." => "无法排版此公式。",
|
||||
"Saved macro “{name}” ({steps} step)" => "已保存宏“{name}”({steps} 步)",
|
||||
"Saved macro “{name}” ({steps} steps)" => "已保存宏“{name}”({steps} 步)",
|
||||
"without {key}: another macro took it while recording" => "未使用 {key}: 录制时已被另一个宏占用",
|
||||
"Recording stopped" => "已停止录制",
|
||||
"Macro “{name}” stopped: {message}" => "宏“{name}”已停止: {message}",
|
||||
"Ran macro “{name}” ({steps} step)" => "已运行宏“{name}”({steps} 步)",
|
||||
"Ran macro “{name}” ({steps} steps)" => "已运行宏“{name}”({steps} 步)",
|
||||
"Average" => "平均值",
|
||||
"Count" => "计数",
|
||||
"Sum" => "求和",
|
||||
"Goal Seeking found a solution: {value}" => "单变量求解找到一个解: {value}",
|
||||
"Sheets: {sheets}" => "工作表: {sheets}",
|
||||
"Hidden: {sheets}" => "隐藏: {sheets}",
|
||||
"Double superscript" => "上标重复",
|
||||
"Double subscript" => "下标重复",
|
||||
"Extra }" => "多余的 }",
|
||||
"Unexpected end of input in a macro argument" => "宏参数中输入意外结束",
|
||||
"Expected \\right after \\left" => "\\left 之后应有 \\right",
|
||||
"\\middle must be within \\left and \\right" => "\\middle 必须位于 \\left 和 \\right 之间",
|
||||
"Invalid environment name" => "环境名称无效",
|
||||
"Expected \\end after environment body" => "环境主体之后应有 \\end",
|
||||
"Expected URL" => "应为 URL",
|
||||
"\\tag requires an argument" => "\\tag 需要一个参数",
|
||||
"only one infix operator per group" => "每个组只能有一个中缀运算符",
|
||||
"Expected color token" => "应为颜色",
|
||||
"Expected size for \\raisebox" => "\\raisebox 需要尺寸",
|
||||
"Expected size for \\rule width" => "\\rule 的宽度需要尺寸",
|
||||
"Expected size for \\rule height" => "\\rule 的高度需要尺寸",
|
||||
"Cannot use both \\tag and \\nonumber in the same row" => "同一行中不能同时使用 \\tag 和 \\nonumber",
|
||||
"Multiple \\tag in a row" => "一行中有多个 \\tag",
|
||||
"\\tag must appear at the end of the row after the equation body" => "\\tag 必须位于行尾、公式主体之后",
|
||||
"Multiple \\nonumber in a row" => "一行中有多个 \\nonumber",
|
||||
"\\nonumber must appear at the end of the row" => "\\nonumber 必须位于行尾",
|
||||
"Too many tab characters: &" => "制表符过多: &",
|
||||
"Invalid column alignment for array" => "array 的列对齐方式无效",
|
||||
"Expected column alignment character" => "应为列对齐字符",
|
||||
"Expected l or c or r" => "应为 l、c 或 r",
|
||||
"Expected ]" => "应为 ]",
|
||||
"Unexpected end of CD row after @" => "CD 行在 @ 之后意外结束",
|
||||
"Invalid column alignment for subarray" => "subarray 的列对齐方式无效",
|
||||
"{subarray} can contain only one column" => "{subarray} 只能包含一列",
|
||||
"prooftree has a \\LeftLabel or \\RightLabel without a following inference command" => {
|
||||
"prooftree 中的 \\LeftLabel 或 \\RightLabel 之后没有推理命令"
|
||||
}
|
||||
"Recursion limit exceeded" => "超出递归限制",
|
||||
"Too many expansions: infinite loop or need to increase maxExpand setting" => "宏展开次数过多: 无限循环或 maxExpand 设置过小",
|
||||
"Expected raw style for \\htmlStyle" => "\\htmlStyle 需要原始样式",
|
||||
"\\verb assertion failed" => "\\verb 检查失败",
|
||||
"Undefined control sequence: {name}" => "未定义的控制序列: {name}",
|
||||
"Expected '{expected}', got '{got}'" => "应为 '{expected}',实际为 '{got}'",
|
||||
"Expected group after '{symbol}'" => "'{symbol}' 之后应有组",
|
||||
"Expected delimiter as argument to '{function}'" => "'{function}' 的参数应为分隔符",
|
||||
"Expected group as argument to '{function}'" => "'{function}' 的参数应为组",
|
||||
"Got function '{function}' with no arguments as superscript" => "无参数的函数 '{function}' 被用作上标",
|
||||
"Got function '{function}' with no arguments as subscript" => "无参数的函数 '{function}' 被用作下标",
|
||||
"Got function '{function}' with no arguments as argument to '{parent}'" => "无参数的函数 '{function}' 被用作 '{parent}' 的参数",
|
||||
"Got function '{function}' with no arguments as \\tag" => "无参数的函数 '{function}' 被用作 \\tag",
|
||||
"Can't use function '{function}' in text mode" => "函数 '{function}' 不能在文本模式中使用",
|
||||
"Can't use function '{function}' in math mode" => "函数 '{function}' 不能在数学模式中使用",
|
||||
"Invalid color: '{color}'" => "颜色无效: '{color}'",
|
||||
"Invalid size: '{size}'" => "尺寸无效: '{size}'",
|
||||
"Invalid unit: '{unit}'" => "单位无效: '{unit}'",
|
||||
"Invalid delimiter '{delimiter}' after '{function}'" => "'{function}' 之后的分隔符 '{delimiter}' 无效",
|
||||
"Invalid delimiter type '{type}' after '{function}'" => "'{function}' 之后的分隔符类型 '{type}' 无效",
|
||||
"Invalid delimiter type '{type}'" => "分隔符类型 '{type}' 无效",
|
||||
"No such environment: {name}" => "未知环境: {name}",
|
||||
"Expected argument to \\begin{{name}}" => "\\begin{{name}} 需要参数",
|
||||
"Mismatch: \\begin{{begin}} matched by \\end{{end}}" => "不匹配: \\begin{{begin}} 由 \\end{{end}} 结束",
|
||||
"{command} valid only within array environment" => "{command} 仅在 array 环境中有效",
|
||||
"Mismatched {command}" => "{command} 没有配对",
|
||||
"Expected & or \\\\ or \\cr or \\end, got '{got}'" => "应为 &、\\\\、\\cr 或 \\end,实际为 '{got}'",
|
||||
"Unknown column alignment: {alignment}" => "未知的列对齐方式: {alignment}",
|
||||
"Too many math in a row: expected {expected}, but got {got}" => "一行中的公式过多: 应为 {expected} 个,实际为 {got} 个",
|
||||
"Unknown CD directive: @{directive}" => "未知的 CD 指令: @{directive}",
|
||||
"Expected argument for {command}" => "{command} 需要参数",
|
||||
"{command} needs {count} premise(s), but only {available} available" => "{command} 需要 {count} 个前提,但只有 {available} 个",
|
||||
"{command} valid only as a supported bussproofs command within prooftree" => "{command} 在 prooftree 中只能作为受支持的 bussproofs 命令使用",
|
||||
"prooftree ended with {count} proof stack item(s), expected 1" => "prooftree 结束时证明栈中有 {count} 项,应为 1 项",
|
||||
"\\@char has non-numeric argument {argument}" => "\\@char 的参数 {argument} 不是数字",
|
||||
"\\@char with invalid code point {code}" => "\\@char 的码位 {code} 无效",
|
||||
"Invalid environment name character: {character}" => "环境名称中有无效字符: {character}",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -89,16 +89,13 @@ pub fn stop_recording(app: &mut SheetApp) {
|
||||
Some(name) => {
|
||||
let steps = v["steps"].as_u64().unwrap_or(0);
|
||||
app.macros.note_recent(name);
|
||||
let lang = app.ui.language;
|
||||
let saved = if steps == 1 { "Saved macro “{name}” ({steps} step)" } else { "Saved macro “{name}” ({steps} steps)" };
|
||||
let mut text = lang.tr_fill(saved, &[("name", name), ("steps", &steps.to_string())]);
|
||||
let mut text = format!("Saved macro “{name}” ({steps} step{})", if steps == 1 { "" } else { "s" });
|
||||
if let Some(k) = v["shortcutDropped"].as_str() {
|
||||
text.push(' ');
|
||||
text.push_str(&lang.tr_fill("without {key}: another macro took it while recording", &[("key", k)]));
|
||||
text.push_str(&format!(" without {k}: another macro took it while recording"));
|
||||
}
|
||||
app.toast = Some((text, crate::now_ms()));
|
||||
}
|
||||
None => app.toast = Some((app.ui.language.tr("Recording stopped").into(), crate::now_ms())),
|
||||
None => app.toast = Some(("Recording stopped".into(), crate::now_ms())),
|
||||
},
|
||||
Err(e) => app.message = Some(("Record Macro".into(), crate::clean_error(&e))),
|
||||
}
|
||||
@@ -177,13 +174,9 @@ pub fn note_result(app: &mut SheetApp, id: &str, params: &Json, v: &Json) {
|
||||
}
|
||||
app.macros.note_recent(&name);
|
||||
let ran = v["ran"].as_u64().unwrap_or(0);
|
||||
let lang = app.ui.language;
|
||||
let text = match v["stopped"].as_str() {
|
||||
Some(msg) => lang.tr_fill("Macro “{name}” stopped: {message}", &[("name", &name), ("message", msg)]),
|
||||
None => {
|
||||
let ran_text = if ran == 1 { "Ran macro “{name}” ({steps} step)" } else { "Ran macro “{name}” ({steps} steps)" };
|
||||
lang.tr_fill(ran_text, &[("name", &name), ("steps", &ran.to_string())])
|
||||
}
|
||||
Some(msg) => format!("Macro “{name}” stopped: {msg}"),
|
||||
None => format!("Ran macro “{name}” ({ran} step{})", if ran == 1 { "" } else { "s" }),
|
||||
};
|
||||
app.toast = Some((text, crate::now_ms()));
|
||||
}
|
||||
@@ -680,54 +673,6 @@ pub fn record_dialog(app: &mut SheetApp, ui: &mut Ui, d: &mut Dialog, open: &mut
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn macro_toasts_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::Session;
|
||||
let mut session = Session::new();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
let ran = |app: &mut SheetApp, v: Json| {
|
||||
note_result(app, "macro.run", &json!({}), &v);
|
||||
app.toast.take().map(|t| t.0).unwrap_or_default()
|
||||
};
|
||||
assert_eq!(ran(&mut app, json!({"macro": "M", "ran": 1})), "Ran macro “M” (1 step)");
|
||||
assert_eq!(ran(&mut app, json!({"macro": "M", "ran": 2})), "Ran macro “M” (2 steps)");
|
||||
assert_eq!(ran(&mut app, json!({"macro": "M", "stopped": "Oops"})), "Macro “M” stopped: Oops");
|
||||
let it = Language::It;
|
||||
app.ui.language = it;
|
||||
// A name holding a placeholder is shown as it is.
|
||||
let want = it.tr("Ran macro “{name}” ({steps} steps)").replace("{steps}", "2").replace("{name}", "{steps}");
|
||||
assert_eq!(ran(&mut app, json!({"macro": "{steps}", "ran": 2})), want);
|
||||
assert_ne!(want, "Ran macro “{steps}” (2 steps)");
|
||||
let want = it.tr("Ran macro “{name}” ({steps} step)").replace("{name}", "M").replace("{steps}", "1");
|
||||
assert_eq!(ran(&mut app, json!({"macro": "M", "ran": 1})), want);
|
||||
let want = it.tr("Macro “{name}” stopped: {message}").replace("{name}", "M").replace("{message}", "Oops");
|
||||
assert_eq!(ran(&mut app, json!({"macro": "M", "stopped": "Oops"})), want);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn recording_toasts_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
use gridcraft_engine::Session;
|
||||
let mut session = Session::new();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
app.run("macro.record", json!({"name": "Two"})).unwrap();
|
||||
app.run("cell.set", json!({"cell": "A1", "input": "1"})).unwrap();
|
||||
app.run("cell.set", json!({"cell": "A2", "input": "2"})).unwrap();
|
||||
stop_recording(&mut app);
|
||||
assert_eq!(app.toast.take().map(|t| t.0).as_deref(), Some("Saved macro “Two” (2 steps)"));
|
||||
let it = Language::It;
|
||||
app.ui.language = it;
|
||||
app.run("macro.record", json!({"name": "Rec"})).unwrap();
|
||||
app.run("cell.set", json!({"cell": "A1", "input": "1"})).unwrap();
|
||||
stop_recording(&mut app);
|
||||
let want = it.tr("Saved macro “{name}” ({steps} step)").replace("{name}", "Rec").replace("{steps}", "1");
|
||||
assert_eq!(app.toast.take().map(|t| t.0).as_deref(), Some(want.as_str()));
|
||||
assert!(!want.starts_with("Saved macro"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn questions_are_read_from_the_error() {
|
||||
let e = "approve: Run macro 'M'? It came with a workbook you opened. (run again with `approve: true`)";
|
||||
|
||||
@@ -417,8 +417,8 @@ pub fn status_bar(app: &mut SheetApp, ui: &mut Ui) {
|
||||
ui.add_space(12.0);
|
||||
// Only a loop on the active sheet is named, so the address needs no sheet.
|
||||
let label = match d.calc.circular.iter().find(|(si, _)| *si == d.wb.active_sheet()) {
|
||||
Some((_, c)) => app.ui.language.tr_fill("Circular References: {cell}", &[("cell", &c.a1())]),
|
||||
None => app.ui.language.tr("Circular References").to_owned(),
|
||||
Some((_, c)) => format!("Circular References: {}", c.a1()),
|
||||
None => "Circular References".to_owned(),
|
||||
};
|
||||
text(ui, egui::RichText::new(label).font(theme::ui_font(12.5)).color(t.danger));
|
||||
}
|
||||
@@ -516,30 +516,26 @@ pub(crate) fn selection_statistics(app: &SheetApp) -> Vec<String> {
|
||||
let code = if code == "General" { "#,##0.##########".to_string() } else { code };
|
||||
gridcraft_engine::display::format(&gridcraft_engine::core::Value::Number(v), &code, &d.wb).text.trim_end_matches('.').to_string()
|
||||
};
|
||||
// The label the right-click menu shows, then the value: clicking a statistic copies the part
|
||||
// after `": "`.
|
||||
let lang = app.ui.language;
|
||||
let part = |label: &str, value: String| format!("{}: {value}", lang.tr(label));
|
||||
let mut parts = Vec::new();
|
||||
if on.average
|
||||
&& let Some(a) = st.average
|
||||
{
|
||||
parts.push(part("Average", fmt(a)));
|
||||
parts.push(format!("Average: {}", fmt(a)));
|
||||
}
|
||||
if on.count && st.count > 0 {
|
||||
parts.push(part("Count", st.count.to_string()));
|
||||
parts.push(format!("Count: {}", st.count));
|
||||
}
|
||||
if on.numerical_count && st.count > 0 {
|
||||
parts.push(part("Numerical Count", st.numeric.to_string()));
|
||||
parts.push(format!("Numerical Count: {}", st.numeric));
|
||||
}
|
||||
if on.minimum && st.numeric > 0 {
|
||||
parts.push(part("Minimum", fmt(st.min)));
|
||||
parts.push(format!("Minimum: {}", fmt(st.min)));
|
||||
}
|
||||
if on.maximum && st.numeric > 0 {
|
||||
parts.push(part("Maximum", fmt(st.max)));
|
||||
parts.push(format!("Maximum: {}", fmt(st.max)));
|
||||
}
|
||||
if on.sum && st.numeric > 0 {
|
||||
parts.push(part("Sum", fmt(st.sum)));
|
||||
parts.push(format!("Sum: {}", fmt(st.sum)));
|
||||
}
|
||||
parts
|
||||
}
|
||||
@@ -590,26 +586,6 @@ mod tests {
|
||||
app.session.active().unwrap().wb.sheets.iter().map(|s| s.name.clone()).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn status_bar_statistics_follow_the_interface_language() {
|
||||
use crate::i18n::Language;
|
||||
let mut session = gridcraft_engine::Session::default();
|
||||
session.new_workbook();
|
||||
let mut app = SheetApp::new(session, Default::default());
|
||||
for (cell, input) in [("A1", "1"), ("A2", "2"), ("A3", "3")] {
|
||||
app.run("cell.set", json!({"cell": cell, "input": input})).unwrap();
|
||||
}
|
||||
app.run("selection.set", json!({"range": "A1:A3"})).unwrap();
|
||||
app.run("view.statusBar", json!({"numericalCount": true, "minimum": true, "maximum": true})).unwrap();
|
||||
let parts = [("Average", "2"), ("Count", "3"), ("Numerical Count", "3"), ("Minimum", "1"), ("Maximum", "3"), ("Sum", "6")];
|
||||
let english: Vec<String> = parts.iter().map(|(label, value)| format!("{label}: {value}")).collect();
|
||||
assert_eq!(super::selection_statistics(&app), english);
|
||||
app.ui.language = Language::It;
|
||||
let italian: Vec<String> = parts.iter().map(|(label, value)| format!("{}: {value}", Language::It.tr(label))).collect();
|
||||
assert_eq!(super::selection_statistics(&app), italian, "each label as the right-click menu shows it");
|
||||
assert!(italian.iter().zip(&english).all(|(it, en)| it != en), "the Italian catalog translates every label: {italian:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn status_bar_shows_the_statistics_that_are_turned_on_in_order() {
|
||||
let mut session = gridcraft_engine::Session::default();
|
||||
|
||||
@@ -23,8 +23,6 @@ craft-csv = { workspace = true }
|
||||
craft-offcrypto = { workspace = true }
|
||||
craft-opc = { workspace = true }
|
||||
craft-xls = { workspace = true }
|
||||
craft-xml = { workspace = true }
|
||||
craft-xlsx = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
quick-xml = { workspace = true }
|
||||
zip = { workspace = true }
|
||||
|
||||
@@ -342,9 +342,6 @@ fn first_run_color(e: &El, depth: usize) -> Option<Color> {
|
||||
|
||||
// ---------------------------------------------------------------- writing
|
||||
|
||||
/// The size, in points, of the plain-text box that stands in for an equation.
|
||||
const PLAIN_TEXT_PT: f32 = 11.0;
|
||||
|
||||
/// An equation shape (inside the anchor): Office Math with a plain-text fallback when the source
|
||||
/// is in the subset OMML covers, else the plain-text box alone. Both carry the source.
|
||||
fn write_equation(s: &mut String, sh: &Shape, id: usize, theme: &Theme) {
|
||||
@@ -379,11 +376,7 @@ fn write_equation(s: &mut String, sh: &Shape, id: usize, theme: &Theme) {
|
||||
xfrm(&sh.anchor, "a:xfrm")
|
||||
)
|
||||
};
|
||||
// The plain text is the LaTeX source, much wider than the typeset equation: at the equation's
|
||||
// size it would overflow the frame in Excel, so it uses a normal text size (11 pt, Excel's
|
||||
// default for a text box), smaller only when the frame itself is.
|
||||
let plain_sz = (size_pt.min(PLAIN_TEXT_PT) * 100.0).round() as u32;
|
||||
let plain = plain_paragraphs(&sh.text, &format!("<a:rPr lang=\"en-US\" sz=\"{plain_sz}\">{fill}</a:rPr>"));
|
||||
let plain = plain_paragraphs(&sh.text, &format!("<a:rPr lang=\"en-US\" sz=\"{sz}\">{fill}</a:rPr>"));
|
||||
match gridcraft_math::to_omml(&sh.text, size_pt, sh.line.resolve(theme)) {
|
||||
Ok(omml) => {
|
||||
let math = format!(
|
||||
|
||||
@@ -267,8 +267,6 @@ pub fn read_sheet(cx: &mut Ctx<'_>, part: &str, name: &str) -> Result<(Sheet, cr
|
||||
}
|
||||
// `downThenOver` when absent (ECMA-376's default); an unknown value reads as that too.
|
||||
sheet.print.page_order = e.attr("pageOrder").and_then(PageOrder::parse).unwrap_or_default();
|
||||
// The number counts only when `useFirstPageNumber` says so; otherwise it's Automatic.
|
||||
sheet.print.first_page_number = e.flag("useFirstPageNumber", false).then(|| e.attr_u32("firstPageNumber")).flatten();
|
||||
if let Some(p) = e.attr_u32("paperSize").and_then(paper_name) {
|
||||
sheet.print.paper = p.to_string();
|
||||
}
|
||||
|
||||
@@ -409,9 +409,6 @@ fn write_sheet_printing<'a>(s: &mut String, sheet: &'a Sheet, rels: &mut Rels, o
|
||||
if p.scale != 100 && (10..=400).contains(&p.scale) {
|
||||
let _ = write!(s, " scale=\"{}\"", p.scale);
|
||||
}
|
||||
if let Some(n) = p.first_page_number {
|
||||
let _ = write!(s, " firstPageNumber=\"{n}\"");
|
||||
}
|
||||
if let Some((w, h)) = p.fit_to {
|
||||
let _ = write!(s, " fitToWidth=\"{w}\" fitToHeight=\"{h}\"");
|
||||
}
|
||||
@@ -420,10 +417,6 @@ fn write_sheet_printing<'a>(s: &mut String, sheet: &'a Sheet, rels: &mut Rels, o
|
||||
let _ = write!(s, " pageOrder=\"{}\"", p.page_order.id());
|
||||
}
|
||||
let _ = write!(s, " orientation=\"{}\"", if p.orientation == Orientation::Landscape { "landscape" } else { "portrait" });
|
||||
// In the schema's attribute order, as Excel writes it: after the orientation.
|
||||
if p.first_page_number.is_some() {
|
||||
s.push_str(" useFirstPageNumber=\"1\"");
|
||||
}
|
||||
if let Some(id) = kept.page_setup_id() {
|
||||
let _ = write!(s, " r:id=\"{id}\"");
|
||||
}
|
||||
|
||||
@@ -142,27 +142,27 @@ pub(super) fn table_xml(t: &Table, cols: &[String], name: &str, id: u32, out: &m
|
||||
}
|
||||
let _ = write!(s, " name=\"{}\"", esc_attr(&encode_xstring(name)));
|
||||
let totals = col.map(|c| c.totals).unwrap_or_default();
|
||||
// A hidden Total Row keeps each column's calculation, as Excel's files do: turning the row
|
||||
// back on restores it (#4296). The reader takes them whether the row is shown or not.
|
||||
let f = match totals {
|
||||
TotalsFn::None => None,
|
||||
TotalsFn::Average => Some("average"),
|
||||
TotalsFn::Count => Some("count"),
|
||||
TotalsFn::CountNums => Some("countNums"),
|
||||
TotalsFn::Max => Some("max"),
|
||||
TotalsFn::Min => Some("min"),
|
||||
TotalsFn::Sum => Some("sum"),
|
||||
TotalsFn::StdDev => Some("stdDev"),
|
||||
TotalsFn::Var => Some("var"),
|
||||
TotalsFn::Custom => Some("custom"),
|
||||
};
|
||||
if let Some(f) = f {
|
||||
let _ = write!(s, " totalsRowFunction=\"{f}\"");
|
||||
} else if let Some(l) = col.and_then(|c| c.totals_label.as_ref()) {
|
||||
let _ = write!(s, " totalsRowLabel=\"{}\"", esc_attr(l));
|
||||
if t.totals_row {
|
||||
let f = match totals {
|
||||
TotalsFn::None => None,
|
||||
TotalsFn::Average => Some("average"),
|
||||
TotalsFn::Count => Some("count"),
|
||||
TotalsFn::CountNums => Some("countNums"),
|
||||
TotalsFn::Max => Some("max"),
|
||||
TotalsFn::Min => Some("min"),
|
||||
TotalsFn::Sum => Some("sum"),
|
||||
TotalsFn::StdDev => Some("stdDev"),
|
||||
TotalsFn::Var => Some("var"),
|
||||
TotalsFn::Custom => Some("custom"),
|
||||
};
|
||||
if let Some(f) = f {
|
||||
let _ = write!(s, " totalsRowFunction=\"{f}\"");
|
||||
} else if let Some(l) = col.and_then(|c| c.totals_label.as_ref()) {
|
||||
let _ = write!(s, " totalsRowLabel=\"{}\"", esc_attr(l));
|
||||
}
|
||||
}
|
||||
let calc = col.and_then(|c| c.formula.as_ref()).filter(|f| !f.is_empty());
|
||||
let custom = if totals == TotalsFn::Custom { col.and_then(|c| c.totals_label.as_ref()) } else { None };
|
||||
let custom = if t.totals_row && totals == TotalsFn::Custom { col.and_then(|c| c.totals_label.as_ref()) } else { None };
|
||||
let xml = col.and_then(|c| c.xml.as_ref());
|
||||
if calc.is_none() && custom.is_none() && xml.is_none() {
|
||||
s.push_str("/>");
|
||||
|
||||
@@ -469,18 +469,3 @@ fn a_paragraph_split_in_an_equation_without_office_math_reads_back_as_the_edit()
|
||||
// back is the source with a newline after that space, and nothing else moved or dropped.
|
||||
assert_eq!(s[0].text, cd.replacen(' ', " \n", 1), "the split text, exactly");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_plain_text_stand_in_for_an_equation_is_drawn_at_a_normal_size() {
|
||||
// A source Office Math cannot hold is saved as the text box alone; a source it can hold has
|
||||
// the same box as its fallback. Neither takes the (large) size the equation is drawn at.
|
||||
let wb = book(vec![equation(1, "B2", "\\begin{CD} A @>f>> B \\end{CD}", Color::Auto), equation(2, "B8", "x^2", Color::Auto)]);
|
||||
let d = drawing(&unzip(&write_xlsx(&wb).unwrap()));
|
||||
let text_runs: Vec<&str> = d.match_indices("<a:r><a:rPr").map(|(i, _)| &d[i..i + d[i..].find("</a:rPr>").unwrap()]).collect();
|
||||
assert_eq!(text_runs.len(), 2, "{d}");
|
||||
for r in text_runs {
|
||||
assert!(r.contains(" sz=\"1100\""), "{r}");
|
||||
}
|
||||
// The Office Math box keeps the size of the equation.
|
||||
assert!(!d.contains("<a:endParaRPr lang=\"en-US\" sz=\"1100\"/>"), "{d}");
|
||||
}
|
||||
|
||||
@@ -73,39 +73,3 @@ fn page_margins_are_written_as_their_decimals() {
|
||||
let xml = sheet_xml(&write_xlsx(&Workbook::new()).unwrap());
|
||||
assert!(xml.contains(r#"<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>"#), "{xml}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn first_page_number_is_read_and_written_back() {
|
||||
// #4293: Excel writes Page Setup's First page number 7 as these two attributes; both were lost.
|
||||
let body = r#"<sheetData/><pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/><pageSetup paperSize="9" firstPageNumber="7" orientation="portrait" useFirstPageNumber="1"/>"#;
|
||||
let (wb, _) = read_xlsx(&minimal(body, &[], "", "")).unwrap();
|
||||
assert_eq!(wb.sheet(0).unwrap().print.first_page_number, Some(7));
|
||||
let bytes = write_xlsx(&wb).unwrap();
|
||||
let xml = sheet_xml(&bytes);
|
||||
assert_eq!(page_setup(&xml), r#"<pageSetup paperSize="9" firstPageNumber="7" orientation="portrait" useFirstPageNumber="1"/>"#);
|
||||
let (back, _) = read_xlsx(&bytes).unwrap();
|
||||
assert_eq!(back.sheet(0).unwrap().print.first_page_number, Some(7));
|
||||
// In the schema's order with the other attributes: after the scale, before Fit To.
|
||||
let mut wb = back;
|
||||
wb.sheet_mut(0).unwrap().print.scale = 80;
|
||||
wb.sheet_mut(0).unwrap().print.fit_to = Some((1, 2));
|
||||
let xml = sheet_xml(&write_xlsx(&wb).unwrap());
|
||||
assert!(page_setup(&xml).contains(r#"scale="80" firstPageNumber="7" fitToWidth="1""#), "{xml}");
|
||||
// Automatic: no number, a number Excel keeps without using it, and `useFirstPageNumber="0"`.
|
||||
for body in [
|
||||
r#"<sheetData/><pageSetup paperSize="9" orientation="portrait"/>"#,
|
||||
r#"<sheetData/><pageSetup paperSize="9" firstPageNumber="5" orientation="portrait"/>"#,
|
||||
r#"<sheetData/><pageSetup paperSize="9" firstPageNumber="5" orientation="portrait" useFirstPageNumber="0"/>"#,
|
||||
"<sheetData/>",
|
||||
] {
|
||||
let (wb, _) = read_xlsx(&minimal(body, &[], "", "")).unwrap();
|
||||
assert_eq!(wb.sheet(0).unwrap().print.first_page_number, None, "{body}");
|
||||
let xml = sheet_xml(&write_xlsx(&wb).unwrap());
|
||||
assert!(!xml.contains("irstPageNumber"), "{body}: {xml}");
|
||||
}
|
||||
// 1 is a number of its own (Excel's field shows 1, not Automatic) and is kept too.
|
||||
let mut wb = Workbook::new();
|
||||
wb.sheet_mut(0).unwrap().print.first_page_number = Some(1);
|
||||
let xml = sheet_xml(&write_xlsx(&wb).unwrap());
|
||||
assert!(xml.contains(r#"firstPageNumber="1""#) && xml.contains(r#"useFirstPageNumber="1""#), "{xml}");
|
||||
}
|
||||
|
||||
@@ -116,7 +116,6 @@ fn workbook() -> Workbook {
|
||||
show_headers: false,
|
||||
last_range: Some(rr("A2:H12")),
|
||||
calculated_fields: vec![],
|
||||
data_index: Default::default(),
|
||||
values_on_rows: false,
|
||||
values_position: None,
|
||||
};
|
||||
@@ -177,7 +176,6 @@ fn workbook() -> Workbook {
|
||||
show_headers: true,
|
||||
last_range: Some(rr("K2:Z30")),
|
||||
calculated_fields: vec![],
|
||||
data_index: Default::default(),
|
||||
values_on_rows: false,
|
||||
values_position: None,
|
||||
};
|
||||
|
||||
@@ -310,7 +310,6 @@ fn sample() -> Workbook {
|
||||
hf_scale_with_doc: false,
|
||||
hf_align_with_margins: true,
|
||||
page_order: PageOrder::OverThenDown,
|
||||
first_page_number: Some(7),
|
||||
};
|
||||
s.sparklines.push(Sparkline { cell: at("J2"), source: "B2:B3".into(), kind: SparklineKind::WinLoss, color: Color::Rgb(0x112233), markers: true });
|
||||
s.tables.push(Table {
|
||||
@@ -1407,76 +1406,6 @@ fn table_newline_column_and_backslash_name_survive() {
|
||||
assert!(gridcraft_formula::parse("COUNTA(\\_Prime.1[Name])").is_ok(), "backslash table name parses as a structured reference");
|
||||
}
|
||||
|
||||
/// #4296: a table whose Total Row is turned off keeps each column's calculation in the file, as
|
||||
/// Excel writes it, so turning the row back on in Excel restores a custom formula or Average.
|
||||
#[test]
|
||||
fn hidden_total_row_keeps_its_calculations() {
|
||||
let col = |name: &str, totals: TotalsFn, label: Option<&str>| TableColumn {
|
||||
name: name.into(),
|
||||
totals,
|
||||
totals_label: label.map(str::to_string),
|
||||
formula: None,
|
||||
unique_name: None,
|
||||
xml: None,
|
||||
};
|
||||
let mut wb = Workbook::new();
|
||||
let s = wb.sheet_mut(0).unwrap();
|
||||
s.tables.push(Table {
|
||||
id: 1,
|
||||
name: "Table1".into(),
|
||||
range: rr("A1:C3"),
|
||||
header_row: true,
|
||||
totals_row: false,
|
||||
columns: vec![
|
||||
col("Group", TotalsFn::None, Some("Total")),
|
||||
col("Amount", TotalsFn::Custom, Some("SUM(B2:B3)+10")),
|
||||
col("Mean", TotalsFn::Average, None),
|
||||
],
|
||||
style: "TableStyleMedium2".into(),
|
||||
banded_rows: true,
|
||||
banded_cols: false,
|
||||
first_col: false,
|
||||
last_col: false,
|
||||
filter_button: true,
|
||||
filter: vec![],
|
||||
table_type: None,
|
||||
connection_id: None,
|
||||
});
|
||||
let bytes = write_xlsx(&wb).unwrap();
|
||||
let mut xml = String::new();
|
||||
zip::ZipArchive::new(std::io::Cursor::new(&bytes)).unwrap().by_name("xl/tables/table1.xml").unwrap().read_to_string(&mut xml).unwrap();
|
||||
// Still a table without a total row: no totalsRowCount, and its range unchanged.
|
||||
assert!(xml.contains(r#"ref="A1:C3""#) && xml.contains(r#"totalsRowShown="0""#) && !xml.contains("totalsRowCount"), "{xml}");
|
||||
for part in [
|
||||
r#"name="Group" totalsRowLabel="Total"/>"#,
|
||||
r#"name="Amount" totalsRowFunction="custom"><totalsRowFormula>SUM(B2:B3)+10</totalsRowFormula></tableColumn>"#,
|
||||
r#"name="Mean" totalsRowFunction="average"/>"#,
|
||||
] {
|
||||
assert!(xml.contains(part), "{part}: {xml}");
|
||||
}
|
||||
let (back, report) = read_xlsx(&bytes).unwrap();
|
||||
assert!(report.warnings.is_empty(), "{:?}", report.warnings);
|
||||
let t = &back.sheet(0).unwrap().tables[0];
|
||||
assert!(!t.totals_row);
|
||||
assert_eq!(t.range.a1(), "A1:C3");
|
||||
let got: Vec<_> = t.columns.iter().map(|c| (c.totals, c.totals_label.clone())).collect();
|
||||
assert_eq!(got, vec![(TotalsFn::None, Some("Total".into())), (TotalsFn::Custom, Some("SUM(B2:B3)+10".into())), (TotalsFn::Average, None)]);
|
||||
// A table that never had a total row writes no calculation.
|
||||
let mut plain = wb.clone();
|
||||
plain.sheet_mut(0).unwrap().tables[0].columns =
|
||||
vec![col("Group", TotalsFn::None, None), col("Amount", TotalsFn::None, None), col("Mean", TotalsFn::None, None)];
|
||||
let mut xml = String::new();
|
||||
zip::ZipArchive::new(std::io::Cursor::new(write_xlsx(&plain).unwrap()))
|
||||
.unwrap()
|
||||
.by_name("xl/tables/table1.xml")
|
||||
.unwrap()
|
||||
.read_to_string(&mut xml)
|
||||
.unwrap();
|
||||
for attr in ["totalsRowFunction", "totalsRowLabel", "totalsRowFormula"] {
|
||||
assert!(!xml.contains(attr), "{attr}: {xml}");
|
||||
}
|
||||
}
|
||||
|
||||
/// A table that is only a header row and a totals row (Insert Table on one row, then Total
|
||||
/// Row) is written like the header-only and one-data-row shapes, not dropped on save.
|
||||
#[test]
|
||||
|
||||
+112
-47
@@ -359,10 +359,31 @@ pub fn parse_streaming(xml: &[u8], split: &[&str], cb: &mut dyn FnMut(El) -> Res
|
||||
|
||||
// ---------------------------------------------------------------- writing helpers
|
||||
|
||||
// XML escaping and SpreadsheetML strings are shared; phonetic/model mapping stays here.
|
||||
pub use craft_xml::{esc, esc_attr};
|
||||
#[cfg(test)]
|
||||
use craft_xml::{is_xml_char, push_esc};
|
||||
/// Escapes text content.
|
||||
pub fn esc(s: &str) -> String {
|
||||
let mut o = String::with_capacity(s.len());
|
||||
push_esc(&mut o, s);
|
||||
o
|
||||
}
|
||||
|
||||
/// Appends [`esc`]`(s)` to `o`.
|
||||
pub fn push_esc(o: &mut String, s: &str) {
|
||||
if s.bytes().all(|b| matches!(b, b'\t' | b'\n' | 0x20..=0x7E) && !matches!(b, b'&' | b'<' | b'>')) {
|
||||
o.push_str(s);
|
||||
return;
|
||||
}
|
||||
o.reserve(s.len());
|
||||
for c in s.chars() {
|
||||
match c {
|
||||
'&' => o.push_str("&"),
|
||||
'<' => o.push_str("<"),
|
||||
'>' => o.push_str(">"),
|
||||
'\r' => o.push_str(" "),
|
||||
c if is_xml_char(c) => o.push(c),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Appends `n` in decimal.
|
||||
pub fn push_u64(o: &mut String, mut n: u64) {
|
||||
@@ -401,8 +422,93 @@ pub fn push_a1(o: &mut String, c: gridcraft_core::CellRef) {
|
||||
push_u64(o, u64::from(c.row) + 1);
|
||||
}
|
||||
|
||||
// Existing call sites and regression coverage use the production shared codec.
|
||||
pub use craft_xlsx::{decode_xstring, encode_xstring};
|
||||
/// Escapes an attribute value (double-quoted).
|
||||
pub fn esc_attr(s: &str) -> String {
|
||||
let mut o = String::with_capacity(s.len());
|
||||
for c in s.chars() {
|
||||
match c {
|
||||
'&' => o.push_str("&"),
|
||||
'<' => o.push_str("<"),
|
||||
'>' => o.push_str(">"),
|
||||
'"' => o.push_str("""),
|
||||
'\n' => o.push_str(" "),
|
||||
'\r' => o.push_str(" "),
|
||||
'\t' => o.push_str("	"),
|
||||
c if is_xml_char(c) => o.push(c),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
o
|
||||
}
|
||||
|
||||
fn is_xml_char(c: char) -> bool {
|
||||
matches!(c, '\t' | '\n' | '\r' | '\u{20}'..='\u{D7FF}' | '\u{E000}'..='\u{FFFD}' | '\u{10000}'..='\u{10FFFF}')
|
||||
}
|
||||
|
||||
/// ST_Xstring encoding for cell text: characters XML can't carry and carriage returns become
|
||||
/// `_xHHHH_`, and literal `_xHHHH_` sequences are protected with `_x005F_`. The result still needs
|
||||
/// [`esc`].
|
||||
pub fn encode_xstring(s: &str) -> String {
|
||||
let mut o = String::with_capacity(s.len());
|
||||
let chars: Vec<char> = s.chars().collect();
|
||||
for (i, &c) in chars.iter().enumerate() {
|
||||
if c == '_' && looks_like_escape(&chars, i) {
|
||||
o.push_str("_x005F_");
|
||||
} else if !is_xml_char(c) || (c.is_control() && !matches!(c, '\t' | '\n')) {
|
||||
o.push_str(&format!("_x{:04X}_", c as u32 & 0xFFFF));
|
||||
} else {
|
||||
o.push(c);
|
||||
}
|
||||
}
|
||||
o
|
||||
}
|
||||
|
||||
fn looks_like_escape(chars: &[char], i: usize) -> bool {
|
||||
chars.get(i + 1) == Some(&'x') && chars.get(i + 6) == Some(&'_') && (i + 2..i + 6).all(|k| chars.get(k).is_some_and(char::is_ascii_hexdigit))
|
||||
}
|
||||
|
||||
fn escape_unit(chars: &[char], i: usize) -> Option<u32> {
|
||||
let hex: String = chars.get(i + 2..i + 6)?.iter().collect();
|
||||
u32::from_str_radix(&hex, 16).ok()
|
||||
}
|
||||
|
||||
/// The character for a high surrogate escape at `i` (value `high`) followed directly by a low surrogate escape.
|
||||
fn surrogate_pair(chars: &[char], i: usize, high: u32) -> Option<char> {
|
||||
if !(0xD800..=0xDBFF).contains(&high) || chars.get(i + 7) != Some(&'_') || !looks_like_escape(chars, i + 7) {
|
||||
return None;
|
||||
}
|
||||
let low = escape_unit(chars, i + 7).filter(|l| (0xDC00..=0xDFFF).contains(l))?;
|
||||
char::from_u32(0x10000 + ((high - 0xD800) << 10) + (low - 0xDC00))
|
||||
}
|
||||
|
||||
/// Inverse of [`encode_xstring`].
|
||||
pub fn decode_xstring(s: &str) -> String {
|
||||
if !s.contains("_x") {
|
||||
return s.to_string();
|
||||
}
|
||||
let chars: Vec<char> = s.chars().collect();
|
||||
let mut o = String::with_capacity(s.len());
|
||||
let mut i = 0;
|
||||
while i < chars.len() {
|
||||
if chars[i] == '_' && looks_like_escape(&chars, i) {
|
||||
let unit = escape_unit(&chars, i);
|
||||
if let Some(ch) = unit.and_then(char::from_u32) {
|
||||
o.push(ch);
|
||||
i += 7;
|
||||
continue;
|
||||
}
|
||||
// A high surrogate escape followed by a low surrogate escape is one UTF-16 pair.
|
||||
if let Some(ch) = unit.and_then(|high| surrogate_pair(&chars, i, high)) {
|
||||
o.push(ch);
|
||||
i += 14;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
o.push(chars[i]);
|
||||
i += 1;
|
||||
}
|
||||
o
|
||||
}
|
||||
|
||||
/// `<t>` element with `xml:space="preserve"` when needed.
|
||||
pub fn t_el(s: &str) -> String {
|
||||
@@ -699,44 +805,3 @@ mod tests {
|
||||
assert_eq!("1.5E20".parse::<f64>().unwrap(), 1.5e20);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod shared_escape_parity {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn xml_content_and_attributes_preserve_grid_bytes() {
|
||||
let value = "&<>\"'\t\n\r\0\u{1f}\u{fffe}\u{ffff}é😀";
|
||||
assert_eq!(esc(value), "&<>\"'\t\n é😀");
|
||||
assert_eq!(esc_attr(value), "&<>"'	 é😀");
|
||||
let mut appended = "prefix:".to_owned();
|
||||
push_esc(&mut appended, value);
|
||||
assert_eq!(appended, format!("prefix:{}", esc(value)));
|
||||
assert_eq!(esc("plain ASCII\t\n"), "plain ASCII\t\n");
|
||||
assert_eq!(decode_xstring(&encode_xstring("_x000D_\r\0😀")), "_x000D_\r\0😀");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod shared_xstring_parity {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn xstring_preserves_controls_unicode_and_literal_escapes() {
|
||||
// XML-invalid scalars, C1 controls and literal escapes survive save/reopen.
|
||||
for c in (0..=0xffff).filter_map(char::from_u32) {
|
||||
let text = format!("left{c}right_x0041_");
|
||||
assert_eq!(decode_xstring(&encode_xstring(&text)), text);
|
||||
}
|
||||
for (encoded, decoded) in [
|
||||
("_x005F_x000D_", "_x000D_"),
|
||||
("_xD83D__xDE00_", "😀"),
|
||||
("_xD83D__x0041_", "_xD83D_A"),
|
||||
("_xD83D__x005F_xDE00_", "_xD83D__xDE00_"),
|
||||
("_X0041_", "_X0041_"),
|
||||
("_xZZZZ_", "_xZZZZ_"),
|
||||
] {
|
||||
assert_eq!(decode_xstring(encoded), decoded);
|
||||
}
|
||||
assert_eq!(encode_xstring("\r\n\t\0"), "_x000D_\n\t_x0000_");
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user