* export: isolate portable HTML and XFDF/FDF grammar
* Fix extracted XFDF helper references and format affected crates
* Borrow HTML export items and finish extracted XFDF lint cleanup
* Issue #2385: audit finds thick strokes, black highlights and white boxes over text
Three ways of hiding text that a reader sees as redacted were reported clean
while the text stayed extractable:
- a thick stroke along the text (`0 G 20 w 70 705 m 400 705 l S`, marker
style): the walker now tracks the stroking color, the line width and `/CA`,
and a single axis-aligned `m`/`l` segment stroked opaquely counts as the
rectangle it paints (half the width each side);
- an opaque `/Highlight` annotation dark enough to hide the text (`/C [0 0 0]`):
the annotation pass now reads highlights too (color from `/C`, `/CA`,
Hidden/NoView skipped) and reports them as `covered-text`;
- an opaque white rectangle after dark text (`1 g 70 695 330 20 re f`): its
own kind, `hidden-under-white` (relative luminance of the paint >= 0.9; the
`0.9 g` table shading stays unflagged), so callers can decide.
The `doc_audit_redactions` tool description lists the new covers and kind;
the module docs state the limits (slanted or bent strokes, other filled
paths, shadings and patterns are still out of scope).
Tests: thick_stroke_over_text_is_a_cover, black_highlight_annotation_over_
text_is_a_cover, white_rectangle_over_text_is_reported_as_hidden_under_white
(the report's three cases, with the hairline, yellow, translucent, hidden and
outlined negatives); graphics_state_carries_across_streams now expects the
white kind for its white rectangle.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011K1peyrh5MdZ6ttHkVq8Gh
* audit: ExtGState /LW and omitted alphas, stroke width across the CTM, white first, highlight quads (#2385 review)
- gs sets /LW as the line width, and a /ca or /CA the dictionary leaves out
keeps its earlier value (ISO 32000-2 8.4.5) instead of resetting to opaque.
- A stroke's width is measured across the segment after the CTM, so a
non-uniform scale no longer widens horizontal and vertical strokes alike.
- A white cover is hidden-under-white even over white text, which the
contrast check had classified as covered-text.
- An opaque Highlight hides what its /QuadPoints paint, not its /Rect; the
/Rect stays the fallback when there are no usable quads.
Tests: ext_gstate_sets_line_width_and_keeps_omitted_alphas,
stroke_width_follows_a_non_uniform_ctm_across_the_segment,
white_cover_over_white_text_is_hidden_under_white,
highlight_covers_its_quad_points_not_its_rect
* audit: document that a Highlight is judged by its dictionary, not its /AP
Developed with AI assistance (Claude Code).
* audit: a white Square is hidden-under-white; a hidden Redact mark is still unapplied (#2385 review)
An opaque /Square with a white interior went through the dark-cover
contrast test and was passed over, although it hides the text as a white
rectangle in the content does: it is reported as HiddenUnderWhite, like
that rectangle. The Hidden/NoView skip applied to every annotation, so an
unapplied /Redact mark with either flag was no longer reported, which main
reports: the flags hide the mark, not the text, so the skip is for the
cover annotations only.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011K1peyrh5MdZ6ttHkVq8Gh
* audit: a stroke's round or square caps are part of the cover (#2385 review)
`stroked_rect` left the caps out, so a `1 J` / `2 J` marker line (or `/LC` in
an ExtGState) painted half a line width past each end that the audit did not
count: text under a cap stayed extractable and unreported. The cap is tracked
like the width (`J`, `/LC`, cumulative, saved by `q`), and an axis-aligned
stroke is lengthened by the pen's extent along it, `w/2 · |Mᵀ d̂|` after the
CTM (the across-width is `w/2 · |Mᵀ n̂|`, the same rule). A round cap counts by
its box. Butt caps, the default, add nothing.
Test `stroke_caps_lengthen_the_cover`: butt, round, square, back to butt,
vertical, a 4× scale along the stroke, a shear (√2), `/LC` with `/LW`, `Q`
restoring it, and a stroke that reaches `IBAN` only by its cap.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011K1peyrh5MdZ6ttHkVq8Gh
* audit: charge a highlight's quads against the comparison bound
A highlight is compared with every line of its page once per quad, but was
charged for one cover: a /Highlight with many /QuadPoints did page_cost x quads
work for the price of page_cost. hidden_text now spends page_cost per area.
QuadPoints is read only for highlights, and its length is checked before the
numbers are collected.
Developed with AI assistance (Claude Code).
---------
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
#7814 brought this branch's first two commits to main inside step 2, but not the three
fixes made here since: the RTF picture budget that counts every placement, rotations baked
into the pictures, pictures fitted to the text height, and the pages that lost a picture
reported through truncated_pages. They now sit in step 2's Builder: RTF's flow_doc gives
it a pictures::Budget, and Word's word_doc doesn't, so Word keeps its own limits
(room_for) and turns positioned pictures through their float. The text-height fit is in
the shared picture(), so Word's flowing pictures fit too.
The truncated_pages doc now says what RTF reports: pictures lost to its own limits or a
rotation it couldn't bake. A picture no format can encode is left out of all of them.
* export: write RTF through craft-rtf's full writer, from the word model
The pages are mapped onto a craft_wordmodel::Document (as_word.rs, the
mapping the DOCX export will share), and craft_rtf::doc::export writes
it. Over the small writer this keeps, in RTF:
- pictures, inline (the engine no longer leaves them out for RTF);
- each page's size, as a section per page (blank pages kept);
- Heading 1 and 2 styles;
- the title;
- hard line breaks inside a paragraph or cell (storytold/pdfcraft#4723).
It also fixes two bugs: \cellx was the absolute page x, so every column
edge sat one left margin too far right, and tables that touched became
one (NIST CSF 2.0 came out with 28 tables instead of 68).
craft-rtf, craft-wordmodel, craft-docx and craft-mime are pinned together
at one craft-libs commit: doc::export takes its own revision's Document.
* export: pin craft-libs main with push_text, the header-row fix and the RTF generator name
craft-rtf, craft-wordmodel, craft-docx and craft-mime move to craft-libs
b8eaa8e2, which has storytold/craft-libs#1946, #1947 and #1950. The
mapping appends through Paragraph::push_text/push_object, tables keep
the default look, and the RTF names PdfCraft as its generator.
* export: write Word through craft-docx, from the shared word model
as_docx.rs no longer writes WordprocessingML itself: as_word::word_doc
maps the pages onto a craft_wordmodel::Document and craft_docx::write
writes it. The decisions stay the same: a page with rotated text or
overlapping text keeps its layout as positioned text boxes and pictures
(watermark-sized text behind, pictures over it, other text on top), the
other pages flow, each page is a section of its own size, a shared page
colour is the document's, the PDF's language goes in the slot Word keeps
for its script, and the media limits are unchanged.
Over the hand-written package this gains:
- a VML fallback for every text box, so Word 2007 opens positioned pages;
- rotated text as a turned text box Word draws as a line;
- the body font named (Arial), with a font table saying it is a sans;
- PdfCraft as the application in docProps/app.xml;
- a picture drawn many times stored once.
The tests that matched XML read the package back through craft-docx.
* parity: the Word export through craft-docx, checked in Word 16, Word 2007 and LibreOffice
* chore: update Cargo.lock after rebasing #7592
---------
Co-authored-by: kiwi4boy <kiwi4boy@gmail.com>