From 4dd4ff9a9358e071e3109790c3fe0c69785c19a0 Mon Sep 17 00:00:00 2001 From: Local contributor Date: Wed, 14 Oct 2026 08:23:36 -0400 Subject: [PATCH] CSV/text export: integers below 2^53 keep every digit Writing every General number as & converts it rounded 16-digit integers such as card and order numbers to 1.23456789012346E+15, so opening a CSV and saving it again changed the data. Integers that f64 holds exactly (|x| < 2^53) are now written with all their digits, as before; larger integers and non-integers keep the 15-significant-digit & text. --- crates/engine/src/io.rs | 16 ++++++++++++++-- crates/numfmt/src/lib.rs | 14 +++++++++++--- docs/file-format-parity.md | 4 ++-- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/io.rs b/crates/engine/src/io.rs index 0cf40735f..2b711f573 100644 --- a/crates/engine/src/io.rs +++ b/crates/engine/src/io.rs @@ -695,15 +695,27 @@ mod tests { sheet.set_cell(CellRef::new(0, 0), Cell { value: Value::Number(124412140710.0), ..Default::default() }); sheet.set_cell(CellRef::new(0, 1), Cell { value: Value::Number(1.23456789012345), ..Default::default() }); sheet.set_cell(CellRef::new(0, 2), Cell { value: Value::Number(124412140710.0), style: scientific, ..Default::default() }); + // Integers f64 holds exactly (below 2^53) keep every digit; larger integers and + // non-integers get the 15 significant digits `&` gives. + for (col, n) in [(3, 1234567890123456.0), (4, -9007199254740991.0), (5, 12345678901234567.0), (6, 1e15 - 0.5)] { + sheet.set_cell(CellRef::new(0, col), Cell { value: Value::Number(n), ..Default::default() }); + } for (path, separator) in [("data.csv", ","), ("data.tsv", "\t")] { let output = String::from_utf8(save_bytes(&workbook, path).unwrap()).unwrap(); - assert_eq!(output, format!("124412140710{separator}1.23456789012345{separator}1.24E+11\r\n")); + assert_eq!( + output, + format!( + "124412140710{s}1.23456789012345{s}1.24E+11{s}1234567890123456{s}-9007199254740991{s}1.23456789012346E+16{s}1E+15\r\n", + s = separator + ) + ); } } /// A number shown as General is written as `&` converts it (15 significant digits), whatever /// colour, sections or literals the format adds, and in a Text cell. Excel writes the cell - /// display (`1.24412E+11`, `0.333333333`); GridCraft keeps the digits so part codes survive. + /// display (`1.24412E+11`, `0.333333333`); GridCraft keeps the digits so part codes survive + /// (integers below 2^53 keep all their digits; see the test above). #[test] fn delimited_exports_write_general_numbers_as_text_converts_them() { use gridcraft_core::Value; diff --git a/crates/numfmt/src/lib.rs b/crates/numfmt/src/lib.rs index 22f288066..b43b8d888 100644 --- a/crates/numfmt/src/lib.rs +++ b/crates/numfmt/src/lib.rs @@ -256,11 +256,19 @@ impl NumberFormat { } /// Formats a number. The flag is true when the value cannot be shown (date out of range). - /// With `full`, General is not narrowed to the cell width: it reads as `&` turns the number - /// into text (15 significant digits). + /// With `full`, General is not narrowed to the cell width: an integer f64 holds exactly + /// (|n| < 2^53) is written with all its digits, so 16-digit card and order numbers survive a + /// CSV round trip; any other number reads as `&` turns it into text (15 significant digits). fn format_number(&self, n: f64, sys: DateSystem, full: bool) -> (Formatted, bool) { + const EXACT_INT: f64 = 9_007_199_254_740_992.0; // 2^53 let general_text = |n: f64, width: usize| { - if full { Some(gridcraft_core::number_to_text(n)) } else { format_general_fit(n, width) } + if !full { + format_general_fit(n, width) + } else if n != 0.0 && n.fract() == 0.0 && n.abs() < EXACT_INT { + Some(format!("{}", n as i64)) + } else { + Some(gridcraft_core::number_to_text(n)) + } }; let general = |n: f64| Formatted { text: general_text(n, GENERAL_WIDTH).unwrap_or_else(|| OVERFLOW.into()), color: None, fill: None, numeric: true }; diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 7cefaac18..516130915 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -41,7 +41,7 @@ and repair-free opening remain unverified. | Format | Excel | GridCraft read | GridCraft write | Notes | |---|---|---|---|---| -| `.csv` UTF-8 / Windows / Mac / MS-DOS | R/W | yes (UTF-8 and UTF-16 BOMs, UTF-8, Windows-1252 fallback; delimiter detection) | yes (UTF-8 without BOM, CRLF; a file opened as CSV is saved with the separator it was read with, so a `;` file stays `;`; otherwise `,`) | Formatted numbers and formula results are written as displayed, as in Excel (never column-width `#####`). **Intentional difference:** Excel writes a General number as the cell displays it (`1.24412E+11`, `0.333333333`); GridCraft writes it to 15 significant digits, as `&` converts it (`124412140710`, `0.333333333333333`), so part codes survive a round trip. The same applies to a coloured or sectioned General (`[Blue]General`, `General;[Red]-General`) and to a number in a Text (`@`) cell. No encoding choice on save. Re-import of a single-column export splits text (#127). A used range that would write more than 512 MiB (two far-apart cells span the whole rectangle) is refused with an error instead of being expanded (#528). | +| `.csv` UTF-8 / Windows / Mac / MS-DOS | R/W | yes (UTF-8 and UTF-16 BOMs, UTF-8, Windows-1252 fallback; delimiter detection) | yes (UTF-8 without BOM, CRLF; a file opened as CSV is saved with the separator it was read with, so a `;` file stays `;`; otherwise `,`) | Formatted numbers and formula results are written as displayed, as in Excel (never column-width `#####`). **Intentional difference:** Excel writes a General number as the cell displays it (`1.24412E+11`, `0.333333333`); GridCraft writes an integer below 2^53 (which f64 holds exactly) with all its digits (`124412140710`, `1234567890123456`), so part, card and order numbers survive a round trip, and any other number to 15 significant digits, as `&` converts it (`0.333333333333333`, `1.23456789012346E+16`). The same applies to a coloured or sectioned General (`[Blue]General`, `General;[Red]-General`) and to a number in a Text (`@`) cell. No encoding choice on save. Re-import of a single-column export splits text (#127). A used range that would write more than 512 MiB (two far-apart cells span the whole rectangle) is refused with an error instead of being expanded (#528). | | `.txt` tab-delimited, Unicode text | R/W | yes (`.txt`, `.tsv`, `.tab`) | yes (displayed values, with General numbers as for `.csv`) | Text Import Wizard options partly via Text to Columns | | `.prn` formatted text (space-delimited) | R/W | no | no | | | `.dif`, `.slk` (SYLK) | R/W | no | no | Small, legacy | @@ -83,7 +83,7 @@ refresh. Counted under features (Get & Transform, ~10% ready), not here. | Date | Change | Summary | |---|---|---| -| 2026-10-13 | minor | CSV/text export writes General numbers as `&` converts them (15 significant digits: `0.3`, not `0.30000000000000004`) also through coloured or sectioned General and Text formats (`[Blue]General` still wrote `1.24412E+11`). Duplicate CSV/text rows merged. Intentional difference from Excel, which writes the cell display | +| 2026-10-13 | minor | CSV/text export writes General numbers as `&` converts them (15 significant digits: `0.3`, not `0.30000000000000004`; integers below 2^53 keep every digit) also through coloured or sectioned General and Text formats (`[Blue]General` still wrote `1.24412E+11`). Duplicate CSV/text rows merged. Intentional difference from Excel, which writes the cell display | | 2026-10-12 | trivial | XLSX chart sheets are kept on save (#727) | | 2026-10-12 | trivial | CSV and TSV export is capped at 512 MiB and refuses a larger used range with an error (#528) | | 2026-10-12 | minor | `.xls` import reads the calculation settings (CalcMode, CalcIter, CalcCount, CalcDelta, CalcPrecision), so circular models calculate instead of showing `#CIRC!` (#724) |