Repository navigation
feat: automatic shapes, ink replay, section tabs, font and highlight colours - #360
Merged
DWAA1660 merged 3 commits intoNov 17, 2026
Merged
Conversation
- Draw > Automatic Shapes (AlienTechSoftware#294): when on, a hand-drawn line, rectangle, ellipse or triangle is redrawn clean on pen lift. Strict recognition (notecraft_ink::recognise), checked against the Welcome notebook's real strokes; one Undo restores the hand stroke. The setting is kept. - Draw > Ink Replay (AlienTechSoftware#295): replays the page's strokes in their saved order at an even speed, with play/pause, restart, step and speed. It never changes the drawing or undo. - View > Tabs layout (AlienTechSoftware#268, AlienTechSoftware#33): the notebook's sections as coloured tabs over the page; a group is a tab with a list. - Home > Font Colour and Text Highlight Colour (AlienTechSoftware#260): exact #rrggbb colours on the selection or next typing, kept in HTML and CMGFM as span color / background-color, readable on every theme. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y4im4nDYbxmtByUCBaBzNq
DWAA1660
enabled auto-merge
November 17, 2026 22:17
Brings in main with AlienTechSoftware#358 and the AlienTechSoftware#359 test fix. The i18n catalogs conflicted only where both sides appended; both kept. Tabs layout is built here (AlienTechSoftware#268), so the placeholder test lists it as working. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y4im4nDYbxmtByUCBaBzNq
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What and why
A second batch of UI parity work, stacked on #359 (built on its branch, so it merges cleanly after it). Until #359 merges, this diff also shows #359's two commits; the new work is the last commit,
9ba5d1f.notecraft_ink::recognise) is strict: short strokes, writing, open loops, scribbles, stars, diamonds and pentagons stay exactly as drawn. The result is ordinary ink, so both page formats keep it. It is two undo steps: one Undo brings back what the hand drew, and Redo the clean shape. Strokes laid along the ruler are not reread, and existing ink is never reinterpreted.Spangainscolourandhighlight, kept as exact#rrggbbin a NoteCraft inline<span style="color: ...; background-color: ...">in both CMGFM and HTML, with round-trip tests. Colours in other notations (names,rgb()) are not read. On screen, a colour too faint for the theme is moved towards the theme's text colour, and a highlight is washed on dark themes, so text stays readable on all 14 themes; the file keeps the chosen value. The palettes show the current colour, and the format painter carries colours too. Not built: More Colors, and colours in table cells.docs/gaps.mddescribes each of these and what is still missing.I checked that none of these issues was assigned, claimed in a comment, or referenced by an open PR before starting.
How it was checked
recognise(lines, boxes, ellipses and triangles found; ticks, waves, open loops, pentagons and back-and-forth scribbles left alone; the redrawn shape keeps pen and place),replay(order, partial strokes, play/pause/step/speed, the end, an empty drawing),sectiontabs(sections and nested groups in order) andtextcolour(parsing, readability on light and dark pages).crates/ink/tests/recognise_demo.rsruns recognition over the Welcome notebook's realink.svgstrokes in bothhtmlandcmgfm. The twelve handwritten letters stay writing, the drawn circle is found, and the shapes page gives a line, rectangle, ellipse and triangle while leaving the star, diamond and arrow alone.text_colour_and_highlight_round_trip_through_cmgfm_and_html(exact colours, nesting,#rgbwidened) anda_colour_that_is_not_a_plain_hex_value_is_not_taken.format_parityis green.automatic_shapes_redraws_a_hand_drawn_box_and_undo_brings_it_backink_replay_plays_the_strokes_in_order_and_changes_nothing(the ink file is byte-identical afterwards)tabs_layout_shows_sections_as_tabs_and_opens_themfont_colour_and_highlight_colour_the_selected_words_in_both_formats(HTML and CMGFM: saved colours, only the picked word, Automatic removes, Undo restores)cargo fmt --check,cargo clippy --workspace --all-targets -- -D warnings,cargo xtask layers,assets,docs,text,demo-checkandi18n-auditall pass. I looked at screenshots of each feature (light theme). The full local UI suite was not run before pushing; hosted CI runs it.Quality level L3
cargo xtask cipasses on the current branch before pushing (fmt, clippy, static checks, i18n and the focused tests passed; the full suite runs in hosted CI).docs/gaps.md) match the change.🤖 Generated with Claude Code
https://claude.ai/code/session_01Y4im4nDYbxmtByUCBaBzNq