From 364ea5d6e57c36158d95bcd85d117e9f5a944d62 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Fri, 2 Oct 2026 00:49:21 -0300 Subject: Round 40's doc findings: tutor 3.1 comes back with Esc from +Help, 5.2 sweeps an anchored regex to Part 7's heading, 6.1 selects a name with m i W, 1.3 says a new terminal lists its directory; the guide's search row says n walks +Search and Enter moves the pane; a pane ctl's line has no newline, as acme's; a TODO(round40) on editing a tag's path Co-Authored-By: Claude Opus 5.5 --- docs/typ/cheatsheet-a4.pdf | 6 +++--- docs/typ/guide.typ | 3 ++- docs/typ/reference.typ | 3 ++- src/tutor.txt | 23 +++++++++++++---------- test/snapshots/builtins.golden | 40 ++++++++++++++++++++-------------------- 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/docs/typ/cheatsheet-a4.pdf b/docs/typ/cheatsheet-a4.pdf index 1c0428a1..60791146 100644 --- a/docs/typ/cheatsheet-a4.pdf +++ b/docs/typ/cheatsheet-a4.pdf @@ -1630,12 +1630,12 @@ x endstream endobj 438 0 obj -<> +<> endobj 439 0 obj <> stream -Typst 0.15.1en2026-10-01T23:43:08-03:002026-10-01T23:43:08-03:001application/pdfwcvVv/yi0p1mRMXwuR+49A==wcvVv/yi0p1mRMXwuR+49A==proof1.7 +Typst 0.15.1en2026-10-02T00:49:10-03:002026-10-02T00:49:10-03:001application/pdflG08UOFhICOcH8meIeMLxg==lG08UOFhICOcH8meIeMLxg==proof1.7 endstream endobj 440 0 obj @@ -2085,7 +2085,7 @@ xref 0000110963 00000 n 0000112036 00000 n trailer -<> +<> startxref 112223 %%EOF \ No newline at end of file diff --git a/docs/typ/guide.typ b/docs/typ/guide.typ index 90e72303..4c80eaea 100644 --- a/docs/typ/guide.typ +++ b/docs/typ/guide.typ @@ -102,6 +102,7 @@ in a pane's tag quits too. #pairs( [#key(":")], [the keyboard to the tag, on #word("Save") the first time; #key("Tab") runs it, #key(":") comes back], + // TODO(round40): final wording for Esc then Enter on an edited path. [edit the path, #key("Enter")], [the next #word("Save") writes to the new path], [#word("Collapse")], [folds the pane to its tag], [drag the box], [up or down resizes; onto another column moves the pane], @@ -167,7 +168,7 @@ the #word("Look") came from, then of each pane on the jump list, most recent first. #pairs( - [#key("/") `TODO` #key("Enter")], [a `+Search` of the lines holding `TODO`, the cursor on the first; #keys("n", "N") step through], + [#key("/") `TODO` #key("Enter")], [a `+Search` of the lines holding `TODO`; #key("n") moves the keyboard into it and walks its rows (#key("N") back), and #key("Enter") on a row takes the searched pane there], [#word("Find") `conf`], [a `+Search` of the files below the pane's directory with `conf` in their names], [#word("Grep") `TODO`], [a `+Search` of the lines holding `TODO`, literally, under every pane's directory], ) diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ index 52a128cb..27e8fe88 100644 --- a/docs/typ/reference.typ +++ b/docs/typ/reference.typ @@ -573,7 +573,8 @@ while a column or workspace tag has the keyboard. length, isdir (1 for a directory pane, else 0), dirty, width in cells, font, tab width, undo available, redo available, then `current`/`notcurrent`, a REPL's id if bound, `collapsed` when it is, and for a PDF `fit:width|height -tint:disabled|filtered|full`. It +tint:disabled|filtered|full`. Each field ends in a blank and the line has +no newline, as acme's has none (`cat ctl; echo`). It takes: - the pane builtins: #word("Del") (from the keyboard between two panes it diff --git a/src/tutor.txt b/src/tutor.txt index 7492b058..49a587f9 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -28,9 +28,10 @@ 2. Press Esc once more, in NORMAL: the keyboard goes back to the pane you were in before (not what helix does). Come back with Esc again. - 3. Press Alt-n: a terminal opens, in NORMAL mode. Press Ctrl-b: its - box shows $ (RAW), and keys go to the shell. At its empty prompt, - Esc brings you back here; the terminal stays $. + 3. Press Alt-n: a terminal opens, in NORMAL mode, and pardes types + ls at its first prompt. Press Ctrl-b: its box shows $ (RAW), and + keys go to the shell. At its empty prompt, Esc brings you back + here; the terminal stays $. -> Guide: Modes @@ -66,8 +67,8 @@ | Tty Collapse Del 1. Press : here: the keyboard goes to this pane's tag, on `Save`. - Press A, type a space and Help, press Esc, then `Exec` - `Help` there. Press : again to come back. + Press A, type a space and Help, press Esc, then Tab: `Help` + runs and its list takes the keyboard. Esc brings you back. 2. Click `Collapse` in this tag: the pane folds to its tag. Click it again. 3. Drag the box left of the tag down a few rows, then back. @@ -95,9 +96,11 @@ ================================================================= 1. `Look` :20 here: the cursor goes to line 20 of this pane. - 2. `Look` :/UNSAVED/ to go to the next match of UNSAVED. + 2. Drag across :/^=.*UNSAVED/ with B3 held: `Look` takes exactly + what you swept, a regex here, and goes to Part 7's heading. 3. Press /, type keys, press Enter: a +Search lists the lines with - keys and the cursor goes to the first. n and N step through. + keys. n moves into it and walks its rows; Enter on a row goes + to that line here. -> Guide: Look @@ -106,9 +109,9 @@ = PART 6 — TERMINALS = ================================================================= - 1. In the terminal from part 1 (or Alt-n again), type ls and press - Enter in RAW mode. Then Ctrl-b to NORMAL: move over its output - with j and k, select a name with x, yank it with y. + 1. In the terminal from part 1 (or Alt-n again), its ls has listed + the directory. Press Ctrl-b to NORMAL, put the cursor on a name + with j, k and w, select it with m i W, and yank it with y. 2. Come back here (Ctrl-w, or click) and press p: the name is pasted; yank and paste are shared by every pane. 3. `Del` the terminal: it closes with its shell. diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 2207ede6..87a515aa 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -58,24 +58,24 @@ |43: 28 2. Press Esc once more, in NORMAL: the keyboard goes back to the |44: 29 pane you were in before (not what helix does). Come back with |45: 30 Esc again. -|46: 31 3. Press Alt-n: a terminal opens, in NORMAL mode. Press Ctrl-b: its -|47: 32 box shows $ (RAW), and keys go to the shell. At its empty prompt, -|48: 33 Esc brings you back here; the terminal stays $. -|49: 34 -|50: 35 -> Guide: Modes -|51: 36 +|46: 31 3. Press Alt-n: a terminal opens, in NORMAL mode, and pardes types +|47: 32 ls at its first prompt. Press Ctrl-b: its box shows $ (RAW), and +|48: 33 keys go to the shell. At its empty prompt, Esc brings you back +|49: 34 here; the terminal stays $. +|50: 35 +|51: 36 -> Guide: Modes |52: 37 -|53: 38 ================================================================= -|54: 39 = PART 2 — THE MOUSE = -|55: 40 ================================================================= -|56: 41 -|57: 42 1. `Look` (B3) the word mouse in this sentence: the next mouse is -|58: 43 selected. -|59: 44 2. `Exec` (B2) the word `Help` here: the list of keys opens. -|60: 45 Close it with `Del` in its tag. -|61: 46 3. Select a word with B1, keep B1 down, click B2: it is cut. Still -|62: 47 holding B1, click B3: it comes back. That pair is a copy. -|63: 48 4. Put the cursor on `Help` and press Tab: `Exec`, as B2. Enter -|64: 49 is `Look`, as B3. -|65: 50 -|66: 51 -> Guide: The mouse +|53: 38 +|54: 39 ================================================================= +|55: 40 = PART 2 — THE MOUSE = +|56: 41 ================================================================= +|57: 42 +|58: 43 1. `Look` (B3) the word mouse in this sentence: the next mouse is +|59: 44 selected. +|60: 45 2. `Exec` (B2) the word `Help` here: the list of keys opens. +|61: 46 Close it with `Del` in its tag. +|62: 47 3. Select a word with B1, keep B1 down, click B2: it is cut. Still +|63: 48 holding B1, click B3: it comes back. That pair is a copy. +|64: 49 4. Put the cursor on `Help` and press Tab: `Exec`, as B2. Enter +|65: 50 is `Look`, as B3. +|66: 51 -- cgit v1.3