A missing font is drawn in its font table altName, as Word does. The DOCX reader half lives in craft-libs#1426; this is the fonts, layout and settings half.
Originally authored by @Nghiathan13 in #2711.
SonarCloud's coverage shards run tests built with -Cinstrument-coverage
on shared runners. Tests that assert a wall-clock limit or a time
ratio swing there: the megabyte-word test took 5.7-23 s against a
15 s limit, and three linear-time tests read 24-31x against 24x. Each
one that flakes turns main red after merging.
Ignore under cfg(coverage) every test whose purpose is performance
(linear time, bounded, capped, fast). The gate CI still runs them all
uninstrumented. Behaviour tests that only carry a generous time guard
(fuzz, never-panics, clipboard, regex, render, recent fonts) and the
SSIP speech timeout tests keep running, so their checks stay covered.
Claude-Session: https://claude.ai/code/session_01FypgCXtSjB6e5jmy9Uq7u8
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Dependencies: take craft-libs main at 3af2280ee3
Every craft-libs git dependency (the workspace's 25, ui-egui's 3, the app's
craft-print, the web build's 2 and the krilla patch) moves to craft-libs main
at 3af2280ee3 from the 8 revisions they were pinned at. Cargo.lock changes
those sources, moves winprint and craft-winprint-gdi with craft-print, drops
the second craft-tiff, and adds cap-primitives and its dependencies, which
craft-font-store's Language pack recovery uses on native builds.
- craft_print::Job has two new fields. WordCraft sets grey_pages to false,
since it does not turn the spooled pages gray, and driver_settings to None.
- DOCX text boxes, rectangles, rounded rectangles and ellipses are now
written in mc:AlternateContent with a VML fallback that repeats the text
box's text. Two tests that counted w:txbxContent elements, or the story
text, now count the fallback copy as well.
* Printing: the isolated print helper keeps the job's grey pages and driver settings
The Windows print helper process rebuilt each job with grey_pages off and no
driver settings, whatever the job carried. Its request now carries both: the
driver settings travel as the printer's name and the DEVMODE in hex, and
damaged settings are an error. The request file may now be up to 2 MiB larger,
the size of the largest driver settings craft-print accepts, written as hex.
Comments in Cargo.toml and apps/wordcraft/Cargo.toml now describe the shared
craft-libs commit, and the shared-story text box test says where its two copies
are written.
* DOCX: open picture frame shapes and keep chart formatting from craft-libs
At this craft-libs commit the DOCX reader returns a picture frame shape
(`frame` preset) as its own shape kind, and charts carry series formatting
and axis settings. WordCraft's model had neither:
- A document with a picture frame shape failed to open with "unknown
variant `frame`". The model bridge now reads it as a rectangle, as the
earlier reader did.
- The chart model drops nothing the shared chart model holds: series fill,
line width, line and fill off, markers, smooth lines, data labels and
number format, and the category and value axes. Before, saving a chart
with any of these wrote the chart again without them.
- A new scatter series is drawn as markers without a line, as before.
Change Chart Type sets this when a chart becomes a scatter chart or stops
being one, Edit Data keeps each replaced series' formatting, and Data
Labels replaces each series' own label setting.
* Charts: draw turned axis titles and keep stored scatter charts without lines
At this craft-libs commit a chart's vertical axis title is a text item
turned -90°. WordCraft's graphic text item now carries that angle, and the
text is laid out along its box and drawn turned about the box's center.
Scatter series saved in a .json document or a recovery snapshot before
series formatting existed have no `noLine` value. They now read as markers
without a line, as they were drawn when saved.
* Charts: draw opened ODT scatter charts without lines
The ODF reader at this craft-libs commit does not read a scatter chart's
line setting, so a scatter chart saved as ODT and opened again was drawn
with lines between its points. The ODF writer writes every scatter series
as markers without a line, and the opened chart is now drawn that way.
* Charts: set scatter series to markers only for opened ODF files alone
Opened ODT, OTT and FODT files set their scatter series to markers
without a line, since the ODF reader does not read a series' line
setting. Other formats that go through the same import path keep their
series as read. A series that arrives with its markers turned off gets
them back, as Change Chart Type does, so it is still drawn.
The test for an opened scatter chart now also covers flat ODT, checks
the drawn items against the markers-only drawing, and checks that the
chart's paragraph is still written as read.
* Dependencies: take craft-libs main at 453b0da782
Every craft-libs dependency, and the craft-proof note in Cargo.toml,
moves from 3af2280ee3 to 453b0da782. Cargo.lock adds craft-dds, which
craft-image-codecs now uses; no crates.io version changes.
- craft-xls builds its test fixtures only for tests and its
test-support feature, and they return a Result. wordcraft-formats
gets a test-support feature that turns it on; sheet::xls_fixture is
behind it and returns Result, and wordcraft-engine's tests enable it.
- craft_metafile::Picture has new report fields; the render tests'
literals fill them with Default.
- The docx tests follow the writer: the font table is kept as read,
the flat OPC comparison allows a kept part without its XML
declaration, and the bibliography store is related from the main
part, once, after a second save too.
* DOCX: gutter position Top is kept when a document is opened and saved
craft-libs now reads w:gutterAtTop into its settings model instead of
keeping it as unread XML, and WordCraft's settings had no field for it,
so opening and saving a document dropped the setting. Settings gets
gutter_at_top (off by default), which the document bridge carries both
ways. Layout still puts the gutter on the left.
* Charts: Change Chart Type gives a pie chart's value axis the new type's gridlines
A pie or doughnut chart keeps a plain value axis (no gridlines, axis
line on), and a new chart of any other type has gridlines and no axis
line. Change Chart Type kept the old axis, so a pie chart changed to a
column chart was drawn and saved without gridlines and with an axis
line. Change Chart Type between a round chart and another type now sets
the value axis to the new type's when it is still the old type's; an
axis that was changed stays as it is.
The progress log gets a line for the chart formatting, turned axis
titles, picture frame shapes and gutter position this branch brings.
The gutter_at_top doc comment states only what the field holds.
The coverage shards failed six tests on every main push:
- three UI glyph tests: the Sonar job had no craft-fonts. Pass the same
fonts-ref as ci.yml.
- three layout linear-time tests: llvm-cov instrumentation pushes the
8x time ratio past 24 (24.2-31.2). Ignore them under cfg(coverage),
which cargo llvm-cov sets; the gate CI still runs them.
Claude-Session: https://claude.ai/code/session_01FypgCXtSjB6e5jmy9Uq7u8
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Header pictures: while editing the header, a click selects its Behind Text picture wherever no header text covers it
Header and footer Behind Text pictures skip the deferred drag-over-text path
where the plain hit test picked them with no text under them, and a right-click
selects them (and sets the page they were hit on) so Reset Picture and Wrap
Text act on them. Tests cover a header and a footer, a drag, and a repeated
picture right-clicked on another page.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* #5601: header Behind Text picture: a left-click selects the copy clicked on a repeated page
The press branch of pointer() selected the picture but left page_hint on the page being edited, so on a header picture repeated on page 2 the frame and handles were resolved and drawn on page 1. Set page_hint to the picked object's page, as select_at does for a right-click. Adds a left-click counterpart to the right-click test.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* #5601: header text hit test checks each line's own extent
CodeRabbit: hf_text_at took the whole paragraph's right edge from its last line, so
a click on a long first line past a short last line's end counted as clear of text
and selected the Behind Text picture under it. Each line now has its own band and
extent.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* #5601: pin that centred and right-aligned header lines cover their whole band
Line::left/right are the edges available to a line, not where its ink sits,
so a centred or right-aligned header line already covers the Behind Text
picture across its band (indent and floats narrow it) plus 40pt. Test pins
that, and the parity row now says what counts as covering the picture.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
* #5601: pin Line.left/right as band edges in the header band test
Assert the band's left edge is the 150pt indent, the centred/right ink
starts well inside it, and a click between the indent and the ink is
text. Fails if Line.left were the ink extent.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Each page's piece of a paragraph walked every line of the paragraph in
place_objects to find the pictures and shapes to draw with it, skipping
all but its own lines and the late-float anchor lines. A paragraph over
many pages was quadratic in its lines. A later piece now walks only its
own lines and the late-float anchor lines, in the same order.
unequal_formats_lay_out_in_linear_time reads 8.0x for 8x the runs in a
debug build, down from 15.0x, so it no longer fails in the slower
SonarCloud coverage build.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* chore: cut over image codecs and zip to craft-libs, fix main test regressions
* tests: store ODS mimetype and use standard ODF namespaces in mailings test
* Remove unused quick-xml workspace dependency
* fix: use standard ODF namespaces in file_dialogs test and preserve trailing line in markdown import_on_with_lines
* fix(geom): use png_chunks for PNG dimensions and p.fits(budget) in decode_for_drawing
Review follow-up. The break after '?' is dropped only before an ASCII letter,
digit or underscore, so a '?' in CJK text keeps the break UAX #14 gives it.
The break before a slash that starts a word now also takes '/_': with the
break after '/' before '_' gone, "caption /_back" had no break left there
and split mid-word when it did not fit.
Word keeps "/portal/_back/?type=..." whole: a web address goes to the next line whole, and
a long one breaks only where it no longer fits. UAX #14 allows a break after the '?' of a
query and after a slash before an underscore, and the slash rule that keeps "and/or" whole
covered only a letter or digit after the slash.
crates/metafile is deleted. formats, layout, render and pdf take their
WMF, EMF and EMF+ reader from craft-metafile (craft-libs 9dcbd90c, the
rev craft-docx is already pinned at), so EMF+ records are read: an EMF+
only file's DrawImage of a 32bppPARGB bitmap draws its pixels.
render and pdf draw what the shared model adds: pattern and hatch fills,
clip regions and clip paths, pen caps, joins, miter limits and dashes,
turned, skewed or mirrored bitmaps, and the opaque background behind
text. The text layout and the default font for a file that names none
(Arial, a 16-unit cell) move to layout, next to metafile_text_run.
layout/src/metafile.rs holds the rules both outputs follow: a negative
crop side draws as no crop, as before; a cosmetic pen's shortest dash
or gap is one output pixel; a dash pattern whose period is under a
pixel, or that would split a path into more than 100,000 pieces, draws
solid; and an invalid miter limit is 10. On screen, a pattern tile whose
sides are both under 1.5 device pixels fills with its average color,
computed once a tile, and the vector cache counts each item's clip
region, clip list and dash pattern.
Fixes#6636
Add layout.fitOnePage, a speculative typography search that removes one
page from the document while preserving relative font hierarchy.
Every size receives the same half-point-rounded reduction; line spacing
never falls below 0.94 of its original and body text never below 8.5 pt.
The command refuses on explicit page breaks, excessive final-page content,
formatting protection, tracked formatting and the cumulative 1 pt budget,
and leaves the document unchanged when it refuses.
Add the Layout ribbon button, KeyTip and a code-drawn icon, cover the
command with 41 tests, and regenerate the parity checklist.
#4501 split functions for `clippy::cognitive_complexity` and was meant to change no behaviour. A post-merge review of the whole diff found four places where it did. This PR restores the old behaviour in each.
- **Layout (`crates/layout/src/pass.rs`).** From section 2 on, headers, footers and footnote separators were measured under the previous section's document grid, with its SECTION/SECTIONPAGES values. Before #4501 the grid was reset first. With a docGrid line pitch in section 1 (common in CJK documents), section 2's body top moved and pages could break differently. The order is now:
1. `begin_section_state`: reset the grid, set the fields and separators.
2. `section_tops`: measure the header and footer room.
3. `apply_section_grid`: switch to the section's own grid.
New regression test `a_sections_header_is_measured_without_the_previous_sections_grid`. Without the fix, section 2's body top is 265.6 pt; with it, 226.9 pt, the same as with no grid.
- **ODT (`crates/formats/src/odt/styles.rs`).** A later paragraph default-style with no font, or a mono font, wiped the default font. It is now kept, as before #4501. Covered by a test.
- **Canvas (`crates/ui-egui/src/canvas/input.rs`).** A press that was handled showed the hover-link tooltip for one frame, which the old early `return` had skipped. This covers Ctrl+click on a link, switching to the header or footer, entering an equation, and a miss. `handle_primary_press` now returns `bool`. No test.
- **Czech suggestions (`crates/proof/src/cs/suggest.rs`).** The one-letter edits are bounded by the word's letter count as typed again. That count is clamped to the lowercased length so indexing can't go out of range. #4501 had bounded them by the lowercased length, which differs for e.g. `İ`.
`cargo xtask ci` passes locally (all 8 steps, 4606 tests).
<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
<!-- coderabbit-ai-generated:v1 -->
## Summary by CodeRabbit
* **Bug Fixes**
* Default document fonts remain available when a later paragraph style does not specify a usable font, and a later monospaced default does not replace an earlier proportional font.
* Headers, footers, and note separators use the layout settings and section values of their own section, helping prevent content from overlapping.
* Link hover tooltips are suppressed during canvas-handled clicks and return when the pointer hovers over the link after the press is released.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
A text box inside a group (Word's cards made of a coloured bar and a text
box) could not be edited: every click selected the whole group, and typing
then replaced the group with the typed text. Layout now keeps each group's
text box areas on the group's object, and hit testing treats them like a
text box on its own: inside is the box's text, the border and the group's
other members still grab the group (#6027).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
In a multi-column section every line number was drawn left of the page
margin, so the second column's numbers sat on top of the first column's.
Each column now has its numbers left of its own edge, as in Word.
Word in other languages saves the built-in "line number" style under a
localised id (German: Zeilennummer); the numbers now find it by its
built-in name when there is no LineNumber id, so its formatting applies.
Fixes#6018.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Word treats the end-of-cell mark as a paragraph in the default (Normal)
style, so a cell's last paragraph with contextual spacing in that style
(or in an undefined style, formatted as Normal) loses its space after, as
beside any same-style neighbour; one in another style keeps it.
`layout_box` kept the space after of every last cell paragraph except
automatic spacing, so the row grew by it and the text below the table sat
that much lower (docxide-pdf cell-end-text-context, cell-end-empty-context:
8 pt).
A middle or bottom cell of a row split across pages lines up with the
other cells' kept text, which `align_in_part` counted with its full space
after; it now stops at the cell's content end, so a dropped space after
(contextual or automatic) no longer pushes the aligned cell down.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
* layout: line numbers take the "Line Number" style, not a fixed 10 pt grey
Line numbers were laid out in 10 pt grey in the default font, whatever
the document said. Word formats them with the "Line Number" character
style over the document's defaults: in a manuscript whose defaults are
Aptos 12 pt, Word's PDF shows them in Aptos 12 pt black (measured in
Word for Mac), WordCraft's in 10 pt grey.
Lay the number out with the document's "Line Number" style when it has
one, else its plain defaults, so size, font and colour follow the
document.
Test: line numbers take the document's default size and automatic
colour, and a "Line Number" style's size and colour when there is one.
* docs: progress log and parity entries for line-number-style
---------
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
Word for Mac sets raised and lowered text at 0.65 of the run's size
rounded to the half point (measured from digit advances in its PDF
export at base sizes 8 to 36 pt: 11 pt -> 7, 12 -> 8, 24 -> 15.5).
WordCraft used 0.65 exactly, so lines with superscripts were up to
0.5 pt wider and some broke a word early.
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
* #5843: resolve LibreOffice semicolon-separated font fallback lists to first installed family
* #5843: address review comments on font fallback list resolution
* #5843: verify fallback list text on cache hit and accept Times New Roman in tests
* #5843: bound the fallback lists read from a DOCX and reuse their classification
A document could name thousands of fallback families in `w:ascii`/`w:hAnsi`.
Nothing bounded that value, and the name-based rules (roman classification,
Thai family, named substitutes) then scanned every candidate for each shaped
piece, so opening the document took seconds.
`w:ascii` and `w:hAnsi` now keep the leading families within MAX_FONT_NAME
bytes, cut at a `;` so no name is split, as `w:cs`/`w:eastAsia` already bound
their names. The family a real list would pick is kept: a LibreOffice list
names a few families, well under the bound.
The Thai-family and named-substitute answers are worked out once per list and
kept in the fallback-list cache, keyed by the list text, so shaping no longer
rescans candidates for every piece. Resolution still reads every candidate.
A 500-paragraph document whose font names 20,000 candidates laid out in 10.8 s;
bounded on read it takes 17 ms.
Tests:
- a hostile fallback list keeps its leading families, cut on a `;`
- a real LibreOffice list is read whole
- a later Thai or named fallback still classifies, and lists are cached
Word drops the space before of an empty paragraph that follows a document's
leading floating table: its PDFs of docxide-pdf's leading-empty-before-float-0
and -12 put the text after the empty anchor (beside the table) at the same
place for 0 pt and 12 pt before.
Flow::gap_before (crates/layout/src/flow.rs) kept it: a floating table
takes no room in the flow and clears `pb.prev`, so the paragraph after it
was laid out like a document's first paragraph, with its full space before.
It now drops it for body block 1 when block 0 was placed floating on this
page (the page's float_tables), the page is fresh and the paragraph holds
nothing but markers (bookmarks, comment and permission ranges). It
doesn't check that the paragraph sits beside the table, so below a
full-width leading float an empty paragraph loses its space before too;
that case is untested. Later pages and columns, and paragraphs with text,
keep their space before.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
A floating table with tblOverlap=never that is moved below another floating
table steps in to its distance from the text's left edge only in Word 2013
layout (compatibility mode 15). clear_of_float_tables read the mode from the
legacy shift, the first cell's left margin before mode 15, being zero, so a
mode 12 table whose first cell has no left margin was taken for Word 2013
layout and moved 9 pt right (docxide displaced-anchor-*-compat12-overlap0-*:
Word 72 pt, WordCraft 81 pt). Pass the mode itself.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
UAX #14 allows a break between a full stop (IS) and an opening
parenthesis (OP), so `break_positions` (crates/layout/src/para/paragraph.rs)
let "29.05.2023г.(оформление ЗУ)" and "2023.(Example detail)" wrap after
the full stop. Word keeps such a token whole and wraps it at the space
before, as the docxide-pdf dot-open-token* Word references show. The
break between the two is now dropped (before the kinsoku pass, so
break-anywhere wrapping still applies).
Test: layout::tests::a_full_stop_before_a_parenthesis_is_no_break.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
A row is split across pages from its flattened items, so a row of a nested
table marked w:cantSplit was cut between its lines like any other text in
the outer cell. Word leaves such a row whole: the outer row moves to the
next page whole when that row comes first in it (docxide-pdf
nested-first-row-prefix300/330-cant1), and otherwise splits above it
(inferred).
table_flow now moves the cut up to just below the top of the highest nested
Can't Split row it runs through (nested_keep_cut): the outer row's bottom
band below that top, so the text and nested rows ending there stay on the
page. A row runs through the cut when it ends below the room left for text,
as in the split itself; one walk over the rows from the lowest top up moves
the cut until none does. A vertically merged cell doesn't stretch its row's
band, and a cell aligned to the middle or bottom is measured from its top, as
the split runs it. This applies to the first part of a row and to the kept-chain and
header-row checks. On a fresh page, where moving on gains nothing, a nested
row taller than the room still splits at the room rather than running into
the bottom margin.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
* Layout: a picture in a paragraph whose hidden mark closes a section keeps its room (#5288)
A paragraph with a hidden mark and no plain text was a quiet mark: laid out
with no room, its drawing kept. An in-line picture adds no plain text, so a
hidden-mark paragraph holding only a picture qualified, and the text after it
(the next continuous section in the report) was drawn over the picture. Such
a paragraph, or one holding a note reference mark, now keeps its line; one
with only floating objects stays quiet.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Layout: a legacy check box in a hidden closing mark keeps its room too (#5288)
A FORMCHECKBOX field has an empty result, so a hidden-mark paragraph holding
only a check box still counted as quiet and the next continuous section was
drawn over the box. Fields now count as visible content when the paragraph
layout shows them as something other than their result: their code, a legacy
check box, or a drop-down's entry (the same test as the layout's `field`).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>
Word wraps "Dataprotection-/Secrecyviolation" as "Dataprotection-" /
"/Secrecyviolation". UAX #14 (LB13) forbids a break before the slash, so
the compound had no break opportunity: lines moved it whole and auto-fit
table columns widened to fit it, taking width from their neighbours.
Add the break after U+002D when a slash and a letter follow, next to the
existing break before a digit (#2712); Word keeps "fitness-/1589" whole,
so a slash before a digit gains no break. Always sort the added breaks.
Co-authored-by: Naxvog <4963183+naxvog@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Martin Ball <martin.ball@ucscaregroup.co.uk>