From 1d0b311b4a943e19c86f1bfaf85927c3116ea92a Mon Sep 17 00:00:00 2001 From: Mouhand Kaddo Date: Sun, 15 Nov 2026 20:55:04 +0400 Subject: [PATCH] Preserve Arabic cell direction and RTL sheet layout in PDF exports (#955) **Stacked on #940.** It contains all of #940 (Arabic shaping in PDF) and adds cell direction and right-to-left sheet geometry (`M12.AR5`). Review the [diff against #940's branch](https://github.com/Mouhand-Kaddo/gridcraft/compare/fix/arabic-pdf-text...fix/arabic-pdf-reading-direction); once #940 merges, this PR is up to date with it. ## Summary PDF export now honors cell Context, Left-to-Right and Right-to-Left settings. Wrapped lines keep their paragraph direction. Right-to-left sheets place columns, repeated headings, merged cells and objects in the same order as the grid, and explicit Left and Right alignment stay on the side the grid shows them. ```diff PDF export - infer each line separately; place every sheet left to right + preserve cell direction across lines; mirror RTL sheet positions + reject oversized text before appending an incomplete PDF block ``` Depends on #940 (Arabic PDF glyphs). The cell reading direction it reads landed with #947. ## Evidence - **Before:** PDF ignored explicit reading order and RTL sheet layout. A public size-limit probe returned a PDF with an unmatched marked-content block. **After:** Direction, wrapped paragraphs, numeric brackets, RTL columns, headings, objects, clipping and sparklines have focused regressions. The same size-limit probe returns an error; its regression failed before the fix and passes afterward. - At the current head, with Noto Sans Arabic installed and no `CRAFT_FONTS_DIR`: the `gridcraft-pdf` and `gridcraft-engine` tests, workspace clippy and fmt pass. The full `cargo xtask ci` with the craft-fonts bundle relies on the hosted gate. - Poppler rendering inspected for LTR and RTL sheets. Bounding boxes confirm reversed column positions; logical Arabic strings remain searchable. No physical printer test. ## Merge Danger **Door:** Two-way. Revert the commit to restore prior export behavior. **Blast Radius:** PDF. Explicit cell direction is shared with XLSX persistence. Latin text retains the standard-font path, including forced RTL numeric text without an Arabic font. --- ROADMAP.md | 4 +- crates/engine/src/cmd/print.rs | 18 ++- crates/engine/src/cmd/print/draw.rs | 66 +++++--- crates/engine/src/cmd/print/objects.rs | 32 ++-- crates/engine/src/cmd/print/tests.rs | 212 +++++++++++++++++++++++-- crates/engine/src/cmd/print/text.rs | 206 ++++++++++++++---------- crates/pdf/src/arabic.rs | 46 +++++- crates/pdf/src/lib.rs | 189 +++++++++++++++------- crates/pdf/src/tests.rs | 211 +++++++++++++++++------- docs/file-format-parity.md | 9 +- docs/gaps.md | 9 +- docs/localization-parity.md | 9 +- 12 files changed, 740 insertions(+), 271 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index bfd19a634..85e83feb9 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -149,6 +149,7 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in | 2026-10-31 | Recently Used lists the functions most recently entered in a formula from any source (ribbon, control channel, MCP, scripts), kept with the preferences and returned by `formulas.recentlyUsed`; the Insert Function dialog takes Excel's title and a working category list (Most Recently Used, All, each category) | | 2026-10-31 | Formulas › Function Library as a big Insert Function button, the AutoSum split button and three columns of labelled small buttons, each category book in its own colour; category menus end with Insert Function… on that category; More Functions cascades into the remaining categories; Home › Editing shares the AutoSum menu; the MR key tip opens Recently Used | | 2026-10-31 | System and embedded CJK fallback text shares the Latin baseline in cells, editors and window titles (#1265, #2621). Symbol and emoji alignment, manual row heights and clipping are unchanged | +| 2026-10-26 | PDF preserves Context/LTR/RTL reading direction through wrapping and drawing; RTL sheet cells, borders, headings, objects and sparklines mirror consistently | | 2026-10-26 | Arabic PDF export shapes licensed glyph outlines and preserves searchable logical text; characters the font lacks, or a missing Arabic font, fall back to the standard fonts instead of failing the export | | 2026-10-26 | Arabic bidi display/editing preserve logical source text; per-cell reading direction is editable and survives undo, XLSX and conditional-format priority | | 2026-10-26 | Arabic text shows in cells and the interface through a system, fontconfig or craft-fonts Arabic face; workbook fonts keep their script fallbacks | @@ -181,7 +182,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in | 2026-10-15 | File › Options › Formulas: Maximum Iterations and Maximum Change fields for iterative calculation, disabled while it is off, with Excel's limits (1 to 32767, 0 or more) | | 2026-10-15 | Function help follows the interface language: argument hints, autocomplete, Insert Function (search and readable categories) and the Formulas-tab menus read per-language tables of descriptions and argument names; Spanish keeps its 10 functions in the new format | | 2026-10-15 | Row auto-fit counts a cell's line breaks only when the cell wraps, as Excel does: a file whose unwrapped cells hold multi-line text no longer opens with tall rows (typing a break still turns wrap on and grows the row) | -| 2026-10-14 | XLSX import warns when a pivot cache is missing, malformed or too large, naming the cache and saying its PivotTable was kept as plain cells, instead of dropping the PivotTable silently (#1039) | | 2026-10-14 | Set precision as displayed is applied: with the option on, formula results, spills and numbers typed or reformatted are stored as their number format shows them and formulas calculate from those values; `formulas.calculationOptions` gains `precisionAsDisplayed` (turning it on rounds existing constants; locked constants on a protected sheet keep their value; numbers written to a new sheet are rounded too) (#1343) | | 2026-10-14 | Lookups (MATCH, XMATCH, VLOOKUP, HLOOKUP, XLOOKUP, LOOKUP) compare numbers exactly like Excel, so a computed key such as `=0.1+0.2` no longer finds 0.3; `=` and COUNTIF/SUMIF keep their 15-digit comparison | | 2026-10-14 | Functions: EOMONTH, EDATE, WORKDAY, NETWORKDAYS, YEARFRAC, WEEKNUM, the bond and coupon functions, DISC, BIN2DEC, IM* and the other Analysis ToolPak functions give `#VALUE!` for a reference to more than one cell in a value argument, as Excel 365 does, instead of spilling; array constants and computed arrays still lift | @@ -287,6 +287,7 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in | 2026-10-31 | minor | Progress log: Recently Used and Insert Function categories | | 2026-10-31 | minor | Progress log: Function Library | | 2026-10-31 | minor | Progress log: shared CJK/Latin baselines in cells, editors and window titles | +| 2026-10-26 | minor | Progress log: PDF reading direction and RTL sheets | | 2026-10-26 | minor | Progress log: Arabic PDF text | | 2026-10-26 | minor | Progress log: Arabic bidi display and editing | | 2026-10-26 | minor | Progress log: Arabic font fallback | @@ -308,7 +309,6 @@ Ranked; estimates in Opus 5.5 agent-hours. Detail and the full beta-gate list in | 2026-10-16 | minor | Progress log: floating pictures' textures bounded and kept per workbook | | 2026-10-16 | trivial | Progress log: web preferences kept between visits (#1562) | | 2026-10-16 | minor | Progress log: interface fonts held once instead of twice | -| 2026-10-14 | trivial | Progress log: pivot cache import warnings (#1039) | | 2026-10-14 | minor | Progress log: Set precision as displayed applied in calculation (#1343) | | 2026-10-14 | minor | Progress log: `.xls` import reads cell formatting | | 2026-10-14 | minor | Progress log: lookups compare numbers exactly | diff --git a/crates/engine/src/cmd/print.rs b/crates/engine/src/cmd/print.rs index c951a7af4..0f6ba272c 100644 --- a/crates/engine/src/cmd/print.rs +++ b/crates/engine/src/cmd/print.rs @@ -13,10 +13,10 @@ use gridcraft_core::{CellRef, MAX_COLS, MAX_ROWS, RangeRef, Value}; #[cfg(test)] use gridcraft_model::{Alignment, Image, SheetViewMode}; use gridcraft_model::{ - Anchor, BorderLine, BorderStyle, Borders, Color, HAlign, Orientation, PageOrder, PatternType, PrintSettings, ShapeKind, Sheet, Style, StyleId, - StyleTable, Underline, VAlign, Visibility, Workbook, + Anchor, BorderLine, BorderStyle, Borders, Color, HAlign, Orientation, PageOrder, PatternType, PrintSettings, ReadingOrder, ShapeKind, Sheet, + Style, StyleId, StyleTable, Underline, VAlign, Visibility, Workbook, }; -use gridcraft_pdf::{Font, Page, PdfDoc, Point, Rect, Rgb}; +use gridcraft_pdf::{Baseline, Font, Page, PdfDoc, Point, Rect, Rgb, TextDirection}; use serde_json::{Value as Json, json}; use super::{ @@ -199,7 +199,16 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str let b = make_block(wb, lay.sheet, sh, *rs, *cs, (x, y), lay); draw_block(pg, &b, lay.settings.gridlines, &mut cf); draw_block_links(pg, &b, page_index, &mut pending_links); - printed_blocks.push(PrintedBlock { page: page_index, sheet: lay.sheet, rows: *rs, cols: *cs, x, y, k }); + printed_blocks.push(PrintedBlock { + page: page_index, + sheet: lay.sheet, + rows: *rs, + cols: *cs, + x, + y, + k, + mirror_axis: sh.right_to_left.then_some(b.mirror_axis), + }); if lay.settings.headings { draw_headings(pg, &b, rsi == 0, csi == 0, (ox, oy), (lay.heading_w * k, lay.heading_h * k)); } @@ -215,6 +224,7 @@ pub fn render_pdf(wb: &Workbook, layouts: &[SheetLayout], file: &str, path: &str } if lay.settings.headings { let fill = [0xF2, 0xF2, 0xF2]; + let ox = if sh.right_to_left { lay.page_w - ox - lay.heading_w * k } else { ox }; pg.fill_rect(ox, oy, lay.heading_w * k, lay.heading_h * k, fill); pg.rect_stroke(ox, oy, lay.heading_w * k, lay.heading_h * k, 0.3, [0xA0, 0xA0, 0xA0]); } diff --git a/crates/engine/src/cmd/print/draw.rs b/crates/engine/src/cmd/print/draw.rs index 595b70d86..35fd41bd4 100644 --- a/crates/engine/src/cmd/print/draw.rs +++ b/crates/engine/src/cmd/print/draw.rs @@ -32,6 +32,9 @@ fn cell_look(wb: &Workbook, si: usize, sh: &Sheet, c: CellRef, cf: &mut Option { pub(super) ys: Vec, pub(super) k: f32, pub(super) scale: f32, + pub(super) mirror_axis: f32, } impl Block<'_> { + fn point_x(&self, x: f32) -> f32 { + if self.sh.right_to_left { self.mirror_axis - x } else { x } + } + pub(super) fn text_x(&self, x: f32, width: f32) -> f32 { + if self.sh.right_to_left { self.mirror_axis - x - width } else { x } + } + pub(super) fn drawn_rect(&self, r: RangeRef) -> (f32, f32, f32, f32) { + let (x, y, w, h) = self.rect(r); + (self.text_x(x, w), y, w, h) + } fn x(&self, col: u32) -> f32 { if col >= self.cols.0 && col <= self.cols.1 + 1 { return self.xs.get((col - self.cols.0) as usize).copied().unwrap_or(0.0); @@ -328,15 +342,15 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt set }; pg.save(); - pg.clip_rect(bx, by, bw, bh); + pg.clip_rect(b.text_x(bx, bw), by, bw, bh); if gridlines { let grey = [0xB0, 0xB0, 0xB0]; let lw = (0.35 * b.scale).clamp(0.1, 0.5); for x in &b.xs { - pg.stroke_line(*x, by, *x, by + bh, lw, grey); + pg.stroke_line(b.point_x(*x), by, b.point_x(*x), by + bh, lw, grey); } for y in &b.ys { - pg.stroke_line(bx, *y, bx + bw, *y, lw, grey); + pg.stroke_line(b.point_x(bx), *y, b.point_x(bx + bw), *y, lw, grey); } } // Cheap pre-filter: blank, unstyled cells outside tables and conditional formats draw nothing. @@ -379,17 +393,17 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt continue; } if let Some(f) = l.fill { - pg.fill_rect(x, y, w, h, f); + pg.fill_rect(b.text_x(x, w), y, w, h, f); } else if merged && gridlines { - pg.fill_rect(x, y, w, h, [255, 255, 255]); + pg.fill_rect(b.text_x(x, w), y, w, h, [255, 255, 255]); } if merged && gridlines { - pg.rect_stroke(x, y, w, h, (0.35 * b.scale).clamp(0.1, 0.5), [0xB0, 0xB0, 0xB0]); + pg.rect_stroke(b.text_x(x, w), y, w, h, (0.35 * b.scale).clamp(0.1, 0.5), [0xB0, 0xB0, 0xB0]); } if let Some((frac, rgb, _)) = l.cf.as_ref().and_then(|cf| cf.bar) { let pad = 1.5 * b.k; let bwid = ((w - 2.0 * pad) * frac.clamp(0.0, 1.0)).max(0.0); - pg.fill_rect(x + pad, y + pad, bwid, (h - 2.0 * pad).max(0.0), rgb); + pg.fill_rect(b.text_x(x + pad, bwid), y + pad, bwid, (h - 2.0 * pad).max(0.0), rgb); } } // Borders. @@ -406,12 +420,12 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt ), None => (bd.right, bd.bottom), }; - draw_border(pg, &bd.top, b.wb, Point::new(x, y), Point::new(x + w, y), b.k); - draw_border(pg, &bottom, b.wb, Point::new(x, y + h), Point::new(x + w, y + h), b.k); - draw_border(pg, &bd.left, b.wb, Point::new(x, y), Point::new(x, y + h), b.k); - draw_border(pg, &right, b.wb, Point::new(x + w, y), Point::new(x + w, y + h), b.k); - draw_border(pg, &bd.diag_down, b.wb, Point::new(x, y), Point::new(x + w, y + h), b.k); - draw_border(pg, &bd.diag_up, b.wb, Point::new(x, y + h), Point::new(x + w, y), b.k); + draw_border(pg, &bd.top, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x + w), y), b.k); + draw_border(pg, &bottom, b.wb, Point::new(b.point_x(x), y + h), Point::new(b.point_x(x + w), y + h), b.k); + draw_border(pg, &bd.left, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x), y + h), b.k); + draw_border(pg, &right, b.wb, Point::new(b.point_x(x + w), y), Point::new(b.point_x(x + w), y + h), b.k); + draw_border(pg, &bd.diag_down, b.wb, Point::new(b.point_x(x), y), Point::new(b.point_x(x + w), y + h), b.k); + draw_border(pg, &bd.diag_up, b.wb, Point::new(b.point_x(x), y + h), Point::new(b.point_x(x + w), y), b.k); } // Text. for (c, l) in &looks { @@ -420,9 +434,9 @@ pub(super) fn draw_block(pg: &mut Page, b: &Block, gridlines: bool, cf: &mut Opt continue; } if let Some(picture) = sh.cell_pictures.get(c) { - draw_cell_picture(pg, &picture.data, (x, y, w, h), b.k); + draw_cell_picture(pg, &picture.data, (b.text_x(x, w), y, w, h), b.k); } else if let Some(on) = checkbox_state(l, &sh.value(*c)) { - draw_checkbox(pg, (x, y, w, h), b.k, on); + draw_checkbox(pg, (b.text_x(x, w), y, w, h), b.k, on); } else { draw_text(pg, b, TextPlacement { cell: *c, look: l, rect: (x, y, w, h), merged, merges: &merges, limits: (bx, bx + bw) }); } @@ -476,6 +490,8 @@ pub(super) struct PrintedBlock { pub(super) x: f32, pub(super) y: f32, pub(super) k: f32, + /// The page x that right-to-left sheets are mirrored about; `None` for left-to-right sheets. + pub(super) mirror_axis: Option, } /// PDF annotations are not affected by graphics clipping, so intersect each cell with its page @@ -495,7 +511,7 @@ pub(super) fn draw_block_links(pg: &mut Page, b: &Block, page: usize, pending: & if x1 <= x0 || y1 <= y0 { continue; } - let rect = (x0, y0, x1 - x0, y1 - y0); + let rect = (b.text_x(x0, x1 - x0), y0, x1 - x0, y1 - y0); match crate::links::classify(&link.target) { crate::links::LinkKind::External(uri) => pg.link_uri(rect.0, rect.1, rect.2, rect.3, &uri), crate::links::LinkKind::Internal(target) if !link.external => { @@ -514,6 +530,10 @@ pub(super) fn printed_target(wb: &Workbook, blocks: &[PrintedBlock], source_shee let sh = wb.sheet(sheet)?; let block = blocks.iter().find(|b| b.sheet == sheet && (b.rows.0..=b.rows.1).contains(&cell.row) && (b.cols.0..=b.cols.1).contains(&cell.col))?; let x = block.x + (sh.col_left(cell.col) - sh.col_left(block.cols.0)) as f32 * block.k; + let x = match block.mirror_axis { + Some(axis) => axis - x - (sh.col_left(cell.col.saturating_add(1)) - sh.col_left(cell.col)) as f32 * block.k, + None => x, + }; let y = block.y + (sh.row_top(cell.row) - sh.row_top(block.rows.0)) as f32 * block.k; Some((block.page, x, y)) } @@ -530,11 +550,11 @@ pub(super) fn draw_headings(pg: &mut Page, b: &Block, col_heads: bool, row_heads if x1 - x0 <= 0.0 { continue; } - pg.fill_rect(x0, y, x1 - x0, size.1, fill); - pg.rect_stroke(x0, y, x1 - x0, size.1, lw, line); + pg.fill_rect(b.text_x(x0, x1 - x0), y, x1 - x0, size.1, fill); + pg.rect_stroke(b.text_x(x0, x1 - x0), y, x1 - x0, size.1, lw, line); let t = gridcraft_core::col_to_letters(col); let tw = gridcraft_pdf::text_width(Font::Helvetica, fsize, &t); - pg.text(x0 + (x1 - x0 - tw) / 2.0, y + size.1 / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t); + pg.text(b.text_x(x0 + (x1 - x0 - tw) / 2.0, tw), y + size.1 / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t); } } if row_heads { @@ -544,11 +564,11 @@ pub(super) fn draw_headings(pg: &mut Page, b: &Block, col_heads: bool, row_heads if y1 - y0 <= 0.0 { continue; } - pg.fill_rect(x, y0, size.0, y1 - y0, fill); - pg.rect_stroke(x, y0, size.0, y1 - y0, lw, line); + pg.fill_rect(b.text_x(x, size.0), y0, size.0, y1 - y0, fill); + pg.rect_stroke(b.text_x(x, size.0), y0, size.0, y1 - y0, lw, line); let t = (row + 1).to_string(); let tw = gridcraft_pdf::text_width(Font::Helvetica, fsize, &t); - pg.text(x + (size.0 - tw) / 2.0, y0 + (y1 - y0) / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t); + pg.text(b.text_x(x + (size.0 - tw) / 2.0, tw), y0 + (y1 - y0) / 2.0 + fsize * 0.35, fsize, Font::Helvetica, [0x40, 0x40, 0x40], &t); } } } @@ -579,7 +599,7 @@ pub(super) fn make_block<'a>( acc += sh.row_height(r) * k; ys.push(acc); } - Block { wb, si, sh, rows, cols, xs, ys, k, scale: lay.scale } + Block { wb, si, sh, rows, cols, xs, ys, k, scale: lay.scale, mirror_axis: lay.page_w } } #[cfg(test)] diff --git a/crates/engine/src/cmd/print/objects.rs b/crates/engine/src/cmd/print/objects.rs index 55d9f8ac8..5b786b701 100644 --- a/crates/engine/src/cmd/print/objects.rs +++ b/crates/engine/src/cmd/print/objects.rs @@ -1,6 +1,6 @@ use super::draw::{Block, PdfMeasure, Xf, draw_prims, rgb_of}; use super::text::wrap_lines; -use super::{Anchor, Font, Page, RangeRef, Rect, ShapeKind, Sheet, Value, Workbook}; +use super::{Anchor, Font, Page, Point, RangeRef, Rect, ShapeKind, Sheet, TextDirection, Value, Workbook}; /// Cell pictures fit the current cell (or merged-cell) rectangle without changing aspect ratio. pub(super) fn draw_cell_picture(pg: &mut Page, data: &[u8], rect: (f32, f32, f32, f32), k: f32) { @@ -76,9 +76,11 @@ pub(super) fn draw_objects(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet, let (bx, by) = (b.xs.first().copied().unwrap_or(0.0), b.ys.first().copied().unwrap_or(0.0)); let (bw, bh) = (b.xs.last().copied().unwrap_or(bx) - bx, b.ys.last().copied().unwrap_or(by) - by); let visible = |r: (f64, f64, f64, f64)| r.2 > 0.0 && r.3 > 0.0 && r.0 < sx1 && r.0 + r.2 > sx0 && r.1 < sy1 && r.1 + r.3 > sy0; - let place = |r: (f64, f64, f64, f64)| (bx + ((r.0 - sx0) as f32) * b.k, by + ((r.1 - sy0) as f32) * b.k, r.2 as f32 * b.k, r.3 as f32 * b.k); + let place = |r: (f64, f64, f64, f64)| { + (b.text_x(bx + ((r.0 - sx0) as f32) * b.k, r.2 as f32 * b.k), by + ((r.1 - sy0) as f32) * b.k, r.2 as f32 * b.k, r.3 as f32 * b.k) + }; pg.save(); - pg.clip_rect(bx, by, bw, bh); + pg.clip_rect(b.text_x(bx, bw), by, bw, bh); draw_sparklines(pg, wb, si, sh, b, block); for (imi, im) in sh.images.iter().enumerate() { let r = anchor_rect(sh, &im.anchor); @@ -153,9 +155,19 @@ fn draw_sparklines(pg: &mut Page, wb: &Workbook, si: usize, sh: &Sheet, b: &Bloc v => vec![v.as_f64()], }; let color = rgb_of(sp.color, wb).unwrap_or([0x15, 0x60, 0x82]); - let (x, y, w, h) = b.rect(RangeRef::cell(sp.cell)); + let (x, y, w, h) = b.drawn_rect(RangeRef::cell(sp.cell)); let (wpx, hpx) = (w / b.k, h / b.k); - let prims = gridcraft_chart::render_sparkline(sp.kind, &vals, [color[0], color[1], color[2], 255], sp.markers, wpx, hpx); + let mut prims = gridcraft_chart::render_sparkline(sp.kind, &vals, [color[0], color[1], color[2], 255], sp.markers, wpx, hpx); + if sh.right_to_left { + for prim in &mut prims { + match prim { + gridcraft_chart::Prim::Rect { x, w, .. } => *x = wpx - *x - *w, + gridcraft_chart::Prim::Line { pts, .. } => pts.iter_mut().for_each(|p| p[0] = wpx - p[0]), + gridcraft_chart::Prim::Circle { cx, .. } => *cx = wpx - *cx, + _ => {} + } + } + } draw_prims(pg, &prims, Xf { ox: x, oy: y, k: b.k }); } } @@ -199,7 +211,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl let color = fm.text_color.and_then(|c| rgb_of(c, wb)).unwrap_or([0, 0, 0]); let align = fm.align.unwrap_or(if text_box { ShapeTextAlign::Left } else { ShapeTextAlign::Center }); let anchor = fm.anchor.unwrap_or(if text_box { ShapeTextAnchor::Top } else { ShapeTextAnchor::Middle }); - let lines = wrap_lines(&shp.text, font, size, (w - 4.0 * b.k).max(size)); + let lines = wrap_lines(&shp.text, font, size, (w - 4.0 * b.k).max(size), TextDirection::Auto); let block_h = lines.len().min(500) as f32 * size * 1.2; let mut yy = match anchor { ShapeTextAnchor::Top => y + 2.0 * b.k, @@ -207,7 +219,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl ShapeTextAnchor::Bottom => y + h - 2.0 * b.k - block_h, } + size * 0.8; for l in lines.iter().take(500) { - let lw = gridcraft_pdf::text_width(font, size, l); + let lw = gridcraft_pdf::text_width_with_direction(font, size, &l.text, l.direction); let lx = match align { ShapeTextAlign::Left => x + 2.0 * b.k, ShapeTextAlign::Center => x + (w - lw) / 2.0, @@ -216,7 +228,7 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl // WordArt's drop shadow: the line again, offset, in the shadow colour (under the text). if let Some(sc) = fm.text_shadow.and_then(|c| rgb_of(c, wb)) { let off = (size * 0.06).max(0.5); - pg.text(lx + off, yy + off, size, font, sc, l); + pg.text_with_direction(Point::new(lx + off, yy + off), size, font, sc, &l.text, l.direction); } // WordArt's text outline, as on screen: the line in the outline colour, offset in eight // directions by half the outline width, under the filled text. @@ -225,10 +237,10 @@ fn draw_shape(pg: &mut Page, wb: &Workbook, shp: &gridcraft_model::Shape, b: &Bl { let d = (ow * b.scale / 2.0).clamp(0.25, 20.0); for (dx, dy) in [(-1.0, -1.0), (0.0, -1.0), (1.0, -1.0), (-1.0, 0.0), (1.0, 0.0), (-1.0, 1.0), (0.0, 1.0), (1.0, 1.0)] { - pg.text(lx + dx * d, yy + dy * d, size, font, oc, l); + pg.text_with_direction(Point::new(lx + dx * d, yy + dy * d), size, font, oc, &l.text, l.direction); } } - pg.text(lx, yy, size, font, color, l); + pg.text_with_direction(Point::new(lx, yy), size, font, color, &l.text, l.direction); yy += size * 1.2; } } diff --git a/crates/engine/src/cmd/print/tests.rs b/crates/engine/src/cmd/print/tests.rs index e38ebf55b..884432317 100644 --- a/crates/engine/src/cmd/print/tests.rs +++ b/crates/engine/src/cmd/print/tests.rs @@ -1,3 +1,4 @@ +use gridcraft_model::{Sparkline, SparklineKind}; use serde_json::json; use super::*; @@ -21,6 +22,30 @@ fn arabic_face_available() -> bool { !doc.missing_arabic_font() } +#[test] +fn right_to_left_sheets_mirror_link_rectangles_and_targets() { + fn numbers_after(pdf: &[u8], key: &str, n: usize) -> Vec { + let text = String::from_utf8_lossy(pdf); + let at = text.find(key).unwrap() + key.len(); + text[at..].split([' ', ']']).filter_map(|t| t.parse().ok()).take(n).collect() + } + let mut s = s(); + s.execute("insert.link", json!({"cell": "A1", "target": "https://example.org/report"})).unwrap(); + s.execute("insert.link", json!({"cell": "A2", "target": "Sheet1!B60"})).unwrap(); + s.execute("cell.set", json!({"cell": "B60", "input": "Destination"})).unwrap(); + let (ltr, _) = pdf_of(&mut s, json!({})); + s.execute("view.rightToLeft", json!({"on": true})).unwrap(); + let (rtl, _) = pdf_of(&mut s, json!({})); + let axis = numbers_after(<r, "/MediaBox [", 4)[2]; + let (l, r) = (numbers_after(<r, "/Rect [", 4), numbers_after(&rtl, "/Rect [", 4)); + assert!((r[0] - (axis - l[2])).abs() < 0.01 && (r[2] - (axis - l[0])).abs() < 0.01, "{l:?} mirrors to {r:?}"); + assert_eq!(r[1], l[1]); + let b_width = s.doc().unwrap().wb.active().unwrap().col_width(1); + let (lx, rx) = (numbers_after(<r, "/XYZ ", 1)[0], numbers_after(&rtl, "/XYZ ", 1)[0]); + let k = (l[2] - l[0]) / s.doc().unwrap().wb.active().unwrap().col_width(0); + assert!((rx - (axis - lx - b_width * k)).abs() < 0.01, "target {lx} mirrors to {rx}"); +} + #[test] fn chart_data_table_prints_formatted_values_and_follows_recalculation() { let mut s = s(); @@ -75,9 +100,9 @@ fn arabic_with_characters_its_font_lacks_still_exports() { #[test] fn wrapping_keeps_combining_marks_with_their_letters() { let word = "a\u{301}a\u{301}a\u{301}a\u{301}"; - let lines = wrap_lines(word, Font::Helvetica, 10.0, 7.0); - assert_eq!(lines.concat(), word); - assert!(lines.iter().all(|line| line == "a\u{301}")); + let lines = wrap_lines(word, Font::Helvetica, 10.0, 7.0, TextDirection::Auto); + assert_eq!(lines.iter().map(|line| line.text.as_str()).collect::(), word); + assert!(lines.iter().all(|line| line.text == "a\u{301}")); } #[test] @@ -113,15 +138,149 @@ fn arabic_cells_headers_and_charts_export_searchable_shaped_text() { let utf16 = text.encode_utf16().map(|unit| format!("{unit:04X}")).collect::(); assert!(contains(&pdf, &format!("/ActualText ")), "missing text {text}"); } - let lines = wrap_lines("العَرَبِيَّةالعَرَبِيَّة", Font::Helvetica, 20.0, 40.0); - assert_eq!(lines.concat(), "العَرَبِيَّةالعَرَبِيَّة"); - assert!(lines.iter().all(|line| !line.starts_with(['َ', 'ِ', 'ُ', 'ّ', 'ْ']))); - assert!(lines.iter().all(|line| gridcraft_pdf::text_width(Font::Helvetica, 20.0, line) <= 40.0)); + let lines = wrap_lines("العَرَبِيَّةالعَرَبِيَّة", Font::Helvetica, 20.0, 40.0, TextDirection::Auto); + assert_eq!(lines.iter().map(|line| line.text.as_str()).collect::(), "العَرَبِيَّةالعَرَبِيَّة"); + assert!(lines.iter().all(|line| !line.text.starts_with(['َ', 'ِ', 'ُ', 'ّ', 'ْ']))); + assert!(lines.iter().all(|line| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 20.0, &line.text, line.direction) <= 40.0)); let path = std::env::temp_dir().join(format!("gridcraft-arabic-export-{}.pdf", std::process::id())); std::fs::write(&path, &pdf).unwrap(); eprintln!("Arabic PDF artifact: {}", path.display()); } +#[test] +fn arabic_reading_order_export_artifact() { + if !arabic_face_available() && std::env::var_os("CRAFT_FONTS_REQUIRED").is_none() { + return; + } + let mut s = s(); + s.execute("range.setValues", json!({"range": "A1", "values": [["Context", "LeftToRight", "RightToLeft"], ["مرحبا ABC !", "مرحبا ABC !", "مرحبا ABC !"], ["123 مرحبا ABC", "123 مرحبا ABC", "123 مرحبا ABC"], ["(مرحبا) ABC", "(مرحبا) ABC", "(مرحبا) ABC"], ["مرحبا ABC ! DEF ? مرحبا", "مرحبا ABC ! DEF ? مرحبا", "مرحبا ABC ! DEF ? مرحبا"]]})).unwrap(); + s.execute("home.columnWidth", json!({"cols": "A:C", "chars": 24})).unwrap(); + s.execute("home.rowHeight", json!({"rows": "1:5", "height": 60})).unwrap(); + s.execute("home.fontSize", json!({"range": "A2:C5", "size": 18})).unwrap(); + for (range, order) in [("A2:A5", "Context"), ("B2:B5", "LeftToRight"), ("C2:C5", "RightToLeft")] { + s.execute("home.formatCells", json!({"range": range, "style": {"align": {"reading_order": order}}})).unwrap(); + } + s.execute("home.wrapText", json!({"range": "A5:C5"})).unwrap(); + s.execute("pageLayout.pageSetup", json!({"gridlines": true, "header": "&CArabic cell reading order"})).unwrap(); + let (pdf, _) = pdf_of(&mut s, json!({})); + for text in ["مرحبا ABC !", "123 مرحبا ABC", "(مرحبا) ABC"] { + let utf16 = text.encode_utf16().map(|unit| format!("{unit:04X}")).collect::(); + assert!(contains(&pdf, &format!("/ActualText "))); + } + let path = std::env::temp_dir().join(format!("gridcraft-arabic-reading-order-{}.pdf", std::process::id())); + std::fs::write(&path, &pdf).unwrap(); + eprintln!("Arabic reading-order PDF artifact: {}", path.display()); +} + +#[test] +fn wrapped_lines_keep_the_paragraph_direction() { + let lines = wrap_lines("مرحبا ABC ! DEF ?\nLatin مرحبا !", Font::Helvetica, 10.0, 30.0, TextDirection::Auto); + let split = lines.iter().position(|l| l.text.starts_with("Latin")).unwrap(); + assert!(split > 0); + assert!(lines[..split].iter().all(|l| l.direction == TextDirection::RightToLeft)); + assert!(lines[split..].iter().all(|l| l.direction == TextDirection::LeftToRight)); + let lines = wrap_lines("123 مرحبا ABC !", Font::Helvetica, 10.0, 30.0, TextDirection::Context.resolve("123 مرحبا ABC !")); + assert!(lines.iter().all(|l| l.direction == TextDirection::LeftToRight)); +} + +fn exported_text_x(pdf: &[u8], text: &str) -> f32 { + let pdf = String::from_utf8_lossy(pdf); + let marker = format!("({text}) Tj"); + let before = &pdf[..pdf.find(&marker).unwrap()]; + let matrix = before.lines().rev().find(|line| line.ends_with(" Tm")).unwrap(); + matrix.split_whitespace().nth(4).unwrap().parse().unwrap() +} + +#[test] +fn cell_reading_order_and_conditional_context_reach_pdf() { + let mut s = s(); + s.execute("cell.set", json!({"cell": "A1", "input": "ABC !"})).unwrap(); + s.execute("home.formatCells", json!({"range": "A1", "style": {"align": {"reading_order": "RightToLeft"}}})).unwrap(); + let (rtl, _) = pdf_of(&mut s, json!({})); + assert!(contains(&rtl, "(! ABC) Tj")); + assert!(!contains(&rtl, "/Subtype /Type3")); + s.execute("home.conditionalFormat", json!({"range": "A1", "rule": {"type": "noBlanks", "style": {"align": {"reading_order": "Context"}}}})) + .unwrap(); + let (context, _) = pdf_of(&mut s, json!({})); + assert!(contains(&context, "(ABC !) Tj")); + assert!(!contains(&context, "(! ABC) Tj")); + assert!(exported_text_x(&rtl, "! ABC") > exported_text_x(&context, "ABC !")); +} + +#[test] +fn rtl_sheet_sparkline_reflects_with_cell_geometry() { + let mut wb = Workbook::new(); + let sh = wb.sheet_mut(0).unwrap(); + sh.set_value(CellRef::new(0, 0), Value::Number(1.0)); + sh.set_value(CellRef::new(1, 0), Value::Number(3.0)); + sh.sparklines.push(Sparkline { + cell: CellRef::new(0, 1), + source: "A1:A2".into(), + kind: SparklineKind::Line, + color: Color::rgb(255, 0, 0), + markers: false, + }); + let options = PrintOptions { range: RangeRef::parse("A1:B2"), ..PrintOptions::default() }; + let ltr = render_pdf(&wb, &layouts(&wb, &options), "", "").unwrap().bytes; + wb.sheet_mut(0).unwrap().right_to_left = true; + let rtl = render_pdf(&wb, &layouts(&wb, &options), "", "").unwrap().bytes; + let points = |pdf: &[u8]| { + let pdf = String::from_utf8_lossy(pdf); + let after = pdf.split("1 0 0 RG\n").nth(1).unwrap(); + let line = after.lines().find(|line| line.ends_with(" l S")).unwrap(); + let values: Vec<_> = line.split_whitespace().collect(); + (values[0].parse::().unwrap(), values[3].parse::().unwrap()) + }; + let (left0, left1) = points(<r); + let (right0, right1) = points(&rtl); + assert!(left0 < left1 && right0 > right1); + assert!((left0 + right0 - 612.0).abs() < 0.001); + assert!((left1 + right1 - 612.0).abs() < 0.001); +} + +#[test] +fn explicit_left_and_right_keep_their_side_on_a_right_to_left_sheet() { + let mut s = s(); + s.execute("range.setValues", json!({"range": "A1", "values": [["LEFT"], ["RIGHT"]]})).unwrap(); + s.execute("home.alignLeft", json!({"range": "A1"})).unwrap(); + s.execute("home.alignRight", json!({"range": "A2"})).unwrap(); + let (ltr, _) = pdf_of(&mut s, json!({})); + s.execute("view.rightToLeft", json!({"on": true})).unwrap(); + let (rtl, _) = pdf_of(&mut s, json!({})); + let width = |label| gridcraft_pdf::text_width(Font::Helvetica, 11.0, label); + let (left, right) = (width("LEFT"), width("RIGHT")); + let ltr_gap = exported_text_x(<r, "RIGHT") + right - exported_text_x(<r, "LEFT"); + let rtl_gap = exported_text_x(&rtl, "RIGHT") + right - exported_text_x(&rtl, "LEFT"); + assert!((ltr_gap - rtl_gap).abs() < 0.01, "Left stays left of Right in the cell: {ltr_gap}, {rtl_gap}"); + assert!(exported_text_x(&rtl, "LEFT") + left < exported_text_x(&rtl, "RIGHT") + right); +} + +#[test] +fn rtl_sheet_pdf_mirrors_cells_merges_headings_and_object_anchors() { + let mut s = s(); + s.execute("range.setValues", json!({"range": "A1", "values": [["FIRST", "SECOND"], [null, "MERGED"]]})).unwrap(); + s.execute("home.mergeCenter", json!({"range": "B2:C2"})).unwrap(); + s.execute("pageLayout.pageSetup", json!({"printArea": "A1:D5", "headings": true, "gridlines": true, "left": 0.8, "right": 0.4})).unwrap(); + s.execute("insert.shape", json!({"kind": "rectangle", "at": "B4", "width": 128, "height": 30, "text": "OBJECT"})).unwrap(); + let (ltr, _) = pdf_of(&mut s, json!({})); + s.execute("view.rightToLeft", json!({"on": true})).unwrap(); + let (rtl, _) = pdf_of(&mut s, json!({})); + for label in ["FIRST", "SECOND", "MERGED", "A", "B", "C", "D", "1", "2", "OBJECT"] { + let left = exported_text_x(<r, label); + let right = exported_text_x(&rtl, label); + let font_size = if ["A", "B", "C", "D", "1", "2"].contains(&label) { 9.0 } else { 11.0 }; + let width = gridcraft_pdf::text_width(Font::Helvetica, font_size, label); + assert!((left + right + width - 612.0).abs() < 0.01, "{label}: {left}, {right}, {width}"); + } + assert!(exported_text_x(<r, "FIRST") < exported_text_x(<r, "SECOND")); + assert!(exported_text_x(&rtl, "FIRST") > exported_text_x(&rtl, "SECOND")); + for (name, pdf) in [("ltr", ltr), ("rtl", rtl)] { + let path = std::env::temp_dir().join(format!("gridcraft-print-direction-{name}-{}.pdf", std::process::id())); + std::fs::write(&path, pdf).unwrap(); + eprintln!("Print direction PDF artifact: {}", path.display()); + } +} + #[test] fn header_sections_split_join_and_field_names() { let spec = "&L&\"Arial,Bold\"Sales &&Co&CPage &P of &N&R&D"; @@ -758,11 +917,32 @@ fn bands_unit() { let b = bands(0, 2, |r| if r == 1 { 100.0 } else { 10.0 }, |_| 35.0, &[], 100); assert_eq!(b, vec![(0, 0), (1, 1), (2, 2)]); assert_eq!(bands(0, 1_000_000, |_| 10.0, |_| 5.0, &[], 3).len(), 3); - let w = wrap_lines("the quick brown fox jumps", Font::Helvetica, 10.0, 50.0); + let w = wrap_lines("the quick brown fox jumps", Font::Helvetica, 10.0, 50.0, TextDirection::Auto); assert!(w.len() >= 2); - assert!(w.iter().all(|l| gridcraft_pdf::text_width(Font::Helvetica, 10.0, l) <= 50.0 || !l.contains(' '))); - let w = wrap_lines("Supercalifragilistic", Font::Helvetica, 10.0, 20.0); + assert!(w.iter().all(|l| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, &l.text, l.direction) <= 50.0 || !l.text.contains(' '))); + let w = wrap_lines("Supercalifragilistic", Font::Helvetica, 10.0, 20.0, TextDirection::Auto); assert!(w.len() > 2); + let long = "abcdefghij".repeat(300); + let w = wrap_lines(&long, Font::Helvetica, 10.0, 50.0, TextDirection::Auto); + assert_eq!(w.iter().map(|l| l.text.as_str()).collect::(), long); + assert!(w.iter().all(|l| gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, &l.text, l.direction) <= 50.0)); + let mut at = 0; + for l in &w[..w.len() - 1] { + let one_more = &long[at..at + l.text.len() + 1]; + assert!(gridcraft_pdf::text_width_with_direction(Font::Helvetica, 10.0, one_more, l.direction) > 50.0, "each split is as long as fits"); + at += l.text.len(); + } +} + +fn wrapped_text(text: &str, font: Font, size: f32, width: f32) -> Vec { + wrap_lines(text, font, size, width, TextDirection::Auto).into_iter().map(|line| line.text).collect() +} + +#[test] +fn wrapping_ignores_the_width_of_undrawn_bidi_marks() { + let word = "i\u{200e}".repeat(20); + assert!(gridcraft_pdf::text_width(Font::Helvetica, 10.0, &word) <= 50.0); + assert_eq!(wrapped_text(&word, Font::Helvetica, 10.0, 50.0), vec![word.clone()]); } /// The wrapper `wrap_lines` replaced, re-measuring strings, as the reference for its lines. @@ -819,7 +999,11 @@ fn wrap_lines_matches_the_remeasuring_wrapper() { for text in texts { for font in [Font::Helvetica, Font::HelveticaBold, Font::Courier] { for (size, width) in [(10.0, 50.0), (10.0, 20.0), (11.0, 1.0), (8.0, 300.0), (12.0, 0.0)] { - assert_eq!(wrap_lines(text, font, size, width), wrap_lines_remeasuring(text, font, size, width), "{text:?} {font:?} {size} {width}"); + assert_eq!( + wrapped_text(text, font, size, width), + wrap_lines_remeasuring(text, font, size, width), + "{text:?} {font:?} {size} {width}" + ); } } } @@ -830,12 +1014,12 @@ fn wrapping_a_long_word_in_a_narrow_box_stops_at_the_line_limit() { // One character per line: the old wrapper re-measured and copied the rest of the word for // each of the 100,000 lines before checking the limit. let word = "w".repeat(100_000); - let lines = wrap_lines(&word, Font::Helvetica, 10.0, 1.0); + let lines = wrapped_text(&word, Font::Helvetica, 10.0, 1.0); assert!(lines.len() <= 2002, "{}", lines.len()); assert!(lines.iter().all(|l| l == "w")); // A long paragraph in a very wide box is one line. let para = vec!["word"; 50_000].join(" "); - assert_eq!(wrap_lines(¶, Font::Helvetica, 10.0, 1.0e9), vec![para.clone()]); + assert_eq!(wrapped_text(¶, Font::Helvetica, 10.0, 1.0e9), vec![para.clone()]); } #[test] @@ -844,7 +1028,7 @@ fn wrapping_a_long_arabic_word_measures_pieces_not_the_rest_of_the_word() { if !arabic_face_available() { return; } - let lines = wrap_lines(&word, Font::Helvetica, 10.0, 20.0); + let lines = wrapped_text(&word, Font::Helvetica, 10.0, 20.0); assert!(lines.len() > 2000 && lines.len() <= 2002, "{}", lines.len()); assert!(lines.iter().take(2000).all(|line| gridcraft_pdf::text_width(Font::Helvetica, 10.0, line) <= 20.0)); assert!(word.starts_with(&lines.concat())); diff --git a/crates/engine/src/cmd/print/text.rs b/crates/engine/src/cmd/print/text.rs index 8523132fb..3c4c8374d 100644 --- a/crates/engine/src/cmd/print/text.rs +++ b/crates/engine/src/cmd/print/text.rs @@ -1,5 +1,8 @@ use super::draw::{Block, Look, rgb_of}; -use super::{CellRef, Color, Font, HAlign, MAX_COLS, Page, Point, RangeRef, Sheet, Style, StyleTable, Underline, VAlign, Value}; +use super::{ + Baseline, CellRef, Color, Font, HAlign, MAX_COLS, Page, Point, RangeRef, ReadingOrder, Sheet, Style, StyleTable, TextDirection, Underline, + VAlign, Value, +}; use unicode_segmentation::UnicodeSegmentation; const PAD_PX: f32 = 2.0; @@ -7,93 +10,105 @@ const PAD_PX: f32 = 2.0; /// Most lines [`wrap_lines`] returns (it may return one more, the rest of a paragraph). const MAX_WRAP_LINES: usize = 2000; -/// Word-wraps `text` to `width` points. +pub(super) struct TextLine { + pub(super) text: String, + pub(super) direction: TextDirection, +} + +/// Word-wraps `text` to `width` points, keeping each paragraph's base direction on every +/// continuation line. /// /// Widths are kept as running sums of glyph widths (the sum `text_width` makes), so each /// character is measured once: re-measuring the line for every word, or the rest of an /// over-long word for every piece cut from it, made a long paragraph or word quadratic. -/// Shaped text is not a sum of glyph widths, so [`wrap_shaped_lines`] measures it as drawn. -pub(super) fn wrap_lines(text: &str, font: Font, size: f32, width: f32) -> Vec { - if gridcraft_pdf::is_shaped(font, text) { - return wrap_shaped_lines(text, font, size, width); - } - let units_of = |s: &str| -> u64 { s.chars().map(|c| u64::from(font.char_width(c))).sum() }; - let fits = |units: u64| units as f32 * size / 1000.0 <= width; - let space = units_of(" "); +/// A paragraph whose width is not that sum is measured as drawn by [`wrap_measured_paragraph`]. +pub(super) fn wrap_lines(text: &str, font: Font, size: f32, width: f32, direction: TextDirection) -> Vec { let mut out = Vec::new(); for para in text.split('\n') { - let mut line = String::new(); - let mut line_units: u64 = 0; - for word in para.split(' ') { - let word_units = units_of(word); - if line.is_empty() { - line.push_str(word); - line_units = word_units; - } else if fits(line_units + space + word_units) { - line.push(' '); - line.push_str(word); - line_units += space + word_units; - } else { - out.push(std::mem::take(&mut line)); - line.push_str(word); - line_units = word_units; - } - if !fits(line_units) && line.graphemes(true).nth(1).is_some() { - let mut piece = String::new(); - let mut units: u64 = 0; - for g in line.graphemes(true) { - let w = units_of(g); - if !piece.is_empty() && !fits(units + w) { - out.push(std::mem::take(&mut piece)); - units = 0; - if out.len() > MAX_WRAP_LINES { - return out; - } - } - piece.push_str(g); - units += w; - } - line = piece; - line_units = units; - } - if out.len() > MAX_WRAP_LINES { - return out; - } + let direction = direction.resolve(para); + if gridcraft_pdf::width_is_char_sum(font, para, direction) { + wrap_summed_paragraph(para, font, size, width, direction, &mut out); + } else { + let fits = |s: &str| gridcraft_pdf::text_width_with_direction(font, size, s, direction) <= width; + wrap_measured_paragraph(para, &fits, direction, &mut out); + } + if out.len() > MAX_WRAP_LINES { + return out; } - out.push(line); } out } -/// [`wrap_lines`] for shaped text, measuring each candidate line in its final joined form. -fn wrap_shaped_lines(text: &str, font: Font, size: f32, width: f32) -> Vec { - let fits = |s: &str| gridcraft_pdf::text_width(font, size, s) <= width; - let mut out = Vec::new(); - for para in text.split('\n') { - let mut line = String::new(); - for word in para.split(' ') { - if !line.is_empty() { - let candidate = format!("{line} {word}"); - if fits(&candidate) { - line = candidate; - continue; +fn wrap_summed_paragraph(para: &str, font: Font, size: f32, width: f32, direction: TextDirection, out: &mut Vec) { + let units_of = |s: &str| -> u64 { s.chars().map(|c| u64::from(font.char_width(c))).sum() }; + let fits = |units: u64| units as f32 * size / 1000.0 <= width; + let space = units_of(" "); + let mut line = String::new(); + let mut line_units: u64 = 0; + for word in para.split(' ') { + let word_units = units_of(word); + if line.is_empty() { + line.push_str(word); + line_units = word_units; + } else if fits(line_units + space + word_units) { + line.push(' '); + line.push_str(word); + line_units += space + word_units; + } else { + out.push(TextLine { text: std::mem::take(&mut line), direction }); + line.push_str(word); + line_units = word_units; + } + if !fits(line_units) && line.graphemes(true).nth(1).is_some() { + let mut piece = String::new(); + let mut units: u64 = 0; + for g in line.graphemes(true) { + let w = units_of(g); + if !piece.is_empty() && !fits(units + w) { + out.push(TextLine { text: std::mem::take(&mut piece), direction }); + units = 0; + if out.len() > MAX_WRAP_LINES { + return; + } } - out.push(std::mem::take(&mut line)); + piece.push_str(g); + units += w; } - line = if fits(word) { word.to_string() } else { break_shaped_word(word, &fits, &mut out) }; - if out.len() > MAX_WRAP_LINES { - return out; - } + line = piece; + line_units = units; + } + if out.len() > MAX_WRAP_LINES { + return; } - out.push(line); } - out + out.push(TextLine { text: line, direction }); +} + +/// One paragraph of [`wrap_lines`] whose width is not a sum of character widths (shaped Arabic, +/// right-to-left reordering or bidi controls), measuring each candidate line as drawn. +fn wrap_measured_paragraph(para: &str, fits: &impl Fn(&str) -> bool, direction: TextDirection, out: &mut Vec) { + let mut line = String::new(); + for word in para.split(' ') { + if !line.is_empty() { + let candidate = format!("{line} {word}"); + if fits(&candidate) { + line = candidate; + continue; + } + out.push(TextLine { text: std::mem::take(&mut line), direction }); + } + line = if fits(word) { word.to_string() } else { break_measured_word(word, fits, direction, out) }; + if out.len() > MAX_WRAP_LINES { + return; + } + } + out.push(TextLine { text: line, direction }); } /// Cuts `word` into the longest grapheme prefixes that fit (at least one grapheme each), pushes /// all but the last to `out` and returns the last. Each cut gallops from one grapheme, so it /// measures prefixes about as long as the piece rather than the rest of the word. -fn break_shaped_word(word: &str, fits: &impl Fn(&str) -> bool, out: &mut Vec) -> String { +fn break_measured_word(word: &str, fits: &impl Fn(&str) -> bool, direction: TextDirection, out: &mut Vec) -> String { let ends: Vec = word.grapheme_indices(true).map(|(i, g)| i + g.len()).collect(); let (mut start, mut first) = (0, 0); loop { @@ -123,7 +138,7 @@ fn break_shaped_word(word: &str, fits: &impl Fn(&str) -> bool, out: &mut Vec MAX_WRAP_LINES { @@ -136,13 +151,26 @@ fn font_for(style: &Style) -> Font { Font::styled(Font::family_for(&style.font.name), style.font.bold, style.font.italic) } -fn text_align(align: HAlign, value: &Value) -> HAlign { +fn text_direction(order: ReadingOrder) -> TextDirection { + match order { + ReadingOrder::Context => TextDirection::Context, + ReadingOrder::LeftToRight => TextDirection::LeftToRight, + ReadingOrder::RightToLeft => TextDirection::RightToLeft, + } +} + +/// The alignment a cell is laid out with before a right-to-left sheet is mirrored. Explicit Left +/// and Right are swapped there, as in the grid, so they print on the side the user chose. +fn text_align(align: HAlign, value: &Value, direction: TextDirection, right_to_left_sheet: bool) -> HAlign { match align { HAlign::General => match value { Value::Number(_) => HAlign::Right, Value::Bool(_) | Value::Error(_) => HAlign::Center, + _ if direction == TextDirection::RightToLeft && !right_to_left_sheet => HAlign::Right, _ => HAlign::Left, }, + HAlign::Left if right_to_left_sheet => HAlign::Right, + HAlign::Right if right_to_left_sheet => HAlign::Left, HAlign::CenterAcross | HAlign::Distributed => HAlign::Center, HAlign::Justify | HAlign::Fill => HAlign::Left, other => other, @@ -253,29 +281,30 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>) if text.is_empty() { return; } - let mut tw = gridcraft_pdf::text_width(font, size, &text); + let direction = text_direction(st.align.reading_order.unwrap_or_default()).resolve(&text); + let mut tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction); if st.align.shrink && !wrap && tw > avail && tw > 0.0 { size = (size * avail / tw).max(1.0); - tw = gridcraft_pdf::text_width(font, size, &text); + tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction); } if is_num && !wrap && tw > avail + 0.01 && !sh.show_formulas { let hash = gridcraft_pdf::text_width(font, size, "#").max(0.1); text = "#".repeat(((avail / hash).floor().max(1.0) as usize).min(255)); - tw = gridcraft_pdf::text_width(font, size, &text); + tw = gridcraft_pdf::text_width_with_direction(font, size, &text, direction); } - let h_align = text_align(st.align.h, &v); + let h_align = text_align(st.align.h, &v, direction, sh.right_to_left); let rot = st.align.rotation; let rotated = rot != 0 && rot != 255; // Rotated text wraps along its own direction: upright (±90°) text to the row height. - let lines: Vec = match (wrap, rotated) { - (true, false) => wrap_lines(&text, font, size, avail.max(size)), - (true, true) if rot.abs() == 90 => wrap_lines(&text, font, size, (h - 2.0 * pad).max(size)), - (true, true) => vec![text.lines().next().unwrap_or_default().to_string()], - (false, _) => vec![text], + let lines: Vec = match (wrap, rotated) { + (true, false) => wrap_lines(&text, font, size, avail.max(size), direction), + (true, true) if rot.abs() == 90 => wrap_lines(&text, font, size, (h - 2.0 * pad).max(size), direction), + (true, true) => vec![TextLine { text: text.lines().next().unwrap_or_default().to_string(), direction }], + (false, _) => vec![TextLine { text, direction }], }; let extents = lines .iter() - .filter_map(|line| pg.text_vertical_extents(font, size, line)) + .filter_map(|line| pg.text_vertical_extents_with_direction(font, size, &line.text, line.direction)) .reduce(|a, b| (a.0.max(b.0), a.1.max(b.1))) .map(|(ascent, descent)| (ascent.max(size * 0.8), descent.max(size * 0.22))); let line_h = extents.map_or(size * 1.2, |(ascent, descent)| (ascent + descent + size * 0.2).max(size * 1.2)); @@ -305,7 +334,7 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>) let clip_l = clip_l.max(limits.0); let clip_r = clip_r.min(limits.1); pg.save(); - pg.clip_rect(clip_l, y, (clip_r - clip_l).max(0.0), h); + pg.clip_rect(b.text_x(clip_l, clip_r - clip_l), y, (clip_r - clip_l).max(0.0), h); if rotated { // Rotated text: anchored at the bottom-left (upward) or top-left (downward) of the cell. // Wrapped lines stack rightward for upward text and leftward for downward text, so @@ -320,19 +349,23 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>) } else { (x + pad + (last - i) * line_h, y + pad + extents.map_or(size * 0.8, |e| e.0)) }; - pg.text_rotated(Point::new(ox, oy), size, font, color, t, angle); + let tw = gridcraft_pdf::text_width_with_direction(font, size, &t.text, t.direction); + let (sn, cs) = angle.sin_cos(); + let (ascent, descent) = extents.unwrap_or((size * 0.8, size * 0.22)); + let ox = if sh.right_to_left { b.mirror_axis - ox - tw * cs - (ascent - descent) * sn } else { ox }; + pg.text_rotated_with_direction(Baseline { origin: Point::new(ox, oy), angle }, size, font, color, &t.text, t.direction); } pg.restore(); return; } if rot == 255 { // Vertical stacked text. - let stacked = lines.concat(); + let stacked: String = lines.iter().map(|line| line.text.as_str()).collect(); let chars: Vec<&str> = stacked.graphemes(true).take(500).collect(); let mut yy = y + pad + extents.map_or(size * 0.8, |e| e.0); for ch in chars { let cw = gridcraft_pdf::text_width(font, size, ch); - pg.text(x + (w - cw) / 2.0, yy, size, font, color, ch); + pg.text_with_direction(Point::new(b.text_x(x + (w - cw) / 2.0, cw), yy), size, font, color, ch, direction); yy += line_h; if yy > y + h + line_h { break; @@ -342,7 +375,7 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>) return; } for (i, line) in lines.iter().enumerate() { - let lw = gridcraft_pdf::text_width(font, size, line); + let lw = gridcraft_pdf::text_width_with_direction(font, size, &line.text, line.direction); let lx = match h_align { HAlign::Right => x + w - pad - lw - indent, HAlign::Center => x + (w + across - lw) / 2.0, @@ -352,7 +385,8 @@ pub(super) fn draw_text(pg: &mut Page, b: &Block, placement: TextPlacement<'_>) if ly - size > y + h || ly < y - line_h { continue; } - pg.text(lx, ly, size, font, color, line); + let lx = b.text_x(lx, lw); + pg.text_with_direction(Point::new(lx, ly), size, font, color, &line.text, line.direction); if st.font.underline != Underline::None { let uw = (size * 0.06).max(0.2); pg.stroke_line(lx, ly + size * 0.12, lx + lw, ly + size * 0.12, uw, color); diff --git a/crates/pdf/src/arabic.rs b/crates/pdf/src/arabic.rs index 9a298d2f8..11a531729 100644 --- a/crates/pdf/src/arabic.rs +++ b/crates/pdf/src/arabic.rs @@ -10,7 +10,7 @@ use skrifa::{ }; use unicode_bidi::BidiInfo; -use crate::{CID_FONT, Error, Font, dict_obj, n, needs_cid, pdf_string, pdf_utf16_string, stream_obj}; +use crate::{CID_FONT, Error, Font, TextDirection, dict_obj, n, needs_cid, pdf_string, pdf_utf16_string, stream_obj}; include!(concat!(env!("OUT_DIR"), "/arabic_fonts.rs")); @@ -208,10 +208,11 @@ pub(crate) struct Layout { } /// Positions are in 1/1000 em, matching the Type3 font matrix. -pub(crate) fn layout(font: Font, text: &str) -> Result { +pub(crate) fn layout(font: Font, text: &str, direction: TextDirection) -> Result { if text.len() > MAX_TEXT_BYTES { return Err(Error("Arabic PDF text exceeds the 128 KiB per-line limit".into())); } + let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction }; let face = loaded_face(font)?; let raw = face.font()?; let shaper = face.data.shaper(&raw).instance(Some(&face.instance)).build(); @@ -222,7 +223,7 @@ pub(crate) fn layout(font: Font, text: &str) -> Result { let scale = 1000.0 / units as f32; let single_line: String = text.chars().map(|ch| if is_paragraph_break(ch) { ' ' } else { ch }).collect(); let text = single_line.as_str(); - let bidi = BidiInfo::new(text, None); + let bidi = BidiInfo::new(text, direction.level()); let mut layout = Layout { items: Vec::new(), width: 0.0 }; for para in &bidi.paragraphs { let (levels, runs) = bidi.visual_runs(para, para.range.clone()); @@ -299,8 +300,8 @@ pub(crate) fn layout(font: Font, text: &str) -> Result { Ok(layout) } -pub(crate) fn vertical_extents(font: Font, text: &str) -> Result<(f32, f32), Error> { - let layout = layout(font, text)?; +pub(crate) fn vertical_extents(font: Font, text: &str, direction: TextDirection) -> Result<(f32, f32), Error> { + let layout = layout(font, text, direction)?; let face = loaded_face(font)?; let raw = face.font()?; let metrics = raw.glyph_metrics(Size::new(1000.0), skrifa::instance::LocationRef::new(face.instance.coords())); @@ -333,6 +334,37 @@ pub(crate) fn vertical_extents(font: Font, text: &str) -> Result<(f32, f32), Err Ok((ascent, descent)) } +/// Whether standard-font `text` is drawn in its logical order, unchanged. +pub(crate) fn is_logical_order(text: &str, direction: TextDirection) -> bool { + direction != TextDirection::RightToLeft && !text.chars().any(is_control) +} + +/// Bidi reordering for standard-font text requires no optional Arabic font. +pub(crate) fn latin_visual(text: &str, direction: TextDirection) -> Result, Error> { + if is_logical_order(text, direction) { + return Ok(Cow::Borrowed(text)); + } + if text.len() > MAX_TEXT_BYTES { + return Err(Error("Bidirectional PDF text exceeds the 128 KiB per-line limit".into())); + } + let single_line: String = text.chars().map(|ch| if is_paragraph_break(ch) { ' ' } else { ch }).collect(); + let text = single_line.as_str(); + let bidi = BidiInfo::new(text, direction.level()); + let mut out = String::with_capacity(text.len()); + for para in &bidi.paragraphs { + let (levels, runs) = bidi.visual_runs(para, para.range.clone()); + for run in runs { + let part = text.get(run.clone()).unwrap_or_default(); + if levels.get(run.start).is_some_and(|level| level.is_rtl()) { + out.extend(part.chars().rev().filter(|ch| !is_control(*ch)).map(mirror_ansi)); + } else { + out.extend(part.chars().filter(|ch| !is_control(*ch))); + } + } + } + Ok(Cow::Owned(out)) +} + fn mirror_ansi(ch: char) -> char { match ch { '(' => ')', @@ -427,8 +459,8 @@ impl Subset { Ok(index) } - pub(crate) fn text(&mut self, font: Font, text: &str, size: f32) -> Result { - let layout = layout(font, text)?; + pub(crate) fn text(&mut self, font: Font, text: &str, size: f32, direction: TextDirection) -> Result { + let layout = layout(font, text, direction)?; let mut out = format!("/Span << /ActualText {} >> BDC\nBT\n", unicode_string(text, true)); for item in layout.items { match item { diff --git a/crates/pdf/src/lib.rs b/crates/pdf/src/lib.rs index 32e525a4d..db22568c6 100644 --- a/crates/pdf/src/lib.rs +++ b/crates/pdf/src/lib.rs @@ -20,6 +20,38 @@ mod symbol; pub use symbol::{symbol_code, symbol_width}; +/// Paragraph base direction. Context follows spreadsheet reading order: the first +/// non-whitespace character determines direction, including digits and punctuation. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum TextDirection { + #[default] + Auto, + Context, + LeftToRight, + RightToLeft, +} + +impl TextDirection { + /// Resolve once for a paragraph before wrapping it into visual lines. + pub fn resolve(self, text: &str) -> Self { + use unicode_bidi::{BidiClass, BidiInfo, bidi_class}; + let rtl = match self { + Self::Auto => BidiInfo::new(text, None).paragraphs.first().is_some_and(|p| p.level.is_rtl()), + Self::Context => text.chars().find(|ch| !ch.is_whitespace()).is_some_and(|ch| matches!(bidi_class(ch), BidiClass::R | BidiClass::AL)), + explicit => return explicit, + }; + if rtl { Self::RightToLeft } else { Self::LeftToRight } + } + + fn level(self) -> Option { + match self { + Self::Auto => None, + Self::LeftToRight | Self::Context => Some(unicode_bidi::Level::ltr()), + Self::RightToLeft => Some(unicode_bidi::Level::rtl()), + } + } +} + /// A PDF export could not preserve the requested text. #[derive(Clone, Debug)] pub struct Error(String); @@ -52,6 +84,13 @@ impl Point { } } +/// A text baseline origin and its clockwise rotation in radians. +#[derive(Clone, Copy, Debug, Default, PartialEq)] +pub struct Baseline { + pub origin: Point, + pub angle: f32, +} + /// A page-space rectangle described by its top-left corner and extent. #[derive(Clone, Copy, Debug, Default, PartialEq)] pub struct Rect { @@ -214,20 +253,29 @@ impl Font { } } -/// Whether `text` set in `font` is shaped, so its width is not the sum of its characters' widths. -pub fn is_shaped(font: Font, text: &str) -> bool { - arabic::shaped(font, text) +/// Whether [`text_width_with_direction`] is the sum of `text`'s character widths: not shaped, +/// not reordered right to left and holding no bidi controls. A prefix's width is then a running sum. +pub fn width_is_char_sum(font: Font, text: &str, direction: TextDirection) -> bool { + let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction }; + !arabic::shaped(font, text) && arabic::is_logical_order(text, direction) } /// Width of `text` in points when set in `font` at `size` points. /// Arabic uses shaped advances. If its font cannot render the text, measurement returns zero /// and drawing that text causes [`PdfDoc::finish`] to return the rendering error. pub fn text_width(font: Font, size: f32, text: &str) -> f32 { + text_width_with_direction(font, size, text, TextDirection::Auto) +} + +/// Width measured with the same base direction as drawing. +pub fn text_width_with_direction(font: Font, size: f32, text: &str, direction: TextDirection) -> f32 { + let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction }; if arabic::shaped(font, text) { - return arabic::layout(font, text).map(|layout| layout.width * size / 1000.0).unwrap_or(0.0); + return arabic::layout(font, text, direction).map(|layout| layout.width * size / 1000.0).unwrap_or(0.0); } // u64: a u32 sum overflows for ~8 million characters. - let units: u64 = text.chars().map(|c| u64::from(font.char_width(c))).sum(); + let Ok(visual) = arabic::latin_visual(text, direction) else { return 0.0 }; + let units: u64 = visual.chars().map(|c| u64::from(font.char_width(c))).sum(); units as f32 * size / 1000.0 } @@ -734,10 +782,15 @@ impl Page { /// Arabic ink extents above and below the baseline, in points. Standard font text returns /// `None`. Font errors are recorded for [`PdfDoc::finish`], just as when drawing text. pub fn text_vertical_extents(&mut self, font: Font, size: f32, text: &str) -> Option<(f32, f32)> { + self.text_vertical_extents_with_direction(font, size, text, TextDirection::Auto) + } + + /// Arabic ink extents with an explicit paragraph base direction. + pub fn text_vertical_extents_with_direction(&mut self, font: Font, size: f32, text: &str, direction: TextDirection) -> Option<(f32, f32)> { if !arabic::shaped(font, text) { return None; } - match arabic::vertical_extents(font, text) { + match arabic::vertical_extents(font, text, direction) { Ok((ascent, descent)) => Some((ascent * size / 1000.0, descent * size / 1000.0)), Err(error) => { self.error.get_or_insert(error); @@ -748,92 +801,110 @@ impl Page { /// Text with its baseline starting at `(x, y)`. pub fn text(&mut self, x: f32, y: f32, size: f32, font: Font, color: Rgb, text: &str) { - self.text_rotated(Point::new(x, y), size, font, color, text, 0.0); + self.text_with_direction(Point::new(x, y), size, font, color, text, TextDirection::Auto); + } + + /// Text drawn with an explicit paragraph base direction. + pub fn text_with_direction(&mut self, origin: Point, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) { + self.text_rotated_with_direction(Baseline { origin, angle: 0.0 }, size, font, color, text, direction); } /// Text rotated by `angle` radians (clockwise on the page, like the y-down coordinate /// system) about its baseline origin. pub fn text_rotated(&mut self, origin: Point, size: f32, font: Font, color: Rgb, text: &str, angle: f32) { + self.text_rotated_with_direction(Baseline { origin, angle }, size, font, color, text, TextDirection::Auto); + } + + /// Rotated text with an explicit paragraph base direction. + pub fn text_rotated_with_direction(&mut self, baseline: Baseline, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) { + let Baseline { origin, angle } = baseline; if text.is_empty() || !extent(size) || !finite(&[origin.x, origin.y]) { return; } + let direction = if direction == TextDirection::Context { direction.resolve(text) } else { direction }; let (sn, cs) = if angle.is_finite() { angle.sin_cos() } else { (0.0, 1.0) }; + // Clockwise in y-down = counter-clockwise negated in PDF's y-up space. + let matrix = format!("{} {} {} {} {} {}", n(cs), n(-sn), n(sn), n(cs), n(origin.x), n(self.y(origin.y))); + let size = size.min(10_000.0); let shaping = arabic::shaping(font, text); self.missing_arabic_font |= shaping == arabic::Shaping::NoFont; if shaping == arabic::Shaping::Shaped { - if self.saved.len() >= MAX_SAVE_DEPTH { - return; - } - match self.arabic.text(font, text, size.min(10_000.0)) { - Ok(body) => { - for slot in [Some(font.index()), self.arabic.uses_cid.then_some(CID_FONT)].into_iter().flatten() { - if let Some(f) = self.fonts.get_mut(slot) { - *f = true; - } - } - let mut s = format!("q\n{} {} {} {} {} {} cm\n", n(cs), n(-sn), n(sn), n(cs), n(origin.x), n(self.y(origin.y))); - push_rgb(&mut s, color, false); - s.push(' '); - push_rgb(&mut s, color, true); - let _ = write!(s, "\n{body}\nQ"); - if self.content.len().saturating_add(s.len()) > MAX_PAGE_CONTENT { - self.error.get_or_insert_with(|| Error("PDF page text exceeds the size limit".into())); - } else { - self.op(&s); - } - } - Err(error) => { - self.error.get_or_insert(error); - } - } + self.shaped_text(&matrix, size, font, color, text, direction); + } else { + self.standard_text(&matrix, size, font, color, text, direction); + } + } + + fn shaped_text(&mut self, matrix: &str, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) { + if self.saved.len() >= MAX_SAVE_DEPTH { return; } - let fi = font.index(); - let size = n(size.min(10_000.0)); - // Clockwise in y-down = counter-clockwise negated in PDF's y-up space. - let tm = format!("{} {} {} {} {} {} Tm\n", n(cs), n(-sn), n(sn), n(cs), n(origin.x), n(self.y(origin.y))); - // Symbol text is one run in Symbol's own encoding (the CID font has no maths symbols). - if font == Font::Symbol { - if let Some(f) = self.fonts.get_mut(fi) { + let body = match self.arabic.text(font, text, size, direction) { + Ok(body) => body, + Err(error) => { + self.error.get_or_insert(error); + return; + } + }; + for slot in [Some(font.index()), self.arabic.uses_cid.then_some(CID_FONT)].into_iter().flatten() { + if let Some(f) = self.fonts.get_mut(slot) { *f = true; } - if self.full() { + } + let mut s = format!("q\n{matrix} cm\n"); + push_rgb(&mut s, color, false); + s.push(' '); + push_rgb(&mut s, color, true); + let _ = write!(s, "\n{body}\nQ"); + self.text_op(&s); + } + + fn standard_text(&mut self, matrix: &str, size: f32, font: Font, color: Rgb, text: &str, direction: TextDirection) { + let visual = match arabic::latin_visual(text, direction) { + Ok(visual) => visual, + Err(error) => { + self.error.get_or_insert(error); return; } - let mut s = String::new(); - self.set_fill(&mut s, color); - let _ = write!(s, "BT\n{tm}/F{} {} Tf\n{} Tj\nET", fi + 1, size, pdf_string_in(text, true)); - self.op(&s); - return; - } + }; + let fi = font.index(); + let size = n(size); + let mut runs = String::new(); // Runs of WinAnsi text use `font`; runs it cannot encode use the CID font. Each `Tj` // advances the text position, so the runs follow each other on the baseline. - let mut runs = String::new(); - let mut rest = text; + // Symbol text is one run in Symbol's own encoding (the CID font has no maths symbols). + let symbol = font == Font::Symbol; + let uses_cid = |c: char| !symbol && needs_cid(c); + let mut rest: &str = &visual; while let Some(first) = rest.chars().next() { - let cid = needs_cid(first); - let end = rest.char_indices().find(|(_, c)| needs_cid(*c) != cid).map_or(rest.len(), |(i, _)| i); + let cid = uses_cid(first); + let end = rest.char_indices().find(|(_, c)| uses_cid(*c) != cid).map_or(rest.len(), |(i, _)| i); let (run, tail) = rest.split_at(end); - let (slot, string) = if cid { (CID_FONT, pdf_utf16_string(run)) } else { (fi, pdf_string(run)) }; + let (slot, string) = if cid { (CID_FONT, pdf_utf16_string(run)) } else { (fi, pdf_string_in(run, symbol)) }; if let Some(f) = self.fonts.get_mut(slot) { *f = true; } let first_run = runs.is_empty(); let _ = writeln!(runs, "/F{} {} Tf", slot + 1, size); if first_run { - runs.push_str(&tm); + let _ = writeln!(runs, "{matrix} Tm"); } let _ = writeln!(runs, "{string} Tj"); rest = tail; } - if self.full() { - return; + let mut s = String::new(); + self.set_fill(&mut s, color); + let _ = write!(s, "BT\n{runs}ET"); + let s = if visual != text { format!("/Span << /ActualText {} >> BDC\n{s}\nEMC", arabic::unicode_string(text, true)) } else { s }; + self.text_op(&s); + } + + fn text_op(&mut self, s: &str) { + if self.content.len().saturating_add(s.len()).saturating_add(1) > MAX_PAGE_CONTENT { + self.error.get_or_insert_with(|| Error("PDF page text exceeds the size limit".into())); + } else { + self.op(s); } - // The colour goes in front of the text object, so it is tracked like any other style. - let mut colour = String::new(); - self.set_fill(&mut colour, color); - let s = format!("{colour}BT\n{runs}ET"); - self.op(&s); } /// Draws an RGBA image (`pw`×`ph` pixels, row-major, straight alpha) into the box diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs index dfd2ffd02..b8b2fdb30 100644 --- a/crates/pdf/src/tests.rs +++ b/crates/pdf/src/tests.rs @@ -5,6 +5,36 @@ use std::io; mod reference; use reference::{OldPage, interpret}; +#[test] +fn rtl_marked_text_limit_fails_without_appending_partial_content() { + let mut doc = PdfDoc::new(); + let page = doc.add_page(600.0, 300.0); + page.content = " ".repeat(MAX_PAGE_CONTENT - 8); + let before = page.content.len(); + page.text_with_direction(Point::new(10.0, 20.0), 12.0, Font::Helvetica, [0, 0, 0], "ABC !", TextDirection::RightToLeft); + assert_eq!(page.content.len(), before, "the marked-content block must append atomically"); + assert!(doc.finish().unwrap_err().to_string().contains("size limit")); +} + +#[test] +fn a_paragraph_separator_keeps_right_to_left_latin_on_one_line() { + let visual = |text| arabic::latin_visual(text, TextDirection::RightToLeft).unwrap().into_owned(); + assert_eq!(visual("ABC\r"), visual("ABC ")); + assert_eq!(visual("ABC\u{2029}DEF"), visual("ABC DEF")); +} + +#[test] +fn cjk_in_a_right_to_left_cell_keeps_the_cid_font() { + let mut doc = PdfDoc::new(); + doc.add_page(600.0, 300.0).text_with_direction(Point::new(10.0, 20.0), 12.0, Font::Helvetica, [0, 0, 0], "编号!", TextDirection::RightToLeft); + let pdf = doc.finish().unwrap(); + check_xref(&pdf).unwrap(); + let cjk = find(&pdf, b"<7F1653F7> Tj").expect("CJK run set in the CID font"); + assert!(find(&pdf, b"/Encoding /UniGB-UTF16-H").is_some()); + assert!(find(&pdf, b"(!) Tj").is_some_and(|bang| bang < cjk), "the trailing ! is drawn left of the CJK run"); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), "编号!"); +} + fn find(hay: &[u8], needle: &[u8]) -> Option { hay.windows(needle.len()).position(|w| w == needle) } @@ -894,89 +924,85 @@ fn cjk_text_is_not_replaced_by_question_marks() -> Result<(), Box> { } #[test] -fn arabic_is_shaped_and_preserved_or_falls_back_without_a_font() -> Result<(), Box> { +fn arabic_is_shaped_and_preserved_or_falls_back_without_a_font() { let text = "مَرْحَبًا 123 (ABC)"; let mut doc = PdfDoc::new(); let page = doc.add_page(600.0, 300.0); page.text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text); - let layout = arabic::layout(Font::Helvetica, text); + let layout = arabic::layout(Font::Helvetica, text, TextDirection::Auto); let Ok(layout) = layout else { assert!(doc.missing_arabic_font()); - check_xref(&doc.finish()?)?; - return Ok(()); + check_xref(&doc.finish().unwrap()).unwrap(); + return; }; assert!(layout.width > 0.0); assert!((text_width(Font::Helvetica, 20.0, text) - layout.width * 0.02).abs() < 0.001); - let pdf = doc.finish()?; - check_xref(&pdf)?; - assert_eq!(utf16_entry(&pdf, "/ActualText")?, text); + let pdf = doc.finish().unwrap(); + check_xref(&pdf).unwrap(); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text); assert!(find(&pdf, b"/Subtype /Type3").is_some()); assert!(find(&pdf, b"/ToUnicode").is_some()); assert!(find(&pdf, b"beginbfchar").is_some()); assert!(find(&pdf, b"(?) Tj").is_none()); assert!(find(&pdf, b"/UniGB-UTF16-H").is_none(), "Arabic is never set in the CJK font"); - Ok(()) } #[test] -fn latin_inside_arabic_text_declares_its_page_font() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { - return Ok(()); +fn latin_inside_arabic_text_declares_its_page_font() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { + return; } let mut doc = PdfDoc::new(); doc.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], "مرحبا\u{2028}عالم"); - let pdf = doc.finish()?; - check_xref(&pdf)?; + let pdf = doc.finish().unwrap(); + check_xref(&pdf).unwrap(); assert!(find(&pdf, b"/F1 20 Tf").is_some(), "the line break is drawn as a Helvetica space"); assert!(find(&pdf, b"/Font << /F1 ").is_some(), "the page declares the font its Latin run uses"); - Ok(()) } #[test] -fn cjk_inside_arabic_text_uses_the_cid_font() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { - return Ok(()); +fn cjk_inside_arabic_text_uses_the_cid_font() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { + return; } let text = "مرحبا 编号"; let mut doc = PdfDoc::new(); doc.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text); - let pdf = doc.finish()?; - check_xref(&pdf)?; + let pdf = doc.finish().unwrap(); + check_xref(&pdf).unwrap(); assert!(find(&pdf, b"<7F1653F7> Tj").is_some(), "the CJK run is set in the CID font"); assert!(find(&pdf, b"/Encoding /UniGB-UTF16-H").is_some(), "the page declares the CID font"); - assert_eq!(utf16_entry(&pdf, "/ActualText")?, text); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text); assert!(text_width(Font::Helvetica, 20.0, text) >= text_width(Font::Helvetica, 20.0, "مرحبا") + 40.0, "two full-width ideographs"); for (text, cid_run) in [("مرحبا 😀", &b" Tj"[..]), ("مرحبا Привет", &b"<041F04400438043204350442> Tj"[..])] { let mut uncovered = PdfDoc::new(); uncovered.add_page(600.0, 300.0).text(30.0, 70.0, 20.0, Font::Helvetica, [0, 0, 0], text); assert!(!uncovered.missing_arabic_font()); - let pdf = uncovered.finish()?; - check_xref(&pdf)?; + let pdf = uncovered.finish().unwrap(); + check_xref(&pdf).unwrap(); assert!(find(&pdf, cid_run).is_some(), "{text}: characters the Arabic face lacks fall back like non-Arabic text"); - assert_eq!(utf16_entry(&pdf, "/ActualText")?, text); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text); } - Ok(()) } #[test] -fn oversized_arabic_text_is_an_error_instead_of_partial_pdf() -> Result<(), Box> { +fn oversized_arabic_text_is_an_error_instead_of_partial_pdf() { let mut doc = PdfDoc::new(); doc.add_page(600.0, 300.0).text(0.0, 50.0, 10.0, Font::Helvetica, [0, 0, 0], &"ب".repeat(65_537)); if doc.missing_arabic_font() { - check_xref(&doc.finish()?)?; - return Ok(()); + check_xref(&doc.finish().unwrap()).unwrap(); + return; } assert!(doc.finish().unwrap_err().to_string().contains("128 KiB")); - Ok(()) } #[test] -fn arabic_joining_marks_styles_and_rotation() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { - return Ok(()); +fn arabic_joining_marks_styles_and_rotation() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { + return; } for (text, expected) in [("مرحبا 123 (ABC)", "(ABC)"), ("مرحبا [ABC]", "[ABC]"), ("مرحبا ", "")] { - let mixed = arabic::layout(Font::Helvetica, text)?; + let mixed = arabic::layout(Font::Helvetica, text, TextDirection::Auto).unwrap(); let latin: String = mixed .items .iter() @@ -996,15 +1022,15 @@ fn arabic_joining_marks_styles_and_rotation() -> Result<(), Box> { metrics.page_mut(0).unwrap().text_vertical_extents(Font::Helvetica, 20.0, "مرحبا 123 (ABC)").is_some(), "spaces in variable fonts have empty outlines" ); - metrics.finish()?; - let joined = arabic::layout(Font::Helvetica, "سلام")?; + metrics.finish().unwrap(); + let joined = arabic::layout(Font::Helvetica, "سلام", TextDirection::Auto).unwrap(); let separate_width: f32 = "سلام".chars().map(|c| text_width(Font::Helvetica, 1000.0, &c.to_string())).sum(); assert!((joined.width - separate_width).abs() > 10.0, "joining changes advances"); - let marked = arabic::layout(Font::Helvetica, "مَرْحَبًا")?; - let plain = arabic::layout(Font::Helvetica, "مرحبا")?; + let marked = arabic::layout(Font::Helvetica, "مَرْحَبًا", TextDirection::Auto).unwrap(); + let plain = arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).unwrap(); assert!(marked.items.len() > plain.items.len()); assert!(marked.items.iter().any(|item| matches!(item, arabic::Item::Glyph { y, .. } if *y != 0.0))); - let bold_available = match arabic::layout(Font::HelveticaBold, "مرحبا") { + let bold_available = match arabic::layout(Font::HelveticaBold, "مرحبا", TextDirection::Auto) { Ok(bold) if arabic::bold_face_is_synthetic() => { assert!(bold.width >= plain.width, "synthetic bold keeps the regular advances"); true @@ -1020,42 +1046,43 @@ fn arabic_joining_marks_styles_and_rotation() -> Result<(), Box> { }; let mut regular = PdfDoc::new(); regular.add_page(500.0, 300.0).text(30.0, 60.0, 20.0, Font::Helvetica, [0, 0, 0], "مرحبا"); - let regular = regular.finish()?; + let regular = regular.finish().unwrap(); let mut italic = PdfDoc::new(); italic.add_page(500.0, 300.0).text(30.0, 60.0, 20.0, Font::HelveticaOblique, [0, 0, 0], "مرحبا"); - let italic = italic.finish()?; + let italic = italic.finish().unwrap(); assert_ne!(regular, italic, "italic shears the actual outlines"); let rotated_font = if bold_available { Font::HelveticaBoldOblique } else { Font::HelveticaOblique }; let mut rotated = PdfDoc::new(); rotated.add_page(500.0, 300.0).text_rotated(Point::new(100.0, 100.0), 20.0, rotated_font, [0, 0, 0], "مرحبا 123", -std::f32::consts::FRAC_PI_2); - let rotated = rotated.finish()?; - check_xref(&rotated)?; - assert_eq!(utf16_entry(&rotated, "/ActualText")?, "مرحبا 123"); + let rotated = rotated.finish().unwrap(); + check_xref(&rotated).unwrap(); + assert_eq!(utf16_entry(&rotated, "/ActualText").unwrap(), "مرحبا 123"); assert!(find(&rotated, b"0 1 -1 0 100 200 cm").is_some()); - Ok(()) } #[test] -fn line_breaks_in_arabic_text_draw_as_spaces() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { - return Ok(()); +fn line_breaks_in_arabic_text_draw_as_spaces() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { + return; } - for text in ["مرحبا\r\nعالم", "مرحبا\u{2028}عالم", "مرحبا\u{2029}ABC\r"] { - let layout = arabic::layout(Font::Helvetica, text)?; + for (text, direction) in ["مرحبا\r\nعالم", "مرحبا\u{2028}عالم", "مرحبا\u{2029}ABC\r"] + .into_iter() + .flat_map(|text| [TextDirection::Auto, TextDirection::LeftToRight, TextDirection::RightToLeft].map(|direction| (text, direction))) + { + let layout = arabic::layout(Font::Helvetica, text, direction).unwrap(); for item in &layout.items { if let arabic::Item::Latin { text: drawn, .. } = item { assert!(!drawn.chars().any(|ch| matches!(ch, '\n' | '\r' | '\u{2028}' | '\u{2029}')), "{drawn:?} from {text:?}"); } } } - let drawn = |text: &str| format!("{:?}", arabic::layout(Font::Helvetica, text).unwrap().items); + let drawn = |text: &str| format!("{:?}", arabic::layout(Font::Helvetica, text, TextDirection::RightToLeft).unwrap().items); assert_eq!(drawn("مرحبا\u{2029}عالم"), drawn("مرحبا عالم"), "a paragraph separator keeps right-to-left reading order"); - Ok(()) } #[test] fn arabic_text_respects_the_save_nesting_limit() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { return Ok(()); } let mut d = PdfDoc::new(); @@ -1074,7 +1101,7 @@ fn arabic_text_respects_the_save_nesting_limit() -> Result<(), Box> { #[test] fn arabic_subsets_split_after_255_character_codes() -> Result<(), Box> { - if arabic::layout(Font::Helvetica, "مرحبا").is_err() && arabic::ARABIC_FONTS.is_empty() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { return Ok(()); } let mut doc = PdfDoc::new(); @@ -1084,14 +1111,90 @@ fn arabic_subsets_split_after_255_character_codes() -> Result<(), Box let text = format!("ب{}{}{}", marks[i % 8], marks[(i / 8) % 8], marks[(i / 64) % 8]); page.text(20.0, 50.0, 10.0, Font::Helvetica, [0, 0, 0], &text); } - let pdf = doc.finish()?; - check_xref(&pdf)?; + let pdf = doc.finish().unwrap(); + check_xref(&pdf).unwrap(); assert!(find(&pdf, b"/A2 ").is_some()); assert!(find(&pdf, b"/LastChar 255").is_some()); assert!(find(&pdf, b"<100> Tj").is_none(), "Type3 codes are always one byte"); Ok(()) } +#[test] +fn spreadsheet_context_is_first_character_not_first_strong() { + use TextDirection::{Auto, Context, LeftToRight as Ltr, RightToLeft as Rtl}; + for (text, expected) in [(" مرحبا", Rtl), ("123 مرحبا", Ltr), ("(مرحبا)", Ltr), (" ١٢٣ مرحبا", Ltr), ("\t\n", Ltr)] { + assert_eq!(Context.resolve(text), expected, "{text}"); + } + assert_eq!(Auto.resolve("123 مرحبا"), Rtl); + assert_eq!(Auto.resolve("(مرحبا)"), Rtl); +} + +#[test] +fn explicit_rtl_standard_text_reorders_without_an_arabic_font() { + let source = "ABC !"; + let mut doc = PdfDoc::new(); + let page = doc.add_page(300.0, 100.0); + page.text_with_direction(Point::new(10.0, 30.0), 12.0, Font::Helvetica, [0, 0, 0], source, TextDirection::RightToLeft); + assert!(page.content.contains("(! ABC) Tj"), "{}", page.content); + assert!(page.arabic.write_objects(&mut 4, &mut Vec::new(), &mut Vec::new()).is_empty()); + assert_eq!(text_width_with_direction(Font::Helvetica, 12.0, source, TextDirection::RightToLeft), text_width(Font::Helvetica, 12.0, source)); + let pdf = doc.finish().unwrap(); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), source); + assert!(find(&pdf, b"/Subtype /Type3").is_none()); + + let mut huge = PdfDoc::new(); + huge.add_page(300.0, 100.0).text_with_direction( + Point::new(10.0, 30.0), + 12.0, + Font::Helvetica, + [0, 0, 0], + &"A".repeat(128 * 1024 + 1), + TextDirection::RightToLeft, + ); + assert!(huge.finish().unwrap_err().to_string().contains("128 KiB")); +} + +#[test] +fn arabic_explicit_base_changes_visual_order_and_preserves_logical_text() { + if arabic::layout(Font::Helvetica, "مرحبا", TextDirection::Auto).is_err() && arabic::ARABIC_FONTS.is_empty() { + return; + } + let sources = |text: &str, direction| { + arabic::layout(Font::Helvetica, text, direction) + .unwrap() + .items + .into_iter() + .map(|item| match item { + arabic::Item::Glyph { source, .. } => source, + arabic::Item::Latin { text, .. } | arabic::Item::Cid { text, .. } => text, + }) + .collect::() + }; + let text = "مرحبا ABC"; + let ltr = sources(text, TextDirection::LeftToRight); + let rtl = sources(text, TextDirection::RightToLeft); + assert!(ltr.ends_with("ABC"), "{ltr}"); + assert!(rtl.starts_with("ABC"), "{rtl}"); + assert_ne!(ltr, rtl); + assert_eq!(sources("123 مرحبا", TextDirection::Context), sources("123 مرحبا", TextDirection::LeftToRight)); + let mut documents = Vec::new(); + for direction in [TextDirection::LeftToRight, TextDirection::RightToLeft] { + let mut doc = PdfDoc::new(); + doc.add_page(300.0, 100.0).text_rotated_with_direction( + Baseline { origin: Point::new(30.0, 70.0), angle: 0.3 }, + 20.0, + Font::Helvetica, + [0, 0, 0], + text, + direction, + ); + let pdf = doc.finish().unwrap(); + assert_eq!(utf16_entry(&pdf, "/ActualText").unwrap(), text); + documents.push(pdf); + } + assert_ne!(documents[0], documents[1]); +} + #[test] fn many_alternating_runs_share_one_text_matrix() { let mut doc = PdfDoc::new(); diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 5ec72fd63..20e4d9baf 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -1,6 +1,6 @@ # File-format parity -> **Last reviewed:** 2026-11-01 · **Last updated:** 2026-11-13 · **Change:** minor (Arabic PDF export no longer fails when a character or the Arabic font is missing; earlier: Arabic PDF text is shaped with embedded Noto Arabic glyphs beside the non-embedded standard, Symbol and CID fonts; earlier: .xls data validation is read; earlier: .xls is read by the shared craft-xls crate: the workbook opens on the sheet it was saved on, and rich-text (RString) cells are read; earlier: form controls: buttons, scroll bars and spin buttons read and written; earlier: a web page's first table opens as a sheet, also when the page is named `.xls`; earlier: `workbookPr filterPrivacy` kept, and honoured on save; earlier: a workbook's R1C1 reference style, `calcPr refMode`, is kept through open and save; earlier: XLSX page margins are written as their decimals, `0.3` rather than `0.30000001192092896`; earlier: Python cells in `.xlsx` as [MS-XLSX] specifies, `_xlfn._xlws.PY(…)` naming code in the Python part, with cached values, and in GridCraft JSON, with limits on open; earlier: equations in xlsx as Office Math with a marker in `descr` so an edit made in Excel reads back, read back only up to the equation source cap, and a brace with a label and a script on its other side keeps both; Symbol font in PDF; earlier: XLSX reads and writes Page Setup's page order, `pageSetup pageOrder`, and PDF export follows it; earlier: chart data tables: native c:dTable import/export; earlier: XLSX workbook-view selection, normalized tab ratios and sheet-edit regressions; fidelity estimates unchanged; earlier: formulas from Google Sheets' XLSX export open as the original formula instead of `IFERROR(__xludf.DUMMYFUNCTION(…),…)` when GridCraft calculates every function in it, and save as it; `file.exportCsv {values: true}` writes raw values for automation; .xls dialog sheets are skipped instead of read as worksheets; `.xls` import reads each sheet's display options from WINDOW2: right-to-left, gridlines, headings, zeros, formulas; XLSX text boxes and shapes keep their paragraphs' right-to-left direction on save; CSV/TSV/TXT can open with every field kept as text via `file.open {csvAsText}`; formulas over Excel's 8,192 characters, and `%` or call chains past the nesting limit, are parse errors instead of stack overflows when a file is opened; XLSX PivotTables read and write `rowGrandTotals`/`colGrandTotals` the way Excel does, so a table saved with only one grand total opens with the right one; HTML export keeps right-to-left; CSV and text import detects likely Windows-1256 Arabic when invalid UTF-8 has Arabic byte runs; other invalid UTF-8 remains Windows-1252; HTML export places pictures and charts, as inline SVG, at their anchors; earlier: `file.exportCsv {values: true}` writes raw values for automation; .xls dialog sheets are skipped instead of read as worksheets; `.xls` import reads each sheet's display options from WINDOW2: right-to-left, gridlines, headings, zeros, formulas; XLSX text boxes and shapes keep their paragraphs' right-to-left direction on save; CSV/TSV/TXT can open with every field kept as text via `file.open {csvAsText}`; formulas over Excel's 8,192 characters, and `%` or call chains past the nesting limit, are parse errors instead of stack overflows when a file is opened; XLSX PivotTables read and write `rowGrandTotals`/`colGrandTotals` the way Excel does, so a table saved with only one grand total opens with the right one; HTML export keeps right-to-left; CSV and text import detects likely Windows-1256 Arabic when invalid UTF-8 has Arabic byte runs; other invalid UTF-8 remains Windows-1252; HTML export places pictures and charts, as inline SVG, at their anchors; CSV and text open detects each column's date order from values that read only one way, warns when every date is ambiguous, and keeps a column with both kinds as text (#2765)) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4 +> **Last reviewed:** 2026-11-01 · **Last updated:** 2026-11-13 · **Change:** minor (PDF honours cell reading direction and mirrors right-to-left sheets; earlier: Arabic PDF export no longer fails when a character or the Arabic font is missing; earlier: Arabic PDF text is shaped with embedded Noto Arabic glyphs beside the non-embedded standard, Symbol and CID fonts; earlier: .xls data validation is read; earlier: .xls is read by the shared craft-xls crate: the workbook opens on the sheet it was saved on, and rich-text (RString) cells are read; earlier: form controls: buttons, scroll bars and spin buttons read and written; earlier: a web page's first table opens as a sheet, also when the page is named `.xls`; earlier: `workbookPr filterPrivacy` kept, and honoured on save; earlier: a workbook's R1C1 reference style, `calcPr refMode`, is kept through open and save; earlier: XLSX page margins are written as their decimals, `0.3` rather than `0.30000001192092896`; earlier: Python cells in `.xlsx` as [MS-XLSX] specifies, `_xlfn._xlws.PY(…)` naming code in the Python part, with cached values, and in GridCraft JSON, with limits on open; earlier: equations in xlsx as Office Math with a marker in `descr` so an edit made in Excel reads back, read back only up to the equation source cap, and a brace with a label and a script on its other side keeps both; Symbol font in PDF; earlier: XLSX reads and writes Page Setup's page order, `pageSetup pageOrder`, and PDF export follows it; earlier: chart data tables: native c:dTable import/export; earlier: XLSX workbook-view selection, normalized tab ratios and sheet-edit regressions; fidelity estimates unchanged; earlier: formulas from Google Sheets' XLSX export open as the original formula instead of `IFERROR(__xludf.DUMMYFUNCTION(…),…)` when GridCraft calculates every function in it, and save as it; `file.exportCsv {values: true}` writes raw values for automation; .xls dialog sheets are skipped instead of read as worksheets; `.xls` import reads each sheet's display options from WINDOW2: right-to-left, gridlines, headings, zeros, formulas; XLSX text boxes and shapes keep their paragraphs' right-to-left direction on save; CSV/TSV/TXT can open with every field kept as text via `file.open {csvAsText}`; formulas over Excel's 8,192 characters, and `%` or call chains past the nesting limit, are parse errors instead of stack overflows when a file is opened; XLSX PivotTables read and write `rowGrandTotals`/`colGrandTotals` the way Excel does, so a table saved with only one grand total opens with the right one; HTML export keeps right-to-left; CSV and text import detects likely Windows-1256 Arabic when invalid UTF-8 has Arabic byte runs; other invalid UTF-8 remains Windows-1252; HTML export places pictures and charts, as inline SVG, at their anchors; earlier: `file.exportCsv {values: true}` writes raw values for automation; .xls dialog sheets are skipped instead of read as worksheets; `.xls` import reads each sheet's display options from WINDOW2: right-to-left, gridlines, headings, zeros, formulas; XLSX text boxes and shapes keep their paragraphs' right-to-left direction on save; CSV/TSV/TXT can open with every field kept as text via `file.open {csvAsText}`; formulas over Excel's 8,192 characters, and `%` or call chains past the nesting limit, are parse errors instead of stack overflows when a file is opened; XLSX PivotTables read and write `rowGrandTotals`/`colGrandTotals` the way Excel does, so a table saved with only one grand total opens with the right one; HTML export keeps right-to-left; CSV and text import detects likely Windows-1256 Arabic when invalid UTF-8 has Arabic byte runs; other invalid UTF-8 remains Windows-1252; HTML export places pictures and charts, as inline SVG, at their anchors; CSV and text open detects each column's date order from values that read only one way, warns when every date is ambiguous, and keeps a column with both kinds as text (#2765)) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4 Every format Excel opens or saves, with GridCraft's read and write support, fidelity and tests. Part of [target-app-parity.md](target-app-parity.md). **File formats: ~50% ready, 80–120 h** @@ -14,7 +14,7 @@ support comes from `crates/engine/src/io.rs` (`FileKind`), `crates/xlsx/src` and Legacy scalar `INDEX(range, MATCH(...))` formulas remain ordinary formulas on save, including when shared formulas are expanded during import (`array_export.rs`, #1505). -Arabic PDF output uses harfrust shaping, Unicode bidi and licensed Noto Arabic glyph outlines with ToUnicode and logical ActualText. Cells, headers and chart labels support marks, digits, rotation and style. Bundled builds use the optional `CRAFT_FONTS_DIR` input; unbundled native builds look for Noto Sans Arabic. Characters the Arabic face lacks fall back to the standard and CID fonts, and without an Arabic face for the text's weight Arabic is set in the CID font, which has no Arabic glyphs, with a message. Explicit cell reading-direction integration is separate. +Arabic PDF output uses harfrust shaping, Unicode bidi and licensed Noto Arabic glyph outlines with ToUnicode and logical ActualText. Cells, headers and chart labels support marks, digits, rotation and style. Bundled builds use the optional `CRAFT_FONTS_DIR` input; unbundled native builds look for Noto Sans Arabic. Characters the Arabic face lacks fall back to the standard and CID fonts, and without an Arabic face for the text's weight Arabic is set in the CID font, which has no Arabic glyphs, with a message. Cell Context/LTR/RTL direction is carried through measurement, wrapping and drawing. RTL sheet geometry mirrors while text stays readable. Latin-only RTL text uses bidi ordering without requiring an Arabic font. Cell text now uses shared Unicode bidi layout while retaining logical source indexes for editing, copy and XLSX. Format Cells exposes Context, Left to right and Right to left reading direction, independent of sheet geometry. OOXML Context uses the first non-whitespace character. Optional direction preserves absent versus explicit Context in differential styles. The renderer is pinned to a reviewed egui 0.36.2 backport with real-font, editing, accessibility and WASM checks. Physical screen-reader behavior remains unverified. @@ -124,7 +124,7 @@ past the parser's limit, and a wrapper inside the text. **Saving writes the real | Format | Excel | GridCraft | Notes | |---|---|---|---| -| PDF | Save As / Export | yes (own PDF 1.7 writer; CLI `convert` output) | Printed cell hyperlinks export as clickable HTTP(S)/mailto links or destinations within printed pages (#954); unsafe schemes and destinations outside the print range are omitted. Latin text uses the standard Helvetica, Times and Courier faces (13 base-14 entries with Symbol), not embedded; Arabic exports as shaped, embedded Noto Arabic glyphs; other characters outside WinAnsiEncoding are set in a predefined, non-embedded CID font (STSong-Light, Adobe-GB1, `UniGB-UTF16-H`, #1912), so **Simplified Chinese displays where the reader supplies that font, and scripts outside Adobe-GB1 (Devanagari, Thai) export as code points but show as the reader's missing-glyph box**; equations use Symbol for the Greek letters and operators it has, the Times faces for letters and digits, and a `[?]` box for the rest; web build exports without a file prompt (#141) | +| PDF | Save As / Export | yes (own PDF 1.7 writer; CLI `convert` output) | Printed cell hyperlinks export as clickable HTTP(S)/mailto links or destinations within printed pages (#954); unsafe schemes and destinations outside the print range are omitted. Latin text uses the standard Helvetica, Times and Courier faces (13 base-14 entries with Symbol), not embedded; Arabic exports as shaped, embedded Noto Arabic glyphs; cell reading direction and RTL sheet geometry are kept; other characters outside WinAnsiEncoding are set in a predefined, non-embedded CID font (STSong-Light, Adobe-GB1, `UniGB-UTF16-H`, #1912), so **Simplified Chinese displays where the reader supplies that font, and scripts outside Adobe-GB1 (Devanagari, Thai) export as code points but show as the reader's missing-glyph box**; equations use Symbol for the Greek letters and operators it has, the Times faces for letters and digits, and a `[?]` box for the rest; web build exports without a file prompt (#141) | | XPS | Windows | no | Low priority | | Print | yes | yes (via PDF, system dialog on desktop; PR #143 for web) | Pages print in the sheet's page order: down, then over (the default) or over, then down | | Images of ranges/charts (Copy as Picture) | yes | chart raster in `crates/chart` | No range-to-image command | @@ -163,6 +163,7 @@ refresh. Counted under features (Get & Transform, ~10% ready), not here. | Date | Change | Summary | |---|---|---| +| 2026-11-13 | minor | PDF of a right-to-left sheet keeps explicit Left and Right alignment on the side the grid shows them | | 2026-11-12 | minor | `.xls` files open with their data validation (drop-down lists, input messages, error alerts and the rules), read by craft-xls and mapped as the `.xlsx` reader maps the same rules. A rule Excel would refuse, or one past 65,536 in a workbook, is skipped with a warning (#3634, from #3636) | | 2026-11-12 | minor | .xls import reads the file with craft-xls (storytold/craft-libs), the reader that moved there from this repository; GridCraft keeps the mapping onto its model. The workbook now opens on the sheet it was saved on (WINDOW1 `itabCur`), falling back to the first visible sheet as before (from #3551), and cells saved as RString records (text with formatting runs) are read as text instead of skipped | | 2026-11-10 | minor | `.xls` import: every formula except a Ctrl+Shift+Enter array is read as a legacy one with Excel's implicit `@` (a title row `=Other!A1:G1` shows its first cell instead of `#SPILL!`), one-cell Ctrl+Shift+Enter arrays stay arrays, and `@` of a 2-D range meets the formula's row and column (#410, PR #1367) | @@ -189,6 +190,7 @@ refresh. Counted under features (Get & Transform, ~10% ready), not here. | 2026-11-01 | trivial | XLSX selects the first visible workbook view as one unit and bounds imported/exported tab ratios; isolated attributes and sheet-edit round trips covered, with firstSheet left to #2264 (#3057) | | 2026-10-31 | minor | CSV and text open detects each column's date order: a value that reads only day first (`31/05/2026`) makes the column day first, a value that reads only month first (`12/31/2026`) makes it month first, an all-ambiguous column keeps month first with a warning, and a column with both kinds stays text with a warning (#2765) | | 2026-10-31 | minor | XLSX open reads Google Sheets' `IFERROR(__xludf.DUMMYFUNCTION("…"),cached)` export wrapper as the formula inside when GridCraft calculates every function in it (plain, shared and array formulas, whole or nested; Google-only functions and unparseable, over-long or over-deep inner text keep the wrapper and the cached value) and keeps the cached value; saving writes the real formula with Excel's `_xlfn.` prefixes (#2871) | +| 2026-10-26 | minor | PDF honors cell Context/LTR/RTL, preserves paragraph direction across wrapping, and mirrors RTL sheet geometry without reversing glyphs | | 2026-10-26 | minor | Arabic PDF export embeds licensed glyph outlines, joins letters and marks, preserves logical text and reports unsupported glyphs before writing; Arabic runs take the embedded faces ahead of the CJK CID font, and CJK inside Arabic text is set in the CID font instead of failing the export | | 2026-10-26 | minor | Alignment readingOrder 0/1/2 survives cell, named-style and differential-style round-trips; Format Cells exposes reading direction and CF priority preserves unspecified inheritance | | 2026-10-21 | minor | HTML (Save as Web Page) writes pictures (`data:` URI ``) and charts (inline SVG from the chart crate's drawing primitives, text included) at their anchors; the table uses the sheet's column widths and row heights when the sheet has either, and output for sheets without pictures or charts is unchanged | @@ -214,7 +216,6 @@ refresh. Counted under features (Get & Transform, ~10% ready), not here. | 2026-10-15 | minor | XLSX: formulas and PivotTable sources quote sheet names like Excel (a leading `.`, R1C1-like and cell-like names), so `'.x'!A1` no longer saves as `.x!A1`, which Excel could not open (#1458) | | 2026-10-15 | minor | XLSX text preserves CR and CRLF across save/reopen; shared strings use `_x000D_` and other XML text uses ` ` (#1488) | | 2026-10-15 | minor | XLSX save keeps legacy `INDEX`/`MATCH` formulas scalar instead of marking them as dynamic arrays (#1505) | -| 2026-10-14 | trivial | XLSX import warns when a pivot cache is missing, malformed or too large instead of dropping its PivotTable silently (#1039) | | 2026-10-14 | minor | `.xls` import reads cell formatting from the Font, XF, Palette and Style records: fonts, fills, borders, alignment, protection, the custom palette, the Normal font and user cell styles | | 2026-10-14 | trivial | Formula parser: text longer than Excel's 8,192 characters, and postfix chains (`1%%%…`, `f(1)(1)…`) past the 256-level nesting limit, are parse errors (the cell keeps its formula text and cached value) instead of trees deep enough to overflow the stack when a hostile file is opened, saved or dropped | | 2026-10-14 | minor | XLSX formulas read with dynamic-array metadata (`cm`) keep it on save, so Excel does not recalculate them with implicit intersection | diff --git a/docs/gaps.md b/docs/gaps.md index d2c89d86a..3b21efc69 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Gaps -> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-11-02 · **Change:** minor (§17: equations; earlier: §13: Solver Sensitivity report; earlier: §4: chart resizing is no longer a gap; earlier: §13: Analysis ToolPak has all 19 tools; earlier: §4: chart data tables implemented with XLSX round-trip and print/PDF; earlier: §13: Solver Options; earlier: §13: Solver Load/Save Model and Reset All) · **Target:** Microsoft Excel (Microsoft 365) +> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-11-13 · **Change:** minor (§5: Arabic PDF output preserves cell direction, joined glyphs and RTL sheet geometry; earlier: §17: equations; earlier: §13: Solver Sensitivity report; earlier: §4: chart resizing is no longer a gap; earlier: §13: Analysis ToolPak has all 19 tools; earlier: §4: chart data tables implemented with XLSX round-trip and print/PDF; earlier: §13: Solver Options; earlier: §13: Solver Load/Save Model and Reset All) · **Target:** Microsoft Excel (Microsoft 365) Every known shortfall against Excel, one entry each, ranked by user impact (what blocks someone using GridCraft for real work first). This is the work list: pick from the top, check the open @@ -54,17 +54,17 @@ No alpha blockers: every core workflow passes the [alpha gate](roadmap.md#alpha- - **Estimate:** 25–35 h for beta (40–60 h full). [chart-parity.md](chart-parity.md) ### 5. Text in non-Latin scripts doesn't render or export (L) -- **Missing:** cross-platform script coverage, Devanagari/Thai shaping verification, non-Latin PDF and Arabic UI layout. +- **Missing:** cross-platform script coverage, Devanagari/Thai shaping verification, non-Latin PDF outside Arabic and Arabic UI layout. - **Evidence:** system-font fallback for CJK, Thai and Hebrew landed in #38 (closed #32); #142 (Chinese text) awaits confirmation; #54 (symbols as boxes on Fedora). Arabic shared shaping/bidi, editing and cell Context/LTR/RTL now have focused regressions and full gates. Arabic font delivery and PDF output are separate PRs; other script shaping still needs verification. -- **Missing:** CJK font fallback, complex shaping (Arabic, Devanagari, Thai), bidi, non-Latin PDF. +- **Missing:** CJK font fallback, complex shaping (Arabic, Devanagari, Thai), bidi, non-Latin PDF outside Arabic. - **Evidence:** system-font fallback for CJK, Thai and Hebrew landed in #38 (closed #32), and for Arabic (system, fontconfig and craft-fonts faces); a UI font with Arabic of its own (DejaVu Sans in the Flatpak) still draws interface Arabic ahead of fontconfig's choice (#229); #142 (Chinese text) awaits confirmation; #54 (symbols as boxes on Fedora); no shaping for Arabic or - Devanagari; PDF writer uses 14 standard fonts only. + Devanagari in the UI. PDF now shapes Arabic with licensed glyph outlines, preserves cell reading direction, and mirrors RTL sheets. - **Impact:** blocks most of the world's users even with an English UI. - **Estimate:** 12–20 h. [localization-parity.md](localization-parity.md) @@ -200,6 +200,7 @@ No alpha blockers: every core workflow passes the [alpha gate](roadmap.md#alpha- | 2026-11-01 | minor | §4: chart data tables implemented for column, bar, line, area and compatible combo charts, with legend keys and border settings, live source values, XLSX round-trip and print/PDF; other chart gaps remain. | | 2026-10-31 | minor | §13: Solver Options (Max Evaluations, Integer Optimality and the Evolutionary options), saved with the model | | 2026-10-31 | minor | §13: Solver Load/Save Model (`data.solverSaveModel`, `data.solverLoadModel`) and Reset All (`data.solverReset`), with buttons in the Solver Parameters dialog | +| 2026-10-26 | minor | §5: Arabic PDF output preserves cell direction, joined glyphs and RTL sheet geometry. Other script and UI gaps remain. | | 2026-10-26 | minor | Arabic shared bidi display/editing and persisted cell reading direction; other script and PDF work remain separate | | 2026-10-26 | minor | §5: Arabic text renders in cells and the interface: a system Arabic face (Tahoma, Arial or Segoe UI on Windows, Geeza Pro on macOS, Noto Sans or Naskh Arabic on Linux) joins the script fallbacks, fontconfig's Arabic choice, when it has Arabic letters, leads the Arabic fallbacks and draws Arabic wherever the UI or cell font has none, such as the default cell fonts (part of #229; a UI font with Arabic of its own, such as DejaVu Sans in the Flatpak, still draws interface Arabic, left for a follow-up), and craft-fonts' Noto Sans Arabic is a required face allowed on the web. Workbook fonts without Arabic keep every script fallback. Shaping and bidirectional layout remain separate work | | 2026-10-24 | minor | §8: PivotTable Enable show details: `pivot.options` `enableShowDetails` turns Show Details off for a PivotTable, read and written in XLSX as `enableDrill` | diff --git a/docs/localization-parity.md b/docs/localization-parity.md index e1cff475c..f886d1004 100644 --- a/docs/localization-parity.md +++ b/docs/localization-parity.md @@ -1,13 +1,13 @@ # Localization parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (Arabic PDF export no longer fails when a character or the Arabic font is missing); previously minor (Ukrainian Chart is Діаграма); previously minor (Diagram and Decorative Text labels, Diagram distinct from Chart); previously minor (CJK fallback baseline alignment); previously minor (Arabic bidi display, editing and cell reading direction; missing translations are listed by `cargo xtask i18n-report` and never fail a check); previously minor (Arabic font fallback; missing translations are listed by `cargo xtask i18n-report` and never fail a check); previously minor (number formats honour the `B1`/`B2` calendar prefixes, checked against Excel; earlier: missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks); previously minor (AutoFit estimates Arabic text width from measured glyph widths); previously minor (missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4 +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (Arabic PDF export no longer fails when a character or the Arabic font is missing; Arabic PDF cells keep their reading direction and RTL pages mirror); previously minor (Ukrainian Chart is Діаграма); previously minor (Diagram and Decorative Text labels, Diagram distinct from Chart); previously minor (CJK fallback baseline alignment); previously minor (Arabic bidi display, editing and cell reading direction; missing translations are listed by `cargo xtask i18n-report` and never fail a check); previously minor (Arabic font fallback; missing translations are listed by `cargo xtask i18n-report` and never fail a check); previously minor (number formats honour the `B1`/`B2` calendar prefixes, checked against Excel; earlier: missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks); previously minor (AutoFit estimates Arabic text width from measured glyph widths); previously minor (missing translations are listed by `cargo xtask i18n-report` and never fail a check; Arabic text sorts by its letters, not its vowel marks) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4 Per-language status against Excel, which ships its UI in dozens of languages (Windows language packs cover 100+), with localized function names, argument separators, number and date formats, right-to-left sheets and full complex-script support. Part of [target-app-parity.md](target-app-parity.md). **Localization: ~10% ready, 100–165 h** (estimated). -Arabic PDF output uses harfrust shaping, Unicode bidi and licensed Noto Arabic glyph outlines with ToUnicode and logical ActualText. Cells, headers and chart labels support marks, digits, rotation and style. Bundled builds use the optional `CRAFT_FONTS_DIR` input; unbundled native builds look for Noto Sans Arabic. Characters the Arabic face lacks fall back to the standard and CID fonts, and without an Arabic face for the text's weight Arabic is set in the CID font, which has no Arabic glyphs, with a message. Explicit cell reading-direction integration is separate. +Arabic PDF output uses harfrust shaping, Unicode bidi and licensed Noto Arabic glyph outlines with ToUnicode and logical ActualText. Cells, headers and chart labels support marks, digits, rotation and style. Bundled builds use the optional `CRAFT_FONTS_DIR` input; unbundled native builds look for Noto Sans Arabic. Characters the Arabic face lacks fall back to the standard and CID fonts, and without an Arabic face for the text's weight Arabic is set in the CID font, which has no Arabic glyphs, with a message. Cell Context/LTR/RTL direction is carried through measurement, wrapping and drawing. RTL sheet geometry mirrors while text stays readable. Latin-only RTL text uses bidi ordering without requiring an Arabic font. Cell text now uses shared Unicode bidi layout while retaining logical source indexes for editing, copy and XLSX. Format Cells exposes Context, Left to right and Right to left reading direction, independent of sheet geometry. OOXML Context uses the first non-whitespace character. Optional direction preserves absent versus explicit Context in differential styles. The renderer is pinned to a reviewed egui 0.36.2 backport with real-font, editing, accessibility and WASM checks. Physical screen-reader behavior remains unverified. @@ -76,7 +76,7 @@ Cell text now uses shared Unicode bidi layout while retaining logical source ind (`view.rightToLeft`, Page Layout › Sheet Options, XLSX `rightToLeft`, `.xls` WINDOW2 fRightToLeft) mirrors the grid (#146): column A and the row headers on the right, the vertical scrollbar on the left; hit-testing, arrow keys, editor, popups and floating objects follow; text follows its cell reading direction inside its box, - and the sheet tabs, horizontal scrollbar and printing/PDF are not mirrored yet. + and the sheet tabs and horizontal scrollbar are not mirrored yet; PDF export mirrors RTL sheets. Text boxes and shapes keep their paragraphs' right-to-left direction (`a:pPr rtl`) through XLSX save, though GridCraft still draws that text left to right. IME input goes through egui/winit and is unverified for Chinese, Japanese and Korean. @@ -98,7 +98,7 @@ separators, number/date formats, machine translation with agent review, and scri | Simplified Chinese (Mandarin) | zh-Hans | 266 (~12%) | no | CJK system-font fallback (#38); IME unverified; PDF can't export | no | menus only | 8–13 h | | Spanish | es | 0 (0%) | no | Latin: yes | no | none | 6–10 h | | Hindi | hi | 0 (0%) | no | Devanagari: **no shaping** | no | none | 12–18 h | -| Arabic | ar | 0 (0%) | no | shared shaping/bidi; no Arabic UI catalog or mirrored shell; PDF export: shaped and joined; Sheet RTL mirrors the grid (#146) | no | none | 25–35 h | +| Arabic | ar | 0 (0%) | no | shared shaping/bidi; no Arabic UI catalog or mirrored shell; PDF export: shaped and joined, follows cell direction, mirrors RTL sheets; Sheet RTL mirrors the grid (#146) | no | none | 25–35 h | | French | fr | 0 (0%) | no | Latin: yes | no | none | 6–10 h | | Portuguese | pt-BR | 943 (~43%) | dialogs and tooltips (dialogs take effect with #669) | Latin: yes | no | menus, File view, dialogs | 2–4 h | | Indonesian | id | 0 (0%) | no | Latin: yes | no | none | 5–8 h | @@ -140,6 +140,7 @@ language (none so far) and of localized function names. | 2026-11-10 | minor | Diagram and Decorative Text labels in all 18 non-English catalogs; Diagram never repeats the catalog's chart word (German `Schema`, Ukrainian `Схема`, Romanian `Schemă`), see [feature-names.md](feature-names.md) | | 2026-11-09 | minor | Arabic PDF export no longer fails on a character the Arabic face lacks (it falls back like other text) or when no Arabic font is available (Arabic is set in the CID font, which has no Arabic glyphs, and a message says so) | | 2026-10-31 | minor | System and embedded CJK text fallbacks share the Latin baseline in cells, editors and window titles; other scripts, symbols and emoji keep their alignment | +| 2026-10-26 | minor | Arabic PDF cells inherit explicit or contextual direction; wrapped lines retain paragraph direction, and RTL pages mirror cell and object geometry | | 2026-10-26 | minor | Shared bidi layout supports Arabic clusters, marks, visual cursor navigation and directional accessibility; cell Context/LTR/RTL is stored separately from sheet RTL and round-trips through XLSX | | 2026-10-26 | minor | Arabic text renders in cells and the interface: a system Arabic face (Tahoma, Arial or Segoe UI on Windows, Geeza Pro on macOS, Noto Sans or Naskh Arabic on Linux) joins the script fallbacks, fontconfig's Arabic choice, when it has Arabic letters, leads the Arabic fallbacks and draws Arabic wherever the UI or cell font has none, such as the default cell fonts (part of #229; a UI font with Arabic of its own, such as DejaVu Sans in the Flatpak, still draws interface Arabic, left for a follow-up), and craft-fonts' Noto Sans Arabic is a required face allowed on the web. Workbook fonts without Arabic keep every script fallback. Shaping and bidirectional layout remain separate work | | 2026-10-27 | minor | Number formats honour the `B1`/`B2` calendar prefixes: never shown; `B2` renders year, month, day and Arabic month and weekday names in the tabular Hijri calendar (1 Jan 2001 = 6 Shawwal 1421; leap years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26 and 29 of the 30-year cycle, which is what Excel shows). Checked against Excel 16.0 (build 20527, en-US) on every serial and about 1,700 format/value pairs: a locale or currency tag before `B2` keeps the date Gregorian, a misplaced `B` and digit or a prefix before a number format is rejected, serial 60 has no Hijri date, serial 0 shows as serial 1, two-word month names use a no-break space. Not matched: Excel's weekday/month-name mix-ups in one `B2` section and its weekday-only quirks |