Compare commits

..
Author SHA1 Message Date
FredApps d1b6a5d8ec Release: bump gridcraft to v0.20.1 2026-11-20 15:24:29 +01:00
14 changed files with 68 additions and 1543 deletions
Generated
+31 -32
View File
@@ -940,10 +940,9 @@ dependencies = [
[[package]]
name = "craft-drawingml"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
dependencies = [
"chrono",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"kurbo",
"log",
"serde",
@@ -1053,10 +1052,10 @@ dependencies = [
[[package]]
name = "craft-opc"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
dependencies = [
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"log",
"thiserror 2.0.21",
]
@@ -1088,12 +1087,12 @@ source = "git+https://github.com/storytold/craft-libs?rev=010702ee9b030844c85293
[[package]]
name = "craft-sheet"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=3b8e426a260695af840a2cd79a064d40778f939e#3b8e426a260695af840a2cd79a064d40778f939e"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
[[package]]
name = "craft-sheet"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=3b8e426a260695af840a2cd79a064d40778f939e#3b8e426a260695af840a2cd79a064d40778f939e"
[[package]]
name = "craft-stream-codecs"
@@ -1208,12 +1207,12 @@ dependencies = [
[[package]]
name = "craft-xlsx"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
dependencies = [
"craft-drawingml",
"craft-opc",
"craft-sheet 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-sheet 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"thiserror 2.0.21",
]
@@ -1230,7 +1229,7 @@ dependencies = [
[[package]]
name = "craft-xml"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
dependencies = [
"quick-xml 0.41.0",
"serde",
@@ -1259,7 +1258,7 @@ dependencies = [
[[package]]
name = "craft-zip"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3"
source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0"
dependencies = [
"flate2",
"thiserror 2.0.21",
@@ -2267,7 +2266,7 @@ dependencies = [
[[package]]
name = "gridcraft"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"arboard",
"chrono",
@@ -2295,7 +2294,7 @@ dependencies = [
[[package]]
name = "gridcraft-calc"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-core",
"gridcraft-formula",
@@ -2307,7 +2306,7 @@ dependencies = [
[[package]]
name = "gridcraft-chart"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-calc",
"gridcraft-core",
@@ -2318,7 +2317,7 @@ dependencies = [
[[package]]
name = "gridcraft-cli"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-engine",
"gridcraft-mcp",
@@ -2331,7 +2330,7 @@ dependencies = [
[[package]]
name = "gridcraft-core"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"chrono",
"js-sys",
@@ -2342,7 +2341,7 @@ dependencies = [
[[package]]
name = "gridcraft-engine"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-csv",
"craft-gridcraft-format",
@@ -2368,7 +2367,7 @@ dependencies = [
[[package]]
name = "gridcraft-formula"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-core",
"serde",
@@ -2377,7 +2376,7 @@ dependencies = [
[[package]]
name = "gridcraft-functions"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-core",
"regex",
@@ -2385,7 +2384,7 @@ dependencies = [
[[package]]
name = "gridcraft-math"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"ratex-font",
"ratex-layout",
@@ -2395,7 +2394,7 @@ dependencies = [
[[package]]
name = "gridcraft-mcp"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-mcp-server",
"gridcraft-engine",
@@ -2405,7 +2404,7 @@ dependencies = [
[[package]]
name = "gridcraft-model"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-core",
"gridcraft-formula",
@@ -2418,14 +2417,14 @@ dependencies = [
[[package]]
name = "gridcraft-numfmt"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-core",
]
[[package]]
name = "gridcraft-pdf"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-pdf",
"craft-stream-codecs",
@@ -2437,7 +2436,7 @@ dependencies = [
[[package]]
name = "gridcraft-sandbox"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"landlock",
"libc",
@@ -2448,7 +2447,7 @@ dependencies = [
[[package]]
name = "gridcraft-ui-egui"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-ui",
"craft-update",
@@ -2475,7 +2474,7 @@ dependencies = [
[[package]]
name = "gridcraft-web"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-web-api",
"craft-web-host",
@@ -2494,7 +2493,7 @@ dependencies = [
[[package]]
name = "gridcraft-xlsx"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"craft-cfb 0.1.0 (git+https://github.com/storytold/craft-libs?rev=e98299546f5c5c3c22388d16507f8b5e61a5f280)",
"craft-csv",
@@ -2505,7 +2504,7 @@ dependencies = [
"craft-opc",
"craft-xls",
"craft-xlsx",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)",
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)",
"gridcraft-core",
"gridcraft-formula",
"gridcraft-functions",
@@ -7007,7 +7006,7 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
[[package]]
name = "xtask"
version = "0.19.1"
version = "0.20.1"
dependencies = [
"gridcraft-engine",
"serde_json",
+5 -5
View File
@@ -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.1"
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.95"
@@ -39,7 +39,7 @@ craft-cfb = { git = "https://github.com/storytold/craft-libs", rev = "e98299546f
craft-offcrypto = { git = "https://github.com/storytold/craft-libs", rev = "e98299546f5c5c3c22388d16507f8b5e61a5f280", version = "0.1.0" }
craft-ods = { git = "https://github.com/storytold/craft-libs", rev = "010702ee9b030844c852939095b1da0d0656a890", version = "0.1.0" }
# OPC zip packages (parts, relationships, the zip writer) under `crates/xlsx/src/package.rs`.
craft-opc = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" }
craft-opc = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" }
# 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 = "e98299546f5c5c3c22388d16507f8b5e61a5f280", version = "0.1.0" }
@@ -48,10 +48,10 @@ craft-math = { git = "https://github.com/storytold/craft-libs", rev = "010702ee9
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 worksheet/drawing/string/package XML; workbook model mapping stays in gridcraft-xlsx.
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" }
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" }
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" }
craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "3b8e426a260695af840a2cd79a064d40778f939e", version = "0.1.0" }
craft-drawingml = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" }
craft-drawingml = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" }
craft-mcp-server = { git = "https://github.com/storytold/craft-libs", rev = "08da5e1486ee640de1d2cccd8fe8dd32b1d3b62c", version = "=0.1.0" }
# foundation
+2 -5
View File
@@ -3959,12 +3959,9 @@ fn xlsb_import_keeps_cached_values_and_reports_limits() {
assert!(s.doc().unwrap().display_title().ends_with(".xlsx"));
assert_eq!(v(&s, "A1"), Value::Number(42.0));
assert_eq!(v(&s, "B1"), Value::from("Original data"));
assert_eq!(
s.doc().unwrap().wb.active().unwrap().cell(CellRef::parse("A1").unwrap()).unwrap().formula.as_ref().map(|f| f.text.as_str()),
Some("42")
);
assert!(s.doc().unwrap().wb.active().unwrap().cell(CellRef::parse("A1").unwrap()).unwrap().formula.is_none());
s.execute("cell.set", json!({"cell": "B1", "input": "Changed"})).unwrap();
assert_eq!(v(&s, "A1"), Value::Number(42.0));
assert_eq!(v(&s, "A1"), Value::Number(42.0)); // Imported formula caches are constants.
let saved = s.execute("file.saveBytes", json!({"format": "xlsx"})).unwrap();
s.execute("file.open", json!({"name": "imported.xlsx", "base64": saved["base64"]})).unwrap();
assert_eq!(v(&s, "A1"), Value::Number(42.0));
-26
View File
@@ -708,29 +708,3 @@ fn a_window_argument_routes_tools_to_that_window() {
ok(&mut s, "list_windows", json!({})).as_array().unwrap().iter().map(|r| r["title"].as_str().unwrap().to_string()).collect();
assert_eq!(titles, ["Book1:1", "Book2", "Book1:2"]);
}
#[test]
fn stdio_cancel_and_batch_transcript() {
let input = concat!(
"{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\",\"params\":{\"protocolVersion\":\"2025-06-18\"}}\n",
"{\"jsonrpc\":\"2.0\",\"method\":\"notifications/initialized\"}\n",
"{\"jsonrpc\":\"2.0\",\"method\":\"notifications/cancelled\",\"params\":{\"requestId\":1,\"reason\":\"client\"}}\n",
"[]\n",
"[{\"jsonrpc\":\"2.0\",\"method\":\"notifications/cancelled\",\"params\":{\"requestId\":9}}]\n",
"[{\"jsonrpc\":\"2.0\",\"id\":2,\"method\":\"ping\"},{\"jsonrpc\":\"2.0\",\"method\":\"notifications/progress\"}]\n",
"{\"jsonrpc\":\"2.0\",\"id\":3,\"method\":\"ping\",\"params\":{}}\n"
);
let mut s = server();
let mut out = Vec::new();
s.serve(input.as_bytes(), &mut out).unwrap();
assert!(s.is_initialized());
let replies: Vec<Value> = std::str::from_utf8(&out).unwrap().lines().map(|l| serde_json::from_str(l).unwrap()).collect();
assert_eq!(replies.len(), 4, "{replies:?}");
assert_eq!(replies[0]["id"], 1);
assert_eq!(replies[0]["result"]["serverInfo"]["name"], "gridcraft");
assert_eq!(replies[1]["id"], Value::Null);
assert_eq!(replies[1]["error"]["code"], -32600);
assert_eq!(replies[2], json!([{"jsonrpc": "2.0", "id": 2, "result": {}}]));
assert_eq!(replies[3], json!({"jsonrpc": "2.0", "id": 3, "result": {}}));
}
+1 -15
View File
@@ -198,14 +198,7 @@ impl Language {
self.translated(text).unwrap_or_else(|| text.rsplit_once('|').map_or(text, |(_, label)| label))
}
/// A ribbon tab's name. Where a language names the tab differently from a command with the
/// same English label (Russian: the Insert tab is «Вставка», the Insert button «Вставить»), its
/// catalog keys the tab `Tab|name`; every other language falls back to the plain label.
pub fn tr_tab(self, tab: &str) -> &str {
self.translated(&format!("Tab|{tab}")).unwrap_or_else(|| self.tr(tab))
}
/// The catalog entry for `text`, if this language has one.
/// The catalog's own translation of `text`, or `None` when it falls back to English.
fn translated(self, text: &str) -> Option<&'static str> {
match self {
Self::En => None,
@@ -458,13 +451,6 @@ mod tests {
assert_eq!(language.tr("Sheet1!A1"), "Sheet1!A1");
assert_eq!(language.tr("Not in any catalog|Untranslated"), "Untranslated");
}
// The Insert tab and the Insert command have different Russian names; elsewhere the tab
// name is the plain label.
assert_eq!(Language::Ru.tr_tab("Insert"), "Вставка");
assert_eq!(Language::Ru.tr("Insert"), "Вставить");
assert_eq!(Language::Ru.tr_tab("Data"), "Данные");
assert_eq!(Language::Es.tr_tab("Insert"), Language::Es.tr("Insert"));
assert_eq!(Language::En.tr_tab("Insert"), "Insert");
// A `context|label` key shows only its label in English.
assert_eq!(Language::En.tr("Page Layout|Orientation"), "Orientation");
// Errors drop the `command `id`:` prefix before translating; an untranslated one stays whole.
+10 -577
View File
@@ -317,6 +317,9 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
"Financial" => "Финансовые",
"Recently Used" => "Последние",
"Logical" => "Логические",
"Date & Time" => "Дата и время",
"Lookup & Reference" => "Поиск и ссылки",
"Math & Trig" => "Математические и тригонометрические",
"More Functions" => "Другие функции",
"Page Layout|Orientation" => "Ориентация",
"Display theme" => "Тема оформления",
@@ -461,591 +464,21 @@ pub(super) fn translate(text: &str) -> Option<&'static str> {
"Maximum Iterations must be a whole number from 1 to 32767." => "Предельное число итераций должно быть целым числом от 1 до 32767.",
"Maximum Change must be a number of 0 or more." => "Максимальное изменение должно быть числом не меньше 0.",
"Calculation settings are saved with the workbook." => "Параметры вычислений сохраняются вместе с книгой.",
" (password)" => " (пароль)",
" (password, unlocked)" => " (пароль, разблокировано)",
"$ English (United States)" => "$ английский (США)",
"'{file}' is protected." => "Файл «{file}» защищён.",
"(No suggestions)" => "(Нет вариантов)",
"(unnamed)" => "(без имени)",
"+ Add Level" => "+ Добавить уровень",
"100% Stacked Bar" => "Нормированная линейчатая",
"100% Stacked Column" => "Нормированная гистограмма",
"A clean-room, open-source, Rust-native spreadsheet. Part of ArtCraft." => {
"Электронные таблицы с открытым исходным кодом, написанные с нуля на Rust. Часть ArtCraft."
}
"About" => "О программе",
"Accessibility" => "Доступность",
"Action" => "Действие",
"Action Journal" => "Журнал действий",
"Add" => "Добавить",
"Add Chart Element" => "Добавить элемент диаграммы",
"Add subtotal to (columns, e.g. C,D):" => "Добавить итоги по (столбцы, например C,D):",
"Add to Dictionary" => "Добавить в словарь",
"Add-in and Automation" => "Надстройки и автоматизация",
"Agent Control" => "Управление агентами",
"Aggregate duplicates using" => "Объединять повторы с помощью",
"Align Left" => "Выровнять по левому краю",
"Align Right" => "Выровнять по правому краю",
"Alignment" => "Выравнивание",
"All" => "Все",
"All Charts" => "Все диаграммы",
"All done. We made {count} replacements." => "Готово. Выполнено замен: {count}.",
"All except borders" => "Всё, кроме границ",
"Allow" => "Разрешить",
"Allow all users of this sheet to:" => "Разрешить всем пользователям этого листа:",
"Alpha:" => "Альфа:",
"Analysis Tools" => "Инструменты анализа",
"Anova: Single Factor" => "Дисперсионный анализ: один фактор",
"Any value" => "Любое значение",
"Area" => "С областями",
"At each change in (column letter):" => "При каждом изменении в (буква столбца):",
"Automation in this workbook. GridCraft runs its own scripts; a file's VBA project is preserved but not executed." => {
"Автоматизация в этой книге. GridCraft выполняет собственные сценарии; проект VBA из файла сохраняется, но не выполняется."
}
"Background Color:" => "Цвет фона:",
"Before sheet (position, 0 = first):" => "Перед листом (позиция, 0 = первый):",
"Bin Range (blank for automatic bins):" => "Диапазон интервалов (пусто — автоматически):",
"Blanks" => "Пустые ячейки",
"Border" => "Граница",
"Bottom" => "Нижняя",
"Bottom Align" => "Выровнять по нижнему краю",
"Bottom margin (in):" => "Нижнее поле (дюймы):",
"By Changing Variable Cells:" => "Изменять ячейки переменных:",
"By changing cell:" => "Изменять ячейку:",
"Calculate Now (F9)" => "Пересчитать сейчас (F9)",
"Calculate Sheet (⇧F9)" => "Пересчитать лист (⇧F9)",
"Calculation Options" => "Параметры вычислений",
"Cancel" => "Отмена",
"Category:" => "Категория:",
"Cell Styles" => "Стили ячеек",
"Center Across Selection" => "По центру выделения",
"Change" => "Заменить",
"Change All" => "Заменить все",
"Change Chart Type" => "Изменить тип диаграммы",
"Chart" => "Диаграмма",
"Chart Title" => "Название диаграммы",
"Chart data range:" => "Диапазон данных для диаграммы:",
"Check Accessibility" => "Проверить доступность",
"Choose a PNG or JPEG no larger than 16 MB." => "Выберите файл PNG или JPEG размером не более 16 МБ.",
"Clear Filter" => "Очистить фильтр",
"Clustered Bar" => "Линейчатая с группировкой",
"Clustered Column" => "Гистограмма с группировкой",
"Color:" => "Цвет:",
"Column Width" => "Ширина столбца",
"Column chart" => "Гистограмма",
"Column or Bar" => "Гистограмма или линейчатая",
"Column width (characters):" => "Ширина столбца (символы):",
"Column widths" => "Ширины столбцов",
"Columns" => "Столбцы",
"Columns (blank = all, e.g. A,C):" => "Столбцы (пусто = все, например A,C):",
"Combo" => "Комбинированная",
"Comma" => "Запятая",
"Comment:" => "Комментарий:",
"Comments and notes (C)" => "Комментарии и заметки (C)",
"Comments pane" => "Область комментариев",
"Compatibility" => "Совместимость",
"Conditional Formatting Rules Manager" => "Диспетчер правил условного форматирования",
"Conditional formats" => "Условные форматы",
"Confidence Level (%):" => "Уровень доверия (%):",
"Confidence Level for Mean (%), blank for none:" => "Уровень доверия для среднего (%), пусто — нет:",
"Confidence interval" => "Доверительный интервал",
"Confidence level (%):" => "Уровень доверия (%):",
"Constant is Zero" => "Константа равна нулю",
"Contributors" => "Участники",
"Convert Text to Columns" => "Преобразовать текст в столбцы",
"Convert the last ink stroke to a shape" => "Преобразовать последний рукописный штрих в фигуру",
"Convert to Range" => "Преобразовать в диапазон",
"Correlation" => "Корреляция",
"CountA" => "Количество значений",
"Covariance" => "Ковариация",
"Create Forecast Worksheet" => "Создать лист прогноза",
"Create Sparklines" => "Создать спарклайны",
"Create a copy" => "Создать копию",
"Cube" => "Куб",
"Cumulative Percentage" => "Накопленный процент",
"Current region" => "Текущая область",
"Custom (%):" => "Свой (%):",
"Custom Sort" => "Настраиваемая сортировка",
"Damping factor:" => "Коэффициент затухания:",
"Data Range:" => "Диапазон данных:",
"Data validation" => "Проверка данных",
"Database" => "Базы данных",
"Date & Time" => "Дата и время",
"Date unit" => "Единица даты",
"Day" => "День",
"Decimal" => "Десятичное число",
"Define Name…" => "Задать имя…",
"Delete Comment" => "Удалить комментарий",
"Delete Sheet" => "Удалить лист",
"Delete chart" => "Удалить диаграмму",
"Delete rows" => "Удалять строки",
"Delete…" => "Удалить…",
"Description (optional):" => "Описание (необязательно):",
"Descriptive Statistics" => "Описательная статистика",
"Destination:" => "Место назначения:",
"Diagonal ↗" => "Диагональ ↗",
"Diagonal ↘" => "Диагональ ↘",
"Dismiss" => "Закрыть",
"Display:" => "Отображать:",
"Distributed" => "Распределённый",
"Divide" => "Разделить",
"Do you want to save the changes you made to {title}?" => "Сохранить изменения в «{title}»?",
"Don't Save" => "Не сохранять",
"Double" => "Двойное",
"Double Accounting" => "Двойное бухгалтерское",
"Doughnut" => "Кольцевая",
"Down" => "Вниз",
"Edit Name" => "Изменить имя",
"Edit chart title" => "Изменить название диаграммы",
"Edit…" => "Изменить…",
"Engineering" => "Инженерные",
"Entire column" => "Весь столбец",
"Entire row" => "Вся строка",
"Erase ink strokes" => "Стереть рукописные штрихи",
"Error message:" => "Сообщение об ошибке:",
"Error style" => "Тип сообщения",
"Errors" => "Ошибки",
"Every command run in this session (replayable)" => "Все команды, выполненные в этом сеансе (можно повторить)",
"Expand formula bar" => "Развернуть строку формул",
"Exponential Smoothing" => "Экспоненциальное сглаживание",
"F-Test Two-Sample for Variances" => "F-тест для дисперсий двух выборок",
"Fill missing points using" => "Заполнить отсутствующие точки с помощью",
"Filter (⌘⇧F)" => "Фильтр (⌘⇧F)",
"Filter by Selected Cell's Value" => "Фильтр по значению выделенной ячейки",
"Find" => "Найти",
"Find & Select" => "Найти и выделить",
"Find All" => "Найти все",
"Find Next" => "Найти следующее",
"Find and Replace" => "Найти и заменить",
"Find what:" => "Что искать:",
"Fits inside the selected cell and moves with its content." => "Помещается в выделенную ячейку и перемещается вместе с её содержимым.",
"Flash Fill (⌘E)" => "Мгновенное заполнение (⌘E)",
"Font" => "Шрифт",
"Footer (in):" => "Нижний колонтитул (дюймы):",
"Footer:" => "Нижний колонтитул:",
"Forecast Sheet" => "Лист прогноза",
"Forecast end (date or number; blank: a third of the history):" => "Завершение прогноза (дата или число; пусто — треть истории):",
"Format Cells" => "Формат ячеек",
"Format Cells|Fill" => "Заливка",
"Format Chart pane" => "Область «Формат диаграммы»",
"Format as Table" => "Форматировать как таблицу",
"Format cells" => "Форматировать ячейки",
"Format cells that are (value):" => "Форматировать ячейки, которые (значение):",
"Format cells that contain a date occurring:" => "Форматировать ячейки, содержащие дату:",
"Format cells that contain the text:" => "Форматировать ячейки, содержащие текст:",
"Format columns" => "Форматировать столбцы",
"Format rows" => "Форматировать строки",
"Format values where this formula is true:" => "Форматировать значения, для которых эта формула истинна:",
"Formats (T)" => "Форматы (T)",
"Formula Builder" => "Построитель формул",
"Formula:" => "Формула:",
"Formulas (F)" => "Формулы (F)",
"Formulas and number formats" => "Формулы и форматы чисел",
"Funnel" => "Воронка",
"GRG Nonlinear" => "Нелинейный метод ОПГ",
"GRG Nonlinear: a local optimum of a smooth model, from the current values." => {
"Нелинейный метод ОПГ: локальный оптимум гладкой модели, начиная с текущих значений."
}
"Go To" => "Перейти",
"Go To Special" => "Переход к особым ячейкам",
"Goal Seek" => "Подбор параметра",
"Gradebook" => "Журнал оценок",
"Green Fill with Dark Green Text" => "Зелёная заливка и тёмно-зелёный текст",
"GridCraft is fully drivable by agents. Every menu item, button and gesture is a command:" => {
"GridCraft полностью управляется агентами. Каждый пункт меню, кнопка и жест — это команда:"
}
"Grouped By:" => "Группировать по:",
"Growth" => "Рост",
"Header (&L left, &C center, &R right; &P page, &N pages, &D date, &A sheet):" => {
"Верхний колонтитул (&L слева, &C по центру, &R справа; &P страница, &N страниц, &D дата, &A лист):"
}
"Header (in):" => "Верхний колонтитул (дюймы):",
"Hidden" => "Скрытая",
"Hide" => "Скрыть",
"Hide Sheet" => "Скрыть лист",
"Hierarchy & more" => "Иерархия и другие",
"Highlighter" => "Маркер",
"Histogram" => "Гистограмма распределения",
"Horizontal (Category) Axis Labels:" => "Подписи горизонтальной оси (категории):",
"Horizontal axis title:" => "Название горизонтальной оси:",
"Household Budget" => "Семейный бюджет",
"How agents drive GridCraft (MCP / control channel)" => "Как агенты управляют GridCraft (MCP / канал управления)",
"Hypothesized Mean Difference:" => "Предполагаемая разность средних:",
"Ignore Once" => "Пропустить один раз",
"Ignore blank" => "Игнорировать пустые ячейки",
"Import a text or CSV file" => "Импорт текстового файла или CSV",
"In the last 7 days" => "За последние 7 дней",
"In-cell dropdown" => "Раскрывающийся список в ячейке",
"Include forecast statistics" => "Включить статистику прогноза",
"Indent" => "Отступ",
"Information" => "Сведения",
"Input Range:" => "Входной диапазон:",
"Input X Range:" => "Входной диапазон X:",
"Input Y Range:" => "Входной диапазон Y:",
"Input message:" => "Сообщение для ввода:",
"Insert Calculated Field" => "Вставить вычисляемое поле",
"Insert Chart" => "Вставить диаграмму",
"Insert Function" => "Вставить функцию",
"Insert Function (⇧F3)" => "Вставить функцию (⇧F3)",
"Insert Hyperlink" => "Вставить гиперссылку",
"Insert Link (⌘K)" => "Вставить ссылку (⌘K)",
"Insert Sheet" => "Вставить лист",
"Insert Slicer" => "Вставить срез",
"Insert a picture" => "Вставить рисунок",
"Insert a slicer to filter a table" => "Вставить срез для фильтрации таблицы",
"Insert an icon" => "Вставить значок",
"Insert rows" => "Вставлять строки",
"Insert…" => "Вставить…",
"Interpolation" => "Интерполяция",
"Interval:" => "Интервал:",
"Join the ArtCraft Discord" => "Присоединиться к Discord ArtCraft",
"Justify" => "По ширине",
"Keep" => "Оставить",
"Keep Solver Solution" => "Оставить найденное решение",
"Kth Largest (blank for none):" => "K-й наибольший (пусто — нет):",
"Kth Smallest (blank for none):" => "K-й наименьший (пусто — нет):",
"Labels in first row" => "Метки в первой строке",
"Last cell" => "Последняя ячейка",
"Last month" => "В прошлом месяце",
"Last week" => "На прошлой неделе",
"Left margin (in):" => "Левое поле (дюймы):",
"Legend Entries (Series)" => "Элементы легенды (ряды)",
"Light Red Fill" => "Светло-красная заливка",
"Light Red Fill with Dark Red Text" => "Светло-красная заливка и тёмно-красный текст",
"Line" => "График",
"Line chart" => "График",
"Line or Area" => "График или диаграмма с областями",
"Line with Markers" => "График с маркерами",
"Linear" => "Линейная",
"Link to (web address, e-mail or Sheet!A1):" => "Ссылка на (веб-адрес, электронная почта или Лист!A1):",
"Link…" => "Ссылка…",
"List" => "Список",
"Location Range:" => "Диапазон расположения:",
"Locked" => "Заблокированная",
"Locking cells or hiding formulas has no effect until you protect the worksheet (Review › Protect Sheet)." => {
"Защита ячеек и скрытие формул действуют только после защиты листа (Рецензирование › Защитить лист)."
}
"Lookup & Reference" => "Поиск и ссылки",
"Macros and scripts in this workbook (Alt+F8)" => "Макросы и сценарии этой книги (Alt+F8)",
"Make Unconstrained Variables Non-Negative" => "Сделать переменные без ограничений неотрицательными",
"Markers" => "Маркеры",
"Match case" => "Учитывать регистр",
"Match entire cell contents" => "Совпадение со всем содержимым ячейки",
"Math & Trig" => "Математические и тригонометрические",
"Max" => "Максимум",
"Maximum:" => "Максимум:",
"Median" => "Медиана",
"Middle Align" => "Выровнять по середине",
"Min" => "Минимум",
"Minimum / Source / Formula:" => "Минимум / источник / формула:",
"Models" => "Модели",
"Modify" => "Изменить",
"Month" => "Месяц",
"More commands" => "Другие команды",
"Move or Copy" => "Переместить или скопировать",
"Move or Copy Sheet…" => "Переместить или скопировать лист…",
"Moving Average" => "Скользящее среднее",
"Multiply" => "Умножить",
"My data has headers" => "Мои данные содержат заголовки",
"Name" => "Имя",
"Name Manager" => "Диспетчер имён",
"Name:" => "Имя:",
"New Comment" => "Новый комментарий",
"New Name" => "Новое имя",
"New Worksheet Ply:" => "Новый лист:",
"New title (Modify):" => "Новое название (изменить):",
"New…" => "Создать…",
"Next month" => "В следующем месяце",
"Next sheet" => "Следующий лист",
"Next week" => "На следующей неделе",
"No names defined" => "Имена не определены",
"No picture selected" => "Рисунок не выбран",
"No ranges yet." => "Диапазонов пока нет.",
"None" => "Нет",
"Normal Probability" => "Нормальная вероятность",
"Not in Dictionary ({cell}):" => "Нет в словаре ({cell}):",
"Note:" => "Заметка:",
"Numbers" => "Числа",
"OK" => "ОК",
"Open…" => "Открыть…",
"Operation" => "Операция",
"Orientation (degrees)" => "Ориентация (градусы)",
"Other:" => "Другой:",
"Outline" => "Контур",
"Output Range:" => "Выходной диапазон:",
"Output options" => "Параметры вывода",
"Page Breaks" => "Разрывы страниц",
"Page Setup" => "Параметры страницы",
"Page order" => "Порядок страниц",
"Down, then over" => "Сначала вниз, затем вправо",
"Over, then down" => "Сначала вправо, затем вниз",
"Paper Size" => "Размер бумаги",
"Pareto (sorted histogram)" => "Парето (отсортированная гистограмма)",
"Password" => "Пароль",
"Password (optional):" => "Пароль (необязательно):",
"Password:" => "Пароль:",
"Paste (⌘V)" => "Вставить (⌘V)",
"Paste Special" => "Специальная вставка",
"Pick From Drop-down List…" => "Выбрать из раскрывающегося списка…",
"Pick From List" => "Выбрать из списка",
"Picture file path (PNG or JPEG):" => "Путь к файлу рисунка (PNG или JPEG):",
"Pie" => "Круговая",
"Pie or Doughnut" => "Круговая или кольцевая",
"Place Picture in Cell" => "Поместить рисунок в ячейку",
"Place Picture over Cells" => "Поместить рисунок поверх ячеек",
"Previous sheet" => "Предыдущий лист",
"Print Area" => "Область печати",
"Print Titles" => "Печатать заголовки",
"Product" => "Произведение",
"Protect Sheet" => "Защитить лист",
"Protect Structure and Windows" => "Защитить структуру и окна",
"Protect Workbook structure" => "Защитить структуру книги",
"Protect workbook for: Structure (sheets can't be added, moved, renamed, hidden or deleted)." => {
"Защитить книгу: структуру (листы нельзя добавлять, перемещать, переименовывать, скрывать и удалять)."
}
"Protection" => "Защита",
"Quarterly Sales Dashboard" => "Сводка продаж по кварталам",
"Radar" => "Лепестковая",
"Range password:" => "Пароль диапазона:",
"Ranges that stay editable when the sheet is protected:" => "Диапазоны, которые можно изменять на защищённом листе:",
"Rank and Percentile" => "Ранг и персентиль",
"Recommended Charts" => "Рекомендуемые диаграммы",
"Red Border" => "Красная граница",
"Red Text" => "Красный текст",
"Redo (⌘Y)" => "Повторить (⌘Y)",
"Reference:" => "Ссылка:",
"Refers To" => "Ссылается на",
"Refers to cells:" => "Ссылается на ячейки:",
"Refers to:" => "Ссылается на:",
"Regression" => "Регрессия",
"Remove" => "Удалить",
"Remove Duplicates" => "Удалить дубликаты",
"Remove the password (Modify)" => "Снять пароль (изменить)",
"Rename Sheet" => "Переименовать лист",
"Replace" => "Заменить",
"Replace All" => "Заменить все",
"Replace with:" => "Заменить на:",
"Residuals" => "Остатки",
"Restore Original Values" => "Восстановить исходные значения",
"Return to the original worksheet to insert this picture, or cancel and choose another cell." => {
"Вернитесь на исходный лист, чтобы вставить рисунок, или отмените и выберите другую ячейку."
}
"Right margin (in):" => "Правое поле (дюймы):",
"Row Height" => "Высота строки",
"Row height (pixels):" => "Высота строки (пиксели):",
"Rows" => "Строки",
"Sample" => "Выборка",
"Save (⌘S)" => "Сохранить (⌘S)",
"Save Changes?" => "Сохранить изменения?",
"Save a Copy" => "Сохранить копию",
"Save a copy as .{format}" => "Сохранить копию как .{format}",
"Scatter" => "Точечная",
"Scatter or Bubble" => "Точечная или пузырьковая",
"Scatter with Lines" => "Точечная с прямыми отрезками",
"Scope" => "Область",
"Scope (Workbook or sheet name):" => "Область (книга или имя листа):",
"ScreenTip:" => "Подсказка:",
"Search Commands" => "Поиск команд",
"Search and run any command" => "Найти и выполнить любую команду",
"Search commands (⌘⇧Space)" => "Поиск команд (⌘⇧Пробел)",
"Search:" => "Поиск:",
"Seasonality (auto, 0 for none, or a season length):" => "Сезонность (авто, 0 — нет, или длина сезона):",
"Select" => "Выделить",
"Select Data" => "Выбрать данные",
"Select Data Source" => "Выбрать источник данных",
"Select a Solving Method:" => "Выберите метод решения:",
"Select a chart first." => "Сначала выделите диаграмму.",
"Select and move ink and shapes" => "Выделять и перемещать рукописные штрихи и фигуры",
"Semicolon" => "Точка с запятой",
"Series" => "Ряд",
"Series in" => "Ряды в",
"Series{n}" => "Ряд{n}",
"Series…" => "Ряд…",
"Set Objective:" => "Задать цель:",
"Set cell:" => "Ячейка:",
"Share: export or save a copy" => "Поделиться: экспорт или сохранение копии",
"Shift cells down" => "Сдвинуть ячейки вниз",
"Shift cells left" => "Сдвинуть ячейки влево",
"Shift cells right" => "Сдвинуть ячейки вправо",
"Shift cells up" => "Сдвинуть ячейки вверх",
"Show Formulas (⌃`)" => "Показать формулы (⌃`)",
"Show password" => "Показать пароль",
"Shrink to fit" => "Сжать по размеру",
"Simplex LP: for linear models; integer and binary constraints by branch and bound." => {
"Симплекс-метод: для линейных моделей; целочисленные и двоичные ограничения — методом ветвей и границ."
}
"Single" => "Одинарное",
"Single Accounting" => "Одинарное бухгалтерское",
"Skip blanks" => "Пропускать пустые ячейки",
"Slicer" => "Срез",
"Solve" => "Решить",
"Solver Parameters" => "Параметры поиска решения",
"Solver Results" => "Результаты поиска решения",
"Sort & Filter" => "Сортировка и фильтр",
"Space" => "Пробел",
"Special…" => "Особые…",
"Spelling (F7)" => "Орфография (F7)",
"Stacked Area" => "С областями с накоплением",
"Stacked Bar" => "Линейчатая с накоплением",
"Stacked Column" => "Гистограмма с накоплением",
"Stacked Line" => "График с накоплением",
"Standard Errors" => "Стандартные ошибки",
"Standard Width" => "Стандартная ширина",
"Standard column width (pixels):" => "Стандартная ширина столбца (пиксели):",
"Standardized Residuals" => "Стандартизированные остатки",
"Start a conversation:" => "Начать разговор:",
"Start a new workbook" => "Создать новую книгу",
"Statistic" => "Статистика",
"Statistical" => "Статистические",
"Step value:" => "Шаг:",
"Stop value:" => "Конечное значение:",
"Subject to the Constraints:" => "С учётом ограничений:",
"Subscript" => "Подстрочный",
"Subtract" => "Вычесть",
"Suggestions:" => "Варианты:",
"Summary statistics" => "Итоговая статистика",
"Superscript" => "Надстрочный",
"Switch Row/Column" => "Поменять строки и столбцы",
"Tab" => "Табуляция",
"Table (⌘T)" => "Таблица (⌘T)",
"Table Styles" => "Стили таблиц",
"Text length" => "Длина текста",
"Text to Columns" => "Текст по столбцам",
"The output range already holds data. Replace it with the report?" => "Выходной диапазон уже содержит данные. Заменить их отчётом?",
"The spelling check is complete for the entire sheet." => "Проверка орфографии на всём листе завершена.",
"There are no conditional formatting rules on this sheet." => "На этом листе нет правил условного форматирования.",
"This month" => "В текущем месяце",
"This week" => "На текущей неделе",
"This workbook" => "Эта книга",
"This workbook has no scripts or macros." => "В этой книге нет сценариев и макросов.",
"Timeline range (blank: first column of the selection):" => "Диапазон временной шкалы (пусто — первый столбец выделения):",
"Title:" => "Заголовок:",
"To value:" => "Значение:",
"To:" => "До:",
"Today" => "Сегодня",
"Tomorrow" => "Завтра",
"Top" => "Верхняя",
"Top Align" => "Выровнять по верхнему краю",
"Top margin (in):" => "Верхнее поле (дюймы):",
"Transpose (E)" => "Транспонировать (E)",
"Treat consecutive delimiters as one" => "Считать последовательные разделители одним",
"Type" => "Тип",
"Type (custom format code):" => "Тип (код пользовательского формата):",
"Type a command, e.g. freeze, chart, bold…" => "Введите команду, например закрепить, диаграмма, полужирный…",
"Undo (⌘Z)" => "Отменить (⌘Z)",
"Undo list" => "Список отмены",
"Unhide" => "Показать",
"Unhide Sheet…" => "Показать лист…",
"Unhide sheet:" => "Показать лист:",
"Unlock with password" => "Разблокировать паролем",
"Unprotect Sheet" => "Снять защиту листа",
"Unprotect Workbook" => "Снять защиту книги",
"Up" => "Вверх",
"Use AutoFilter" => "Использовать автофильтр",
"Use function" => "Функция",
"Validation" => "Проверка данных",
"Value" => "Значение",
"Value Of:" => "Значение:",
"Values (V)" => "Значения (V)",
"Values and number formats" => "Значения и форматы чисел",
"Values range (blank: second column of the selection):" => "Диапазон значений (пусто — второй столбец выделения):",
"Variable 1 Range:" => "Диапазон переменной 1:",
"Variable 2 Range:" => "Диапазон переменной 2:",
"Version {version}" => "Версия {version}",
"Vertical" => "По вертикали",
"Vertical axis title:" => "Название вертикальной оси:",
"Visible cells only" => "Только видимые ячейки",
"Warning" => "Предупреждение",
"Waterfall" => "Каскадная",
"Web" => "Веб",
"Weekday" => "Рабочий день",
"What-If Analysis" => "Анализ «что если»",
"Whole number" => "Целое число",
"Within workbook" => "В книге",
"Workbook" => "Книга",
"Workbook Statistics" => "Статистика книги",
"Wrap text" => "Переносить текст",
"Year" => "Год",
"Yellow Fill with Dark Yellow Text" => "Жёлтая заливка и тёмно-жёлтый текст",
"Zeros" => "Нули",
"Zoom In" => "Увеличить",
"Zoom Out" => "Уменьшить",
"Zoom to 100%" => "Масштаб 100%",
"Zoom to Selection" => "Масштаб по выделенному",
"Zoom…" => "Масштаб…",
"and:" => "и:",
"applies to" => "применяется к",
"between" => "между",
"dashed" => "штриховая",
"dotted" => "точечная",
"double" => "двойная",
"e.g. lookup, average, date" => "например: поиск, среднее, дата",
"equal to" => "равно",
"greater than" => "больше",
"greater than or equal to" => "больше или равно",
"less than" => "меньше",
"less than or equal to" => "меньше или равно",
"medium" => "средняя",
"none" => "нет",
"not between" => "не между",
"not equal to" => "не равно",
"t-Test: Paired Two Sample for Means" => "t-тест: парные выборки для средних",
"t-Test: Two-Sample Assuming Equal Variances" => "t-тест: две выборки с равными дисперсиями",
"t-Test: Two-Sample Assuming Unequal Variances" => "t-тест: две выборки с неравными дисперсиями",
"thick" => "толстая",
"thin" => "тонкая",
"this workbook" => "эта книга",
"with" => "с",
"{count} cell(s) found" => "Найдено ячеек: {count}",
"{count} engine commands are available. See docs/mcp.md and docs/control-protocol.md." => {
"Доступно команд движка: {count}. См. docs/mcp.md и docs/control-protocol.md."
}
"£ English (United Kingdom)" => "£ английский (Великобритания)",
"¥ Japanese" => "¥ японский",
"— 1 step" => "— 1 шаг",
"— VBA project (preserved, not run)" => "— проект VBA (сохраняется, не выполняется)",
"— {steps} steps" => "— шагов: {steps}",
"€ Euro" => "€ евро",
"Tab|Insert" => "Вставка",
"AutoSave" => "Автосохранение",
"AutoSave: save after every change (workbooks saved to a file)" => {
"Автосохранение: сохранять после каждого изменения (книги, сохранённые в файл)"
}
// PivotTable field list.
"PivotTable Fields" => "Поля сводной таблицы",
"Choose fields to add to report:" => "Выберите поля для отчёта:",
"Use a field's menu to move it between areas:" => "Чтобы переместить поле в другую область, откройте его меню:",
"Filters" => "Фильтры",
"Values" => "Значения",
"Move to Row Labels" => "Переместить в названия строк",
"Move to Column Labels" => "Переместить в названия столбцов",
"Move to Report Filter" => "Переместить в фильтр отчёта",
"Move to Values" => "Переместить в значения",
"Summarize by Sum" => "Итоги по сумме",
"Summarize by Count" => "Итоги по количеству",
"Summarize by Average" => "Итоги по среднему",
"Summarize by Max" => "Итоги по максимуму",
"Summarize by Min" => "Итоги по минимуму",
"Show as No Calculation" => "Показать без вычислений",
"Show as % of Grand Total" => "Показать как % от общего итога",
"Show as Running Total" => "Показать как нарастающий итог",
"Show as Rank" => "Показать как ранг",
"Group by Years" => "Группировать по годам",
"Group by Quarters" => "Группировать по кварталам",
"Group by Months" => "Группировать по месяцам",
"Remove Field" => "Удалить поле",
"Refresh" => "Обновить",
"Calculated Field…" => "Вычисляемое поле…",
"Report Layout" => "Макет отчёта",
"Compact" => "Сжатый",
"Tabular" => "Табличный",
"Rename" => "Переименовать",
"Move or Copy…" => "Переместить или скопировать…",
"Duplicate" => "Дублировать",
"Tab Color" => "Цвет вкладки",
"No Color" => "Без цвета",
"Hide" => "Скрыть",
"Unhide…" => "Показать…",
"Select All Sheets" => "Выделить все листы",
"AutoSave" => "Автосохранение",
"AutoSave: save after every change (workbooks saved to a file)" => {
"Автосохранение: сохранять после каждого изменения (книги, сохранённые в файл)"
}
"Previous sheet" => "Предыдущий лист",
"Next sheet" => "Следующий лист",
"All sheets" => "Все листы",
"New sheet (⇧F11)" => "Новый лист (⇧F11)",
"Text Box" => "Надпись",
+1 -1
View File
@@ -75,7 +75,7 @@ pub fn show(app: &mut SheetApp, ui: &mut Ui) {
let active = app.ui.ribbon_tab == tab;
let contextual = ctx_tabs.contains(&tab);
let font = theme::ui_font(13.5);
let label = app.ui.language.tr_tab(tab);
let label = app.ui.language.tr(tab);
let tw = ui.painter().layout_no_wrap(label.to_string(), font.clone(), t.text).size().x;
let (r, resp) = ui.allocate_exact_size(vec2(tw + 22.0, 30.0), Sense::click());
if resp.hovered() && !active {
+1 -5
View File
@@ -239,10 +239,6 @@ pub(crate) fn from_dml_chart(dc: DmlChart, root: Option<&El>) -> Chart {
})
})
.or_else(|| sel.and_then(|e| e.path(&["marker", "spPr", "solidFill"])).and_then(dml_color));
let mut trendline_els = sel
.into_iter()
.flat_map(|e| e.kids("trendline").take(16))
.filter(|e| e.child("trendlineType").and_then(|c| c.attr("val")).and_then(TrendlineType::from_xml).is_some());
Series {
name: s.refs.name.as_deref().map(chart_ref_from_file).or_else(|| (!s.name.is_empty()).then_some(s.name)),
categories: s
@@ -270,7 +266,7 @@ pub(crate) fn from_dml_chart(dc: DmlChart, root: Option<&El>) -> Chart {
},
quartiles: Default::default(),
smooth: sel.map_or(s.smooth, |e| e.child("smooth").is_some_and(|c| c.flag("val", true))),
trendlines: s.trendlines.iter().map(|t| map_trendline(t, trendline_els.next())).collect(),
trendlines: s.trendlines.iter().enumerate().map(|(ti, t)| map_trendline(t, sel.and_then(|e| e.kids("trendline").nth(ti)))).collect(),
}
})
.collect();
+7 -16
View File
@@ -248,9 +248,9 @@ pub fn read_sheet(cx: &mut Ctx<'_>, part: &str, name: &str) -> Result<(Sheet, cr
cx.warn(format!("sheet \"{name}\" is damaged: more than {} cells", crate::xml::MAX_XML_NODES));
return Ok((Sheet::new(name), Default::default()));
}
let too_many_merges = sheet_part.merges.len() > crate::xml::MAX_XML_NODES;
if too_many_merges {
if sheet_part.merges.len() > crate::xml::MAX_XML_NODES {
cx.warn(format!("sheet \"{name}\" is damaged: more than {} merge cells", crate::xml::MAX_XML_NODES));
return Ok((Sheet::new(name), Default::default()));
}
for row in &rows {
read_craft_row(cx, &mut sheet, &mut st, row).map_err(craft_error)?;
@@ -262,21 +262,14 @@ pub fn read_sheet(cx: &mut Ctx<'_>, part: &str, name: &str) -> Result<(Sheet, cr
}
settle_python_spills_past_budget(&st, &mut sheet);
apply_craft_sheet_part(cx, &sheet_part, &rels, name, too_many_merges, &mut sheet)?;
apply_craft_sheet_part(cx, &sheet_part, &rels, name, &mut sheet)?;
let root = from_craft_el(&sheet_part.root);
let read_controls = read_form_controls(cx, &root, &rels, &mut sheet);
read_sheet_notes_and_tables(cx, &sheet_part, &rels, &mut sheet)?;
Ok((sheet, read_controls))
}
fn apply_craft_sheet_part(
cx: &mut Ctx<'_>,
sp: &CraftSheetPart,
rels: &[Rel],
name: &str,
skip_merges: bool,
sheet: &mut Sheet,
) -> Result<(), IoError> {
fn apply_craft_sheet_part(cx: &mut Ctx<'_>, sp: &CraftSheetPart, rels: &[Rel], name: &str, sheet: &mut Sheet) -> Result<(), IoError> {
let mut rel_by_id: HashMap<&str, &Rel> = HashMap::with_capacity(rels.len());
for r in rels {
rel_by_id.entry(r.id.as_str()).or_insert(r);
@@ -304,11 +297,9 @@ fn apply_craft_sheet_part(
} else {
apply_craft_cols(cx, &sp.columns, sheet)?;
}
if !skip_merges {
for m in &sp.merges {
if !m.is_single() {
sheet.merges.push(to_range_ref(*m));
}
for m in &sp.merges {
if !m.is_single() {
sheet.merges.push(to_range_ref(*m));
}
}
if let Some(v) = sp.features.views.first() {
-27
View File
@@ -313,33 +313,6 @@ fn a_row_wider_than_the_grid_is_refused() {
assert!(rep.warnings.iter().any(|w| w.contains("damaged")), "{:?}", rep.warnings);
}
#[test]
fn partial_sheet_read_retains_rows_and_pre_damage_layout() {
let mut body = String::from(
r#"<sheetFormatPr defaultRowHeight="24" customHeight="1"/><cols><col min="1" max="1" width="20" customWidth="1"/></cols><sheetData><row r="1"><c r="A1"><v>5</v></c></row></sheetData><extLst>"#,
);
for _ in 0..5000 {
body.push_str("<x>");
}
let (wb, rep) = read_xlsx(&minimal(&body, &[], "", "")).unwrap();
let s = wb.sheet(0).unwrap();
assert_eq!(s.value(gridcraft_core::CellRef::new(0, 0)), gridcraft_core::Value::Number(5.0));
assert!((s.default_row_height - 32.0).abs() < 0.01, "{}", s.default_row_height);
assert!(s.cols.contains_key(&0), "pre-damage column width should be retained");
assert!(rep.warnings.iter().any(|w| w.contains("damaged") && w.contains("kept 1 rows")), "{:?}", rep.warnings);
// Oversized mergeCells drops the merges without discarding earlier rows.
let merges = format!(
r#"<sheetData><row r="1"><c r="A1"><v>7</v></c></row></sheetData><mergeCells>{}</mergeCells>"#,
r#"<mergeCell ref="A1:B2"/>"#.repeat(crate::xml::MAX_XML_NODES + 1)
);
let (wb, rep) = read_xlsx(&minimal(&merges, &[], "", "")).unwrap();
let s = wb.sheet(0).unwrap();
assert_eq!(s.value(gridcraft_core::CellRef::new(0, 0)), gridcraft_core::Value::Number(7.0));
assert!(s.merges.is_empty());
assert!(rep.warnings.iter().any(|w| w.contains("damaged")), "{:?}", rep.warnings);
}
/// #2159: overlapping `<col min=1 max=16384>` entries share one budget of column writes.
#[test]
fn overlapping_column_entries_have_a_budget() {
-107
View File
@@ -2295,110 +2295,3 @@ fn issue_778_xlsx_xml_import_save_reopen_roundtrip() {
assert_eq!(sh.charts[0].title.as_deref(), Some("Sales"));
assert_eq!(sh.charts[0].data_table, Some(ChartDataTable::default()));
}
#[test]
fn issue_778_full_workbook_import_save_reopen_roundtrip() {
const NS_MAIN: &str = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
const NS_REL: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
const NS_XDR: &str = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
const NS_A: &str = "http://schemas.openxmlformats.org/drawingml/2006/main";
const NS_C: &str = "http://schemas.openxmlformats.org/drawingml/2006/chart";
let png = b"\x89PNG\r\n\x1a\n0000IHDRfake".to_vec();
let external_link = format!(
r#"<?xml version="1.0"?><externalLink xmlns="{NS_MAIN}" xmlns:r="{NS_REL}"><externalBook r:id="rId1"><sheetNames><sheetName val="Sheet1"/></sheetNames><sheetDataSet><sheetData sheetId="0"><row r="1"><cell r="A1"><v>10</v></cell></row></sheetData></sheetDataSet></externalBook></externalLink>"#
);
let external_link_rels = format!(
r#"<?xml version="1.0"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="{NS_REL}/externalLinkPath" Target="file:///C:/never/opened/Book2.xlsx" TargetMode="External"/></Relationships>"#
);
let types = r#"<?xml version="1.0"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="xml" ContentType="application/xml"/><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="png" ContentType="image/png"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/><Override PartName="/xl/worksheets/sheet2.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/><Override PartName="/xl/drawings/drawing1.xml" ContentType="application/vnd.openxmlformats-officedocument.drawing+xml"/><Override PartName="/xl/charts/chart1.xml" ContentType="application/vnd.openxmlformats-officedocument.drawingml.chart+xml"/><Override PartName="/xl/externalLinks/externalLink1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml"/></Types>"#;
let root_rels = format!(
r#"<?xml version="1.0"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="{NS_REL}/officeDocument" Target="xl/workbook.xml"/></Relationships>"#
);
let wb_xml = format!(
r#"<?xml version="1.0"?><workbook xmlns="{NS_MAIN}" xmlns:r="{NS_REL}"><sheets><sheet name="Data" sheetId="1" r:id="rId1"/><sheet name="Notes" sheetId="2" state="hidden" r:id="rId2"/></sheets><externalReferences><externalReference r:id="rId3"/></externalReferences></workbook>"#
);
let wb_rels = format!(
r#"<?xml version="1.0"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="{NS_REL}/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="{NS_REL}/worksheet" Target="worksheets/sheet2.xml"/><Relationship Id="rId3" Type="{NS_REL}/externalLink" Target="externalLinks/externalLink1.xml"/></Relationships>"#
);
let sheet1 = format!(
r#"<?xml version="1.0"?><worksheet xmlns="{NS_MAIN}" xmlns:r="{NS_REL}"><sheetData><row r="1"><c r="A1" t="str"><v>Item</v></c><c r="B1" t="str"><v>Amount</v></c></row><row r="2"><c r="A2" t="str"><v>Alpha</v></c><c r="B2"><v>42.5</v></c><c r="C2"><f>[1]Sheet1!$A$1</f><v>10</v></c></row><row r="3"><c r="B3"><f>B2*2</f><v>85</v></c><c r="C3"><f>SUM([1]Sheet1!A1:A3)*2</f><v>60</v></c></row></sheetData><drawing r:id="rId1"/></worksheet>"#
);
let sheet1_rels = format!(
r#"<?xml version="1.0"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="{NS_REL}/drawing" Target="../drawings/drawing1.xml"/></Relationships>"#
);
let sheet2 =
format!(r#"<?xml version="1.0"?><worksheet xmlns="{NS_MAIN}"><sheetData><row r="1"><c r="A1"><v>7</v></c></row></sheetData></worksheet>"#);
let drawing1 = format!(
r#"<?xml version="1.0"?><xdr:wsDr xmlns:xdr="{NS_XDR}" xmlns:a="{NS_A}" xmlns:r="{NS_REL}"><xdr:twoCellAnchor editAs="oneCell"><xdr:from><xdr:col>2</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>9</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>4</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>13</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:pic><xdr:nvPicPr><xdr:cNvPr id="10" name="Picture 1" descr="Logo"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill><a:blip r:embed="rId1"/></xdr:blipFill><xdr:spPr/></xdr:pic><xdr:clientData/></xdr:twoCellAnchor><xdr:twoCellAnchor><xdr:from><xdr:col>3</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>1</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>5</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>4</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:sp><xdr:nvSpPr><xdr:cNvPr id="11" name="Rect 1"/><xdr:cNvSpPr/></xdr:nvSpPr><xdr:spPr><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr><xdr:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>Box</a:t></a:r></a:p></xdr:txBody></xdr:sp><xdr:clientData/></xdr:twoCellAnchor><xdr:twoCellAnchor><xdr:from><xdr:col>3</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>5</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>8</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>15</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="12" name="Chart 1"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="{NS_C}" r:id="rId2"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor></xdr:wsDr>"#
);
let drawing1_rels = format!(
r#"<?xml version="1.0"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="{NS_REL}/image" Target="../media/image1.png"/><Relationship Id="rId2" Type="{NS_REL}/chart" Target="../charts/chart1.xml"/></Relationships>"#
);
let chart1 = format!(
r#"<?xml version="1.0"?><c:chartSpace xmlns:c="{NS_C}" xmlns:a="{NS_A}"><c:chart><c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:t>Sales</a:t></a:r></a:p></c:rich></c:tx></c:title><c:plotArea><c:barChart><c:barDir val="col"/><c:grouping val="clustered"/><c:ser><c:idx val="0"/><c:order val="0"/><c:tx><c:strRef><c:f>Data!$B$1</c:f></c:strRef></c:tx><c:cat><c:strRef><c:f>Data!$A$2:$A$2</c:f></c:strRef></c:cat><c:val><c:numRef><c:f>Data!$B$2:$B$2</c:f><c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="1"/><c:pt idx="0"><c:v>42.5</c:v></c:pt></c:numCache></c:numRef></c:val></c:ser></c:barChart><c:dTable><c:showKeys/><c:showHorzBorder/><c:showVertBorder/><c:showOutline/></c:dTable></c:plotArea></c:chart></c:chartSpace>"#
);
let input = super::make_zip(&[
("[Content_Types].xml", types.as_bytes()),
("_rels/.rels", root_rels.as_bytes()),
("xl/workbook.xml", wb_xml.as_bytes()),
("xl/_rels/workbook.xml.rels", wb_rels.as_bytes()),
("xl/worksheets/sheet1.xml", sheet1.as_bytes()),
("xl/worksheets/_rels/sheet1.xml.rels", sheet1_rels.as_bytes()),
("xl/worksheets/sheet2.xml", sheet2.as_bytes()),
("xl/drawings/drawing1.xml", drawing1.as_bytes()),
("xl/drawings/_rels/drawing1.xml.rels", drawing1_rels.as_bytes()),
("xl/media/image1.png", &png),
("xl/charts/chart1.xml", chart1.as_bytes()),
("xl/externalLinks/externalLink1.xml", external_link.as_bytes()),
("xl/externalLinks/_rels/externalLink1.xml.rels", external_link_rels.as_bytes()),
]);
let (imported, rep1) = read_xlsx(&input).unwrap();
assert!(!rep1.warnings.iter().any(|w| w.contains("dropped")), "{:?}", rep1.warnings);
let saved1 = write_xlsx(&imported).unwrap();
let (reopened, rep2) = read_xlsx(&saved1).unwrap();
assert!(!rep2.warnings.iter().any(|w| w.contains("dropped")), "{:?}", rep2.warnings);
let saved2 = write_xlsx(&reopened).unwrap();
let (again, _) = read_xlsx(&saved2).unwrap();
assert_eq!(again.sheets.len(), 2);
assert_eq!(again.sheets[0].name, "Data");
assert_eq!(again.sheets[0].visibility, Visibility::Visible);
assert_eq!(again.sheets[1].name, "Notes");
assert_eq!(again.sheets[1].visibility, Visibility::Hidden);
assert_eq!(again.sheets[1].value(at("A1")), Value::Number(7.0));
let sh = &again.sheets[0];
assert_eq!(sh.cells.get(at("B3")).unwrap().value, Value::Number(85.0));
assert_eq!(sh.cells.get(at("B3")).unwrap().formula.as_ref().map(|f| f.text.as_str()), Some("B2*2"));
assert_eq!(sh.cells.get(at("C2")).unwrap().value, Value::Number(10.0));
assert_eq!(sh.cells.get(at("C2")).unwrap().formula.as_ref().map(|f| f.text.as_str()), Some("[1]Sheet1!$A$1"));
assert_eq!(sh.cells.get(at("C3")).unwrap().value, Value::Number(60.0));
assert_eq!(sh.cells.get(at("C3")).unwrap().formula.as_ref().map(|f| f.text.as_str()), Some("SUM([1]Sheet1!A1:A3)*2"));
assert_eq!(sh.images.len(), 1);
assert_eq!(sh.images[0].data.as_ref(), png.as_slice());
assert_eq!(sh.images[0].anchor.mode, AnchorMode::MoveOnly);
assert_eq!(sh.shapes.len(), 1);
assert_eq!(sh.shapes[0].text, "Box");
assert_eq!(sh.charts.len(), 1);
assert_eq!(sh.charts[0].title.as_deref(), Some("Sales"));
assert_eq!(sh.charts[0].data_table, Some(ChartDataTable::default()));
let mut zip = zip::ZipArchive::new(std::io::Cursor::new(saved2)).unwrap();
let mut read_part = |name: &str| {
let mut s = String::new();
zip.by_name(name).unwrap().read_to_string(&mut s).unwrap();
s
};
let out_wb = read_part("xl/workbook.xml");
assert!(out_wb.contains("<externalReferences"), "{out_wb}");
let out_ext = read_part("xl/externalLinks/externalLink1.xml");
assert!(out_ext.contains("<sheetName val=\"Sheet1\"/>"), "{out_ext}");
let out_ext_rels = read_part("xl/externalLinks/_rels/externalLink1.xml.rels");
assert!(out_ext_rels.contains("file:///C:/never/opened/Book2.xlsx") && out_ext_rels.contains("TargetMode=\"External\""), "{out_ext_rels}");
let out_chart = read_part("xl/charts/chart1.xml");
assert!(out_chart.contains("<c:numCache>") && out_chart.contains("<c:v>42.5</c:v>"), "{out_chart}");
}
@@ -190,36 +190,3 @@ fn a_huge_forecast_in_a_file_is_read_clamped() {
let small = read("2.5", "-3");
assert_eq!((small.forward, small.backward), (2.5, 0.0), "ordinary values are kept");
}
#[test]
fn trendline_metadata_pairing_skips_unknown_trendline_elements() {
let xml = r#"<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
<c:chart><c:plotArea><c:barChart><c:barDir val="col"/>
<c:ser><c:idx val="0"/><c:order val="0"/>
<c:trendline>
<c:spPr><a:ln w="12700"><a:solidFill><a:srgbClr val="00FF00"/></a:solidFill></a:ln></c:spPr>
<c:trendlineType val="notAType"/>
<c:dispEq val="1"/>
</c:trendline>
<c:trendline>
<c:spPr><a:ln w="25400"><a:solidFill><a:srgbClr val="FF0000"/></a:solidFill><a:prstDash val="sysDot"/></a:ln></c:spPr>
<c:trendlineType val="linear"/>
<c:forward val="2.5"/>
<c:dispRSqr val="1"/>
</c:trendline>
<c:val><c:numRef><c:f>Data!$B$2:$B$6</c:f></c:numRef></c:val>
</c:ser>
<c:axId val="1"/><c:axId val="2"/>
</c:barChart></c:plotArea></c:chart>
</c:chartSpace>"#;
let root = crate::xml::parse(xml.as_bytes()).unwrap();
let t = &crate::chart::read_chart(&root).unwrap().series[0].trendlines;
assert_eq!(t.len(), 1);
assert_eq!(t[0].kind, TrendlineKind::Linear);
assert_eq!(t[0].forward, 2.5);
assert!(!t[0].display_equation);
assert!(t[0].display_r_squared);
assert_eq!(t[0].color, Some(Color::Rgb(0xFF0000)));
assert_eq!(t[0].width, Some(2.0));
assert_eq!(t[0].dash, Some(LineDash::SysDot));
}
+2 -379
View File
@@ -172,13 +172,11 @@ fn xlsb_scalar_caches_rk_unicode_visibility_and_epochs_survive_xlsx_save() {
assert_eq!(wb.sheets[1].visibility, Visibility::Hidden);
assert_eq!(wb.sheets[0].cells.len(), 14);
assert_eq!(wb.sheets[0].merges, vec![RangeRef::new(CellRef::new(5, 0), CellRef::new(6, 1))]);
assert!(report.warnings.iter().any(|w| w.contains("may display as numbers") && w.contains("XLSB saving is not supported")));
assert!(report.warnings.iter().any(|w| w.contains("will not recalculate") && w.contains("may display as numbers")));
for (col, expected) in expected.iter().enumerate() {
assert_eq!(&wb.sheets[0].value(CellRef::new(2, col as u32)), expected);
}
for col in 10..=13 {
assert_eq!(wb.sheets[0].cell(CellRef::new(2, col)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("1"));
}
assert!(wb.sheets[0].cells.iter().all(|(_, c)| c.formula.is_none()));
let (roundtrip, _) = read_xlsx(&write_xlsx(&wb).unwrap()).unwrap();
assert_eq!(roundtrip.date_system, wb.date_system);
for (col, expected) in expected.iter().enumerate() {
@@ -345,378 +343,3 @@ fn xlsb_phonetic_runs_use_documented_size_and_tolerate_padding() {
}
assert!(read_xlsb(&file(&worksheet(&[row(0), cell(62, 0, &phonetic(2, 12))].concat(), &[]))).is_err());
}
#[test]
fn xlsb_formulas_defined_names_and_external_links_delegate_to_craft_xlsx() {
let mut wb_records = record(131, &[]);
let mut props = 0u32.to_le_bytes().to_vec();
props.extend(0u32.to_le_bytes());
props.extend(wide(""));
wb_records.extend(record(153, &props));
wb_records.extend(record(143, &[]));
for (id, rel, name, state) in [(1u32, "one", "Data", 0u32), (2, "two", "Hidden", 1)] {
let mut data = state.to_le_bytes().to_vec();
data.extend(id.to_le_bytes());
data.extend(wide(rel));
data.extend(wide(name));
wb_records.extend(record(156, &data));
}
wb_records.extend(record(144, &[]));
// Supporting books: book 0 = BrtSupSelf (357), book 1 = BrtSupBookSrc (355).
wb_records.extend(record(357, &[]));
wb_records.extend(record(355, &[]));
// BrtExternSheet (362): 2 XTIs: ixti 0 -> (book=0, sheet=1..1), ixti 1 -> (book=1, sheet=0..0).
let mut xti = 2u32.to_le_bytes().to_vec();
for (bk, first, last) in [(0u32, 1i32, 1i32), (1, 0, 0)] {
xti.extend(bk.to_le_bytes());
xti.extend(first.to_le_bytes());
xti.extend(last.to_le_bytes());
}
wb_records.extend(record(362, &xti));
// BrtName (39): "Rate" = Hidden!$A$1 (PtgRef3d ixti=0, r=0, c=0).
let mut ptg_ref3d_hidden = vec![0x3A, 0, 0];
ptg_ref3d_hidden.extend(0u32.to_le_bytes());
ptg_ref3d_hidden.extend(0u16.to_le_bytes());
let mut brt_name = 0u32.to_le_bytes().to_vec();
brt_name.push(0);
brt_name.extend(u32::MAX.to_le_bytes());
brt_name.extend(wide("Rate"));
brt_name.extend((ptg_ref3d_hidden.len() as u32).to_le_bytes());
brt_name.extend(&ptg_ref3d_hidden);
brt_name.extend(0u32.to_le_bytes());
brt_name.extend(u32::MAX.to_le_bytes()); // null comment
wb_records.extend(record(39, &brt_name));
wb_records.extend(record(132, &[]));
let fmla_num = |col: u32, cached: f64, rgce: &[u8]| {
let mut data = col.to_le_bytes().to_vec();
data.extend([0; 4]);
data.extend(cached.to_le_bytes());
data.extend([0; 2]);
data.extend((rgce.len() as u32).to_le_bytes());
data.extend(rgce);
data.extend(0u32.to_le_bytes());
record(9, &data)
};
let ptg_name = [0x23, 1, 0, 0, 0];
let ptg_ext = {
let mut v = vec![0x3A, 1, 0];
v.extend(0u32.to_le_bytes());
v.extend(0u16.to_le_bytes());
v
};
let mut data = row(0);
data.extend(fmla_num(0, 42.0, &ptg_ref3d_hidden));
data.extend(fmla_num(1, 7.0, &ptg_name));
data.extend(fmla_num(2, 99.0, &ptg_ext));
let bytes = package(&wb_records, &worksheet(&data, &[]), &sst(), ROOT, RELS, TYPES);
let (wb, report) = read_xlsb(&bytes).unwrap();
assert_eq!(wb.names.len(), 1);
assert_eq!((wb.names[0].name.as_str(), wb.names[0].formula.as_str(), wb.names[0].scope), ("Rate", "Hidden!$A$1", None));
assert_eq!(wb.sheets[0].cell(CellRef::new(0, 0)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Hidden!$A$1"));
assert_eq!(wb.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Rate"));
assert!(wb.sheets[0].cell(CellRef::new(0, 2)).is_some_and(|c| c.formula.is_none() && c.value == Value::Number(99.0)));
assert!(report.warnings.iter().any(|w| w.contains("external link")), "{:?}", report.warnings);
let (rt, _) = read_xlsx(&write_xlsx(&wb).unwrap()).unwrap();
assert_eq!(rt.names.len(), 1);
assert_eq!(rt.sheets[0].cell(CellRef::new(0, 0)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Hidden!$A$1"));
assert_eq!(rt.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Rate"));
assert_eq!(rt.sheets[0].value(CellRef::new(0, 2)), Value::Number(99.0));
}
#[test]
fn xlsb_external_book_formulas_and_names_decode_and_roundtrip_through_xlsx() {
let mut wb_records = record(131, &[]);
let mut props = 0u32.to_le_bytes().to_vec();
props.extend(0u32.to_le_bytes());
props.extend(wide(""));
wb_records.extend(record(153, &props));
wb_records.extend(record(143, &[]));
for (id, rel, name, state) in [(1u32, "one", "Data", 0u32), (2, "two", "Hidden", 1)] {
let mut data = state.to_le_bytes().to_vec();
data.extend(id.to_le_bytes());
data.extend(wide(rel));
data.extend(wide(name));
wb_records.extend(record(156, &data));
}
wb_records.extend(record(144, &[]));
// Supporting books: book 0 = BrtSupSelf (357), book 1 = BrtSupBookSrc (355, rel "ext1").
wb_records.extend(record(357, &[]));
wb_records.extend(record(355, &wide("ext1")));
// BrtExternSheet (362): ixti 0 -> (book=1, sheet=0..0), ixti 1 -> (book=1, sheet=-2..-2).
let mut xti = 2u32.to_le_bytes().to_vec();
for (bk, first, last) in [(1u32, 0i32, 0i32), (1, -2, -2)] {
xti.extend(bk.to_le_bytes());
xti.extend(first.to_le_bytes());
xti.extend(last.to_le_bytes());
}
wb_records.extend(record(362, &xti));
wb_records.extend(record(132, &[]));
// External link part (links/externalLink1.bin): BrtBeginSupBook (360), BrtSupTabs (359),
// BrtSupNameStart/Bits/End (577/586/587), BrtEndSupBook (588).
let mut ext_bin = Vec::new();
let mut begin_sup = 0u16.to_le_bytes().to_vec();
begin_sup.extend(wide("rId1"));
begin_sup.extend(u32::MAX.to_le_bytes());
ext_bin.extend(record(360, &begin_sup));
let mut tabs = 2u32.to_le_bytes().to_vec();
tabs.extend(wide("Data"));
tabs.extend(wide("Other Sheet"));
ext_bin.extend(record(359, &tabs));
ext_bin.extend(record(577, &wide("ExtName")));
// BrtSupNameFmla (585): ExtPtgRef3D (0x3A, sheet 0..0, r=0, c=0)
let mut fmla_payload = 9u32.to_le_bytes().to_vec();
fmla_payload.push(0x3A);
fmla_payload.extend(0u16.to_le_bytes());
fmla_payload.extend(0u16.to_le_bytes());
fmla_payload.extend(0u16.to_le_bytes());
fmla_payload.extend(0u16.to_le_bytes());
ext_bin.extend(record(585, &fmla_payload));
let mut bits = vec![0u8; 7];
bits[2..6].copy_from_slice(&0u32.to_le_bytes());
ext_bin.extend(record(586, &bits));
ext_bin.extend(record(587, &[]));
// Sheet-scoped external name ("LocalExt" on sheet 1 -> sheetId="0")
ext_bin.extend(record(577, &wide("LocalExt")));
let mut local_bits = vec![0u8; 7];
local_bits[2..6].copy_from_slice(&1u32.to_le_bytes());
ext_bin.extend(record(586, &local_bits));
ext_bin.extend(record(587, &[]));
// BrtExternTableStart (363) with refreshError=1, row 0, and all 5 cell types.
let mut t_start = 0u32.to_le_bytes().to_vec();
t_start.push(1);
ext_bin.extend(record(363, &t_start));
ext_bin.extend(record(366, &0u32.to_le_bytes()));
ext_bin.extend(record(367, &0u32.to_le_bytes()));
ext_bin.extend(record(368, &[&1u32.to_le_bytes()[..], &4.5f64.to_le_bytes()[..]].concat()));
ext_bin.extend(record(369, &[&2u32.to_le_bytes()[..], &[1u8]].concat()));
ext_bin.extend(record(370, &[&3u32.to_le_bytes()[..], &[0x07u8]].concat()));
ext_bin.extend(record(371, &[&4u32.to_le_bytes()[..], &wide("hi")[..]].concat()));
ext_bin.extend(record(364, &[]));
ext_bin.extend(record(588, &[]));
let fmla_num = |col: u32, cached: f64, rgce: &[u8]| {
let mut data = col.to_le_bytes().to_vec();
data.extend([0; 4]);
data.extend(cached.to_le_bytes());
data.extend([0; 2]);
data.extend((rgce.len() as u32).to_le_bytes());
data.extend(rgce);
data.extend(0u32.to_le_bytes());
record(9, &data)
};
let ptg_ext_ref = {
let mut v = vec![0x3A, 0, 0];
v.extend(0u32.to_le_bytes());
v.extend(0u16.to_le_bytes());
v
};
let ptg_ext_name = [0x39, 1, 0, 1, 0, 0, 0];
let mut data = row(0);
data.extend(fmla_num(0, 99.0, &ptg_ext_ref));
data.extend(fmla_num(1, 12.5, &ptg_ext_name));
let rels = RELS.replace(
"</Relationships>",
r#"<Relationship Id="ext1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink" Target="../links/externalLink1.bin"/></Relationships>"#,
);
let types =
TYPES.replace("</Types>", r#"<Override PartName="/links/externalLink1.bin" ContentType="application/vnd.ms-excel.externalLink"/></Types>"#);
let link_rels = r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath" Target="Book2.xlsx" TargetMode="External"/></Relationships>"#;
let bytes = make_zip(&[
("[Content_Types].xml", types.as_bytes()),
("_rels/.rels", ROOT.as_bytes()),
("records/book.bin", &wb_records),
("records/_rels/book.bin.rels", rels.as_bytes()),
("data/one.bin", &worksheet(&data, &[])),
("data/two.bin", &worksheet(&[], &[])),
("text/strings.bin", &sst()),
("links/externalLink1.bin", &ext_bin),
("links/_rels/externalLink1.bin.rels", link_rels.as_bytes()),
]);
let (wb, _) = read_xlsb(&bytes).unwrap();
let c0 = wb.sheets[0].cell(CellRef::new(0, 0)).unwrap();
assert_eq!(c0.value, Value::Number(99.0));
assert_eq!(c0.formula.as_ref().map(|f| f.text.as_str()), Some("[1]Data!$A$1"));
let c1 = wb.sheets[0].cell(CellRef::new(0, 1)).unwrap();
assert_eq!(c1.value, Value::Number(12.5));
assert_eq!(c1.formula.as_ref().map(|f| f.text.as_str()), Some("[1]!ExtName"));
let saved = write_xlsx(&wb).unwrap();
let (rt, _) = read_xlsx(&saved).unwrap();
assert_eq!(rt.sheets[0].cell(CellRef::new(0, 0)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]Data!$A$1"));
assert_eq!(rt.sheets[0].value(CellRef::new(0, 0)), Value::Number(99.0));
assert_eq!(rt.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]!ExtName"));
assert_eq!(rt.sheets[0].value(CellRef::new(0, 1)), Value::Number(12.5));
// Verify the external workbook target relationship survives XLSB -> XLSX -> read_xlsx -> XLSX.
let saved2 = write_xlsx(&rt).unwrap();
let mut zip = zip::ZipArchive::new(std::io::Cursor::new(saved2)).unwrap();
let read_zip = |z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str| {
let mut s = String::new();
std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
s
};
let wb_xml = read_zip(&mut zip, "xl/workbook.xml");
assert!(wb_xml.contains("<externalReferences"), "{wb_xml}");
let wb_rels = read_zip(&mut zip, "xl/_rels/workbook.xml.rels");
let link_target = wb_rels
.split("<Relationship ")
.find(|r| r.contains("externalLink\""))
.and_then(|r| r.split("Target=\"").nth(1))
.and_then(|s| s.split('"').next())
.expect("workbook.xml.rels should have an externalLink relationship")
.trim_start_matches('/')
.to_string();
let link_part = if link_target.starts_with("xl/") { link_target } else { format!("xl/{link_target}") };
let link_xml = read_zip(&mut zip, &link_part);
assert!(link_xml.contains("<sheetName val=\"Data\"/>") && link_xml.contains("name=\"ExtName\""), "{link_xml}");
let (dir, file) = link_part.rsplit_once('/').unwrap();
let link_rels_xml = read_zip(&mut zip, &format!("{dir}/_rels/{file}.rels"));
assert!(
link_rels_xml.contains("externalLinkPath")
&& link_rels_xml.contains("Target=\"Book2.xlsx\"")
&& link_rels_xml.contains("TargetMode=\"External\""),
"{link_rels_xml}"
);
}
#[test]
fn xlsb_external_link_ordinals_preserve_missing_slots_on_xlsx_save() {
let mut wb_records = record(131, &[]);
let mut props = 0u32.to_le_bytes().to_vec();
props.extend(0u32.to_le_bytes());
props.extend(wide(""));
wb_records.extend(record(153, &props));
wb_records.extend(record(143, &[]));
let mut s1 = 0u32.to_le_bytes().to_vec();
s1.extend(1u32.to_le_bytes());
s1.extend(wide("one"));
s1.extend(wide("Data"));
wb_records.extend(record(156, &s1));
wb_records.extend(record(144, &[]));
// Book 0 = self, Book 1 = non-workbook DDE ("ext1"), Book 2 = valid workbook ("ext2").
wb_records.extend(record(357, &[]));
wb_records.extend(record(355, &wide("ext1")));
wb_records.extend(record(355, &wide("ext2")));
let mut xti = 2u32.to_le_bytes().to_vec();
for (bk, first, last) in [(1u32, -2i32, -2i32), (2, 0, 0)] {
xti.extend(bk.to_le_bytes());
xti.extend(first.to_le_bytes());
xti.extend(last.to_le_bytes());
}
wb_records.extend(record(362, &xti));
wb_records.extend(record(132, &[]));
// DDE link part (links/dde1.bin): sbt=1 ("Excel", "topic") with item "R1C1".
let mut dde_bin = Vec::new();
let mut dde_begin = 1u16.to_le_bytes().to_vec();
dde_begin.extend(wide("Excel"));
dde_begin.extend(wide("topic"));
dde_bin.extend(record(360, &dde_begin));
dde_bin.extend(record(577, &wide("R1C1")));
dde_bin.extend(record(586, &[0u8; 7]));
dde_bin.extend(record(587, &[]));
dde_bin.extend(record(588, &[]));
let mut ext_bin = Vec::new();
let mut begin_sup = 0u16.to_le_bytes().to_vec();
begin_sup.extend(wide("rId1"));
begin_sup.extend(u32::MAX.to_le_bytes());
ext_bin.extend(record(360, &begin_sup));
let mut tabs = 1u32.to_le_bytes().to_vec();
tabs.extend(wide("SheetA"));
ext_bin.extend(record(359, &tabs));
ext_bin.extend(record(588, &[]));
let fmla_num = |col: u32, cached: f64, rgce: &[u8]| {
let mut data = col.to_le_bytes().to_vec();
data.extend([0; 4]);
data.extend(cached.to_le_bytes());
data.extend([0; 2]);
data.extend((rgce.len() as u32).to_le_bytes());
data.extend(rgce);
data.extend(0u32.to_le_bytes());
record(9, &data)
};
let ptg_1 = [0x39, 0, 0, 1, 0, 0, 0];
let ptg_2 = {
let mut v = vec![0x3A, 1, 0];
v.extend(0u32.to_le_bytes());
v.extend(0u16.to_le_bytes());
v
};
let mut data = row(0);
data.extend(fmla_num(0, 11.0, &ptg_1));
data.extend(fmla_num(1, 22.0, &ptg_2));
let rels = r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="one" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="../data/one.bin"/><Relationship Id="strings" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="../text/strings.bin"/><Relationship Id="ext1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink" Target="../links/dde1.bin"/><Relationship Id="ext2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink" Target="../links/externalLink2.bin"/></Relationships>"#;
let types = r#"<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Override PartName="/records/book.bin" ContentType="application/vnd.ms-excel.sheet.binary.macroEnabled.main"/><Override PartName="/data/one.bin" ContentType="application/vnd.ms-excel.worksheet"/><Override PartName="/text/strings.bin" ContentType="application/vnd.ms-excel.sharedStrings"/><Override PartName="/links/dde1.bin" ContentType="application/vnd.ms-excel.externalLink"/><Override PartName="/links/externalLink2.bin" ContentType="application/vnd.ms-excel.externalLink"/></Types>"#;
let link_rels = r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath" Target="SecondBook.xlsx" TargetMode="External"/></Relationships>"#;
let bytes = make_zip(&[
("[Content_Types].xml", types.as_bytes()),
("_rels/.rels", ROOT.as_bytes()),
("records/book.bin", &wb_records),
("records/_rels/book.bin.rels", rels.as_bytes()),
("data/one.bin", &worksheet(&data, &[])),
("text/strings.bin", &sst()),
("links/dde1.bin", &dde_bin),
("links/externalLink2.bin", &ext_bin),
("links/_rels/externalLink2.bin.rels", link_rels.as_bytes()),
]);
let (wb, report) = read_xlsb(&bytes).unwrap();
assert!(report.warnings.iter().any(|w| w.contains("unresolved or non-workbook external links")), "{:?}", report.warnings);
assert!(report.warnings.iter().any(|w| w.contains("replaced with their cached values")), "{:?}", report.warnings);
assert!(wb.sheets[0].cell(CellRef::new(0, 0)).is_some_and(|c| c.formula.is_none() && c.value == Value::Number(11.0)));
assert_eq!(wb.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]SheetA!$A$1"));
// Also verify numeric structured-table headers like `SUM(Sales[2024])` are not mistaken for
// external ordinals when an omitted DDE link triggers ordinal remapping.
assert_eq!(crate::xlsb::remap_external_formula("SUM(Sales[2024])", &[None, None, Some(1)]), Ok(None));
assert_eq!(crate::xlsb::remap_external_formula("Sales[[#Headers],[2024]]", &[None, None, Some(1)]), Ok(None));
assert_eq!(
crate::xlsb::remap_external_formula("'[2]Other Sheet'!A1+SUM(Sales[2024])", &[None, None, Some(1)]),
Ok(Some("'[1]Other Sheet'!A1+SUM(Sales[2024])".into()))
);
assert_eq!(crate::xlsb::remap_external_formula("[1]!'R1C1'+SUM(Sales[2024])", &[None, None, Some(1)]), Err(()));
let saved = write_xlsx(&wb).unwrap();
let (reopened, rep2) = read_xlsx(&saved).unwrap();
assert!(!rep2.warnings.iter().any(|w| w.contains("dropped")), "{:?}", rep2.warnings);
assert!(reopened.sheets[0].cell(CellRef::new(0, 0)).is_some_and(|c| c.formula.is_none() && c.value == Value::Number(11.0)));
assert_eq!(reopened.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]SheetA!$A$1"));
let saved2 = write_xlsx(&reopened).unwrap();
let mut zip = zip::ZipArchive::new(std::io::Cursor::new(saved2)).unwrap();
let read_zip = |z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str| {
let mut s = String::new();
std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
s
};
let wb_xml = read_zip(&mut zip, "xl/workbook.xml");
let ref_ids: Vec<&str> =
wb_xml.split("<externalReference ").skip(1).filter_map(|s| s.split("r:id=\"").nth(1).and_then(|t| t.split('"').next())).collect();
assert_eq!(ref_ids.len(), 1, "only the surviving external link should be emitted: {wb_xml}");
let wb_rels = read_zip(&mut zip, "xl/_rels/workbook.xml.rels");
let link_target = wb_rels
.split("<Relationship ")
.find(|r| r.contains(&format!("Id=\"{}\"", ref_ids[0])))
.and_then(|r| r.split("Target=\"").nth(1))
.and_then(|s| s.split('"').next())
.expect("externalReference r:id should resolve in workbook.xml.rels")
.trim_start_matches('/');
let link_part = if link_target.starts_with("xl/") { link_target.to_string() } else { format!("xl/{link_target}") };
let link_xml = read_zip(&mut zip, &link_part);
assert!(link_xml.contains("<externalBook ") && link_xml.contains("<sheetName val=\"SheetA\"/>"), "{link_xml}");
let (dir, file) = link_part.rsplit_once('/').unwrap();
let link_rels = read_zip(&mut zip, &format!("{dir}/_rels/{file}.rels"));
assert!(
link_rels.contains("externalLinkPath") && link_rels.contains("Target=\"SecondBook.xlsx\"") && link_rels.contains("TargetMode=\"External\""),
"{link_rels}"
);
}
+8 -315
View File
@@ -1,16 +1,11 @@
//! XLSB import, delegated to `craft_xlsx::Package`.
//! Cell values, formulas, defined names, and merged cells are imported; formatting, charts,
//! images, macros and other workbook features are not imported.
//! Data-only XLSB import, delegated to `craft_xlsx::Package`.
//! Formula caches become constants. Styles, macros and other workbook features are not run or imported.
use std::collections::BTreeMap;
use std::fmt::Write as _;
use std::sync::Arc;
use gridcraft_core::{CellError, CellRef, DateSystem, RangeRef, Value};
use gridcraft_model::{Cell, DefinedName, Formula, Preserved, PreservedPart, PreservedRel, PreservedXml, Sheet, StyleId, Visibility, Workbook};
use gridcraft_model::{Cell, Sheet, Visibility, Workbook};
use crate::write::{NS_MAIN, NS_REL, XML_DECL};
use crate::xml::{esc, esc_attr};
use crate::{IoError, ReadReport};
fn map_error(err: craft_xlsx::Error) -> IoError {
@@ -66,55 +61,8 @@ pub(super) fn import_limits() -> craft_xlsx::Limits {
if cfg!(target_arch = "wasm32") { craft_xlsx::Limits { binary_text: 64 << 20, ..limits } } else { limits }
}
fn map_formula(f: &craft_xlsx::CellFormula, at: craft_xlsx::CellRef, report: &mut ReadReport) -> Option<Formula> {
let text = crate::fmla::from_file(f.text.trim());
if text.is_empty() {
return None;
}
match f.kind {
craft_xlsx::FormulaKind::Normal | craft_xlsx::FormulaKind::Shared => Some(Formula::new(&text)),
craft_xlsx::FormulaKind::Array => {
let pos = CellRef::new(at.row, at.col);
let mut fm = Formula::new(&text);
fm.array = Some(
f.range
.map(|r| RangeRef::new(CellRef::new(r.first.row, r.first.col), CellRef::new(r.last.row, r.last.col)))
.unwrap_or_else(|| RangeRef::cell(pos)),
);
Some(fm)
}
craft_xlsx::FormulaKind::DataTable => {
report.warn("what-if data tables are not supported; kept their values");
None
}
}
}
fn import_defined_names(book: &craft_xlsx::Workbook, file_to_model: &[Option<usize>], wb: &mut Workbook) {
for d in &book.defined_names {
let scope = match d.local_sheet_id {
Some(i) => match file_to_model.get(i as usize).copied().flatten() {
Some(m) => Some(m),
None => continue,
},
None => None,
};
let lname = d.name.to_ascii_lowercase();
if lname == "_xlnm._filterdatabase" || lname.starts_with("_xlchart.") || lname == "_xlnm.print_area" || lname == "_xlnm.print_titles" {
continue;
}
wb.names.push(DefinedName {
name: d.name.clone(),
scope,
formula: crate::fmla::from_file(d.formula.trim()),
comment: d.comment.clone(),
hidden: d.hidden,
});
}
}
/// Imports worksheet cell values, formulas, defined names, and merged cells. Number formats are
/// omitted; dates remain serial numbers with the workbook's original date system. Inspect warnings.
/// Imports worksheet scalar values and saved formula results. Number formats are omitted;
/// dates remain serial numbers with the workbook's original date system. Inspect warnings.
pub fn read_xlsb(bytes: &[u8]) -> Result<(Workbook, ReadReport), IoError> {
let limits = import_limits();
let mut package = craft_xlsx::Package::open(bytes, &limits).map_err(map_error)?;
@@ -153,15 +101,13 @@ pub fn read_xlsb(bytes: &[u8]) -> Result<(Workbook, ReadReport), IoError> {
wb.sheets.clear();
wb.date_system = if book.date_1904 { DateSystem::D1904 } else { DateSystem::D1900 };
let mut report = ReadReport::default();
report.warn("XLSB import: formatting, charts, images, macros and other features are not imported; dates, currency and percentages may display as numbers. Save a new .xlsx file; XLSB saving is not supported.");
let mut file_to_model = Vec::with_capacity(book.sheets.len());
report.warn("XLSB data-only import: formulas become their saved results and will not recalculate. Formatting, charts, images, macros and other features are not imported; dates, currency and percentages may display as numbers. Save a new .xlsx file; XLSB saving is not supported.");
for entry in &book.sheets {
if entry.kind != craft_xlsx::SheetKind::Worksheet {
if !matches!(entry.kind, craft_xlsx::SheetKind::Chartsheet | craft_xlsx::SheetKind::Dialogsheet | craft_xlsx::SheetKind::Macrosheet) {
return Err(IoError::Format("XLSB: unknown sheet relationship type".into()));
}
report.warn("XLSB non-worksheet sheets were skipped.");
file_to_model.push(None);
continue;
}
wb.check_sheet_name(&entry.name, None).map_err(|e| IoError::Format(format!("XLSB: {e}")))?;
@@ -176,12 +122,8 @@ pub fn read_xlsb(bytes: &[u8]) -> Result<(Workbook, ReadReport), IoError> {
.sheet(entry, |row| {
for cell in row.cells {
let value = map_value(cell.value.resolve(&strings, book.date_1904));
let formula = cell.formula.as_ref().and_then(|f| map_formula(f, cell.at, &mut report));
if !value.is_empty() || formula.is_some() {
sheet.cells.set(
CellRef::new(cell.at.row, cell.at.col),
Cell { value, formula: formula.map(Arc::new), style: StyleId::DEFAULT, py: None },
);
if !value.is_empty() {
sheet.cells.set(CellRef::new(cell.at.row, cell.at.col), Cell::value(value));
}
}
Ok(())
@@ -189,18 +131,8 @@ pub fn read_xlsb(bytes: &[u8]) -> Result<(Workbook, ReadReport), IoError> {
.map_err(map_error)?;
sheet.merges =
part.merges.into_iter().map(|r| RangeRef::new(CellRef::new(r.first.row, r.first.col), CellRef::new(r.last.row, r.last.col))).collect();
file_to_model.push(Some(wb.sheets.len()));
wb.sheets.push(Arc::new(sheet));
}
import_defined_names(&book, &file_to_model, &mut wb);
let external_links = package.external_links(&book).map_err(map_error)?;
let (preserved, ordinal_map) = preserve_external_links(&external_links, &mut report);
if let Some(preserved) = preserved {
wb.preserved = Some(Arc::new(preserved));
}
if let Some(remap) = ordinal_map {
remap_workbook_external_ordinals(&mut wb, &remap, &mut report);
}
for warning in package.warnings() {
report.warn(warning);
}
@@ -214,242 +146,3 @@ pub fn read_xlsb(bytes: &[u8]) -> Result<(Workbook, ReadReport), IoError> {
pub(crate) fn is_xlsb(bytes: &[u8]) -> bool {
craft_xlsx::is_xlsb(bytes)
}
fn preserve_external_links(
links: &[(String, Option<craft_xlsx::ExternalLink>)],
report: &mut ReadReport,
) -> (Option<Preserved>, Option<Vec<Option<usize>>>) {
if links.is_empty() {
return (None, None);
}
const CT_EXT_LINK: &str = "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml";
let mut p = Preserved::default();
let mut refs_xml = format!("<externalReferences xmlns:r=\"{NS_REL}\">");
let mut remap = vec![None; links.len() + 1];
let mut next_ordinal = 0usize;
let mut had_unpreserved = false;
for (i, (_, link)) in links.iter().enumerate() {
let Some(craft_xlsx::ExternalLink::Book(book)) = link else {
had_unpreserved = true;
continue;
};
if book.target.is_none() {
had_unpreserved = true;
continue;
}
next_ordinal += 1;
let old_ordinal = i + 1;
remap[old_ordinal] = Some(next_ordinal);
let rid = format!("rId{next_ordinal}");
let part_name = format!("xl/externalLinks/externalLink{next_ordinal}.xml");
let (xml, rels) = external_link_part_xml(book);
p.rels.push(PreservedRel { id: rid.clone(), rel_type: format!("{NS_REL}/externalLink"), target: part_name.clone(), external: false });
p.parts.push(PreservedPart { name: part_name, content_type: CT_EXT_LINK.into(), data: xml.into_bytes().into(), rels });
let _ = write!(refs_xml, "<externalReference r:id=\"{rid}\"/>");
}
if had_unpreserved {
report.warn("XLSB: unresolved or non-workbook external links kept their cached values; their targets could not be preserved");
}
let preserved = if next_ordinal == 0 {
None
} else {
refs_xml.push_str("</externalReferences>");
p.elements.push(PreservedXml { slot: "externalReferences".into(), xml: refs_xml });
Some(p)
};
(preserved, had_unpreserved.then_some(remap))
}
fn remap_workbook_external_ordinals(wb: &mut Workbook, remap: &[Option<usize>], report: &mut ReadReport) {
let mut dropped = false;
for sheet_arc in &mut wb.sheets {
let sheet = Arc::make_mut(sheet_arc);
let coords: Vec<CellRef> = sheet.cells.iter().filter(|(_, c)| c.formula.is_some()).map(|(pos, _)| pos).collect();
for pos in coords {
let Some(cell) = sheet.cells.get_mut(pos) else { continue };
let Some(fm) = &cell.formula else { continue };
match remap_external_formula(&fm.text, remap) {
Ok(Some(rewritten)) => {
let mut updated = (**fm).clone();
updated.text = rewritten;
cell.formula = Some(Arc::new(updated));
}
Ok(None) => {}
Err(()) => {
cell.formula = None;
dropped = true;
}
}
}
}
let mut kept_names = Vec::with_capacity(wb.names.len());
for mut name in std::mem::take(&mut wb.names) {
match remap_external_formula(&name.formula, remap) {
Ok(Some(rewritten)) => {
name.formula = rewritten;
kept_names.push(name);
}
Ok(None) => kept_names.push(name),
Err(()) => dropped = true,
}
}
wb.names = kept_names;
if dropped {
report.warn("XLSB: formulas referencing unresolved external links were replaced with their cached values");
}
}
pub(crate) fn remap_external_formula(text: &str, remap: &[Option<usize>]) -> Result<Option<String>, ()> {
let bytes = text.as_bytes();
let mut out: Option<String> = None;
let mut i = 0;
let mut copied = 0;
let mut in_string = false;
while i < bytes.len() {
if bytes[i] == b'"' {
in_string = !in_string;
i += 1;
continue;
}
if !in_string && bytes[i] == b'[' {
let mut j = i + 1;
while j < bytes.len() && bytes[j].is_ascii_digit() {
j += 1;
}
if j > i + 1
&& j < bytes.len()
&& bytes[j] == b']'
&& is_external_ordinal(text, i, j)
&& let Ok(old) = text[i + 1..j].parse::<usize>()
{
let Some(&Some(new_n)) = remap.get(old) else {
return Err(());
};
if new_n != old {
let buf = out.get_or_insert_with(|| String::with_capacity(text.len()));
buf.push_str(&text[copied..=i]);
let _ = write!(buf, "{new_n}]");
i = j + 1;
copied = i;
continue;
}
}
}
i += 1;
}
if let Some(mut buf) = out {
buf.push_str(&text[copied..]);
Ok(Some(buf))
} else {
Ok(None)
}
}
/// True when `[digits]` at `open..=close` is an external-book ordinal (`[1]Sheet!A1`,
/// `'[1]Other Sheet'!A1`, `[1]!Name`) rather than a numeric structured-table column (`Sales[2024]`,
/// `Sales[[#Headers],[2024]]`).
fn is_external_ordinal(text: &str, open: usize, close: usize) -> bool {
let bytes = text.as_bytes();
let prev = open.checked_sub(1).map(|k| bytes[k]);
if let Some(b) = prev
&& (b.is_ascii_alphanumeric() || matches!(b, b'_' | b'.' | b'\\' | b']' | b'['))
{
return false;
}
let mut k = close + 1;
if prev == Some(b'\'') {
while k < bytes.len() {
if bytes[k] == b'\'' {
if bytes.get(k + 1) == Some(&b'\'') {
k += 2;
continue;
}
return bytes.get(k + 1) == Some(&b'!');
}
k += 1;
}
return false;
}
if bytes.get(k) == Some(&b'!') {
return true;
}
let start = k;
while k < bytes.len() && (bytes[k].is_ascii_alphanumeric() || matches!(bytes[k], b'_' | b'.') || bytes[k] >= 0x80) {
k += 1;
}
k > start && bytes.get(k) == Some(&b'!')
}
fn external_link_part_xml(book: &craft_xlsx::ExternalBook) -> (String, Vec<PreservedRel>) {
let mut xml = format!("{XML_DECL}<externalLink xmlns=\"{NS_MAIN}\" xmlns:r=\"{NS_REL}\">");
let mut rels = Vec::new();
xml.push_str("<externalBook");
if let Some(target) = &book.target {
xml.push_str(" r:id=\"rId1\"");
rels.push(PreservedRel { id: "rId1".into(), rel_type: format!("{NS_REL}/externalLinkPath"), target: target.clone(), external: true });
}
xml.push('>');
if !book.sheet_names.is_empty() {
xml.push_str("<sheetNames>");
for name in &book.sheet_names {
let _ = write!(xml, "<sheetName val=\"{}\"/>", esc_attr(name));
}
xml.push_str("</sheetNames>");
}
if !book.defined_names.is_empty() {
xml.push_str("<definedNames>");
for dn in &book.defined_names {
let _ = write!(xml, "<definedName name=\"{}\"", esc_attr(&dn.name));
if let Some(refers_to) = &dn.refers_to {
let _ = write!(xml, " refersTo=\"{}\"", esc_attr(refers_to));
}
if let Some(sheet_id) = dn.sheet_id {
let _ = write!(xml, " sheetId=\"{sheet_id}\"");
}
xml.push_str("/>");
}
xml.push_str("</definedNames>");
}
if !book.sheet_data.is_empty() {
xml.push_str("<sheetDataSet>");
for sd in &book.sheet_data {
let _ = write!(xml, "<sheetData sheetId=\"{}\"", sd.sheet_id);
if sd.refresh_error {
xml.push_str(" refreshError=\"1\"");
}
xml.push('>');
let mut rows: BTreeMap<u32, Vec<(craft_xlsx::CellRef, &craft_xlsx::Value)>> = BTreeMap::new();
for (pos, val) in &sd.cells {
rows.entry(pos.row).or_default().push((*pos, val));
}
for (r, cells) in rows {
let _ = write!(xml, "<row r=\"{}\">", r + 1);
for (pos, val) in cells {
let r_attr = CellRef::new(pos.row, pos.col);
match val {
craft_xlsx::Value::Empty => {
let _ = write!(xml, "<cell r=\"{r_attr}\"/>");
}
craft_xlsx::Value::Number(n) => {
let _ = write!(xml, "<cell r=\"{r_attr}\"><v>{n}</v></cell>");
}
craft_xlsx::Value::Text(t) => {
let _ = write!(xml, "<cell r=\"{r_attr}\" t=\"str\"><v>{}</v></cell>", esc(t));
}
craft_xlsx::Value::Bool(b) => {
let _ = write!(xml, "<cell r=\"{r_attr}\" t=\"b\"><v>{}</v></cell>", if *b { "1" } else { "0" });
}
craft_xlsx::Value::Error(e) => {
let _ = write!(xml, "<cell r=\"{r_attr}\" t=\"e\"><v>{}</v></cell>", esc(map_cell_error(*e).as_str()));
}
}
}
xml.push_str("</row>");
}
xml.push_str("</sheetData>");
}
xml.push_str("</sheetDataSet>");
}
xml.push_str("</externalBook></externalLink>");
(xml, rels)
}