From d3638abbb3d177ea08beed3b09cd9682b3732daf Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Thu, 1 Oct 2026 11:03:21 -0300 Subject: The docs give back the day-one lines the trim cut, the tutor becomes exercises on a +Tutor copy, the README builds the GUI and says what a terminal needs, and Shift-Esc says it needs the kitty keyboard protocol Co-Authored-By: Claude Opus 5.5 --- test/snapshots/builtins.golden | 94 +++++++++++++++++++++--------------------- test/snapshots/leader.golden | 50 +++++++++++----------- test/snapshots/tutor.golden | 16 +++---- 3 files changed, 80 insertions(+), 80 deletions(-) (limited to 'test/snapshots') diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 68fab516..4581cb99 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -30,52 +30,52 @@ |15: /tmp/pardes-snap/builtins/cwd/+Tutor Save Tty Collapse Del |16: 1 |17: 2 PARDES TUTOR -|18: 3 tmux + vi + acme, from scratch. +|18: 3 tmux + vi + acme, by doing. |19: 4 -|20: 5 The model is acme's: EVERYTHING is text, editable and executable -|21: 6 the same way. Modal editing (helix-style) lives on top of that. -|22: 7 Press j until you reach part 1. -|23: 8 -|24: 9 The lessons follow the guide (docs/typ/guide.typ, the "Guide" -|25: 10 chapter of the pardes book), and each ends by naming its section. -|26: 11 -|27: 12 Words written in backticks, like `Save`, are builtins: type one in -|28: 13 any tag and middle-click it. Lines starting with "| " are tags as -|29: 14 pardes draws them, words only. +|20: 5 This pane is +Tutor, a copy: edit it freely, and don't Save it +|21: 6 (Save would write a file named +Tutor in the session's directory). +|22: 7 `Del` in its tag closes it; once you have edited it, `Del` refuses +|23: 8 once and the second `Del` discards. `Tutor` or SPC h t opens a +|24: 9 fresh copy. +|25: 10 +|26: 11 The guide (docs/typ/guide.typ) explains; this is the hands-on part. +|27: 12 Each lesson is a few things to do, then names its guide section. +|28: 13 Words in backticks, like `Save`, are builtins: type one in any tag +|29: 14 and middle-click it. Lines starting with "| " are tags. |30: 15 -|31: 16 PRACTICE BLOCKS (part 9): the "# keys:" line lists keystrokes -|32: 17 (space-separated; esc/enter/bs are special, the rest type each char). -|33: 18 The lines under "# before" are what you practise on; "# after" is -|34: 19 what you should end up with. Nothing runs them. What pins the real -|35: 20 behaviour is `zig build hxdiff`, which replays test/hxcases against -|36: 21 goldens recorded from a real helix, and `zig build hxparity`, which -|37: 22 runs each case in a file pane and in a shell and demands they agree. -|38: 23 -|39: 24 -|40: 25 ================================================================= -|41: 26 = PART 1 — MODES = -|42: 27 ================================================================= -|43: 28 -|44: 29 A pane is text on screen, a tag over a body. Some panes are live -|45: 30 terminals; most are text you move a cursor over. Each pane has its -|46: 31 own mode and keeps it while you are elsewhere. The BOX at the left -|47: 32 of a pane's tag shows it: -|48: 33 -|49: 34 NORMAL keys move and select. The box is BLANK. -|50: 35 ^ INSERT keys type text at the cursor. -|51: 36 $ RAW keys go straight to the program (terminals only). -|52: 37 -|53: 38 Where each pane starts: a file or a PDF in NORMAL; a terminal from -|54: 39 `Tty` in RAW, one from Alt-n in NORMAL; a command pane in RAW while -|55: 40 its command runs. A bare `pardes` starts a shell in RAW with an -|56: 41 empty text pane under it; `pardes FILE` starts on the file. -|57: 42 -|58: 43 Esc and Shift-Esc, by mode: -|59: 44 -|60: 45 NORMAL Esc back to the previous pane (`Last`, SPC j j) -|61: 46 Shift-Esc the same -|62: 47 INSERT Esc back to NORMAL -|63: 48 Shift-Esc out of INSERT and back to the previous pane -|64: 49 RAW Esc goes to the program, except at an idle, -|65: 50 EMPTY shell prompt: back to the previous pane -|66: 51 Shift-Esc always back to the previous pane +|31: 16 Press j until you reach part 1. +|32: 17 +|33: 18 +|34: 19 ================================================================= +|35: 20 = PART 1 — MODES = +|36: 21 ================================================================= +|37: 22 +|38: 23 1. Look at the box left of this pane's tag: blank, so you are in +|39: 24 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then +|40: 25 Esc: blank again. +|41: 26 2. Press Esc once more, in NORMAL: the keyboard goes back to the +|42: 27 pane you were in before (not what helix does). Come back with +|43: 28 Esc again. +|44: 29 3. Press Alt-n: a terminal opens, in NORMAL mode. Press Ctrl-b: its +|45: 30 box shows $ (RAW), and keys go to the shell. At its empty prompt, +|46: 31 Esc brings you back here; the terminal stays $. +|47: 32 +|48: 33 -> Guide: Modes +|49: 34 +|50: 35 +|51: 36 ================================================================= +|52: 37 = PART 2 — THE MOUSE = +|53: 38 ================================================================= +|54: 39 +|55: 40 1. Right-click (B3) the word mouse in this sentence: the next mouse +|56: 41 is selected. +|57: 42 2. Middle-click (B2) the word `Help` here: the list of keys opens. +|58: 43 Close it with `Del` in its tag. +|59: 44 3. Select a word with B1, keep B1 down, click B2: it is cut. Still +|60: 45 holding B1, click B3: it comes back. That pair is a copy. +|61: 46 4. Put the cursor on `Help` and press Tab: the same as B2. Enter +|62: 47 is B3. +|63: 48 +|64: 49 -> Guide: The mouse +|65: 50 +|66: 51 diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 59f6930c..1ba94711 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -21,33 +21,33 @@ |11: /tmp/pardes-snap/leader/cwd/+Tutor Save Tty Collapse Del |12: 1 |13: 2 PARDES TUTOR -|14: 3 tmux + vi + acme, from scratch. +|14: 3 tmux + vi + acme, by doing. |15: 4 -|16: 5 The model is acme's: EVERYTHING is text, editable and executable -|17: 6 the same way. Modal editing (helix-style) lives on top of that. -|18: 7 Press j until you reach part 1. -|19: 8 -|20: 9 The lessons follow the guide (docs/typ/guide.typ, the "Guide" -|21: 10 chapter of the pardes book), and each ends by naming its section. -|22: 11 -|23: 12 Words written in backticks, like `Save`, are builtins: type one in -|24: 13 any tag and middle-click it. Lines starting with "| " are tags as -|25: 14 pardes draws them, words only. +|16: 5 This pane is +Tutor, a copy: edit it freely, and don't Save it +|17: 6 (Save would write a file named +Tutor in the session's directory). +|18: 7 `Del` in its tag closes it; once you have edited it, `Del` refuses +|19: 8 once and the second `Del` discards. `Tutor` or SPC h t opens a +|20: 9 fresh copy. +|21: 10 +|22: 11 The guide (docs/typ/guide.typ) explains; this is the hands-on part. +|23: 12 Each lesson is a few things to do, then names its guide section. +|24: 13 Words in backticks, like `Save`, are builtins: type one in any tag +|25: 14 and middle-click it. Lines starting with "| " are tags. |26: 15 -|27: 16 PRACTICE BLOCKS (part 9): the "# keys:" line lists keystrokes -|28: 17 (space-separated; esc/enter/bs are special, the rest type each char). -|29: 18 The lines under "# before" are what you practise on; "# after" is -|30: 19 what you should end up with. Nothing runs them. What pins the real -|31: 20 behaviour is `zig build hxdiff`, which replays test/hxcases against -|32: 21 goldens recorded from a real helix, and `zig build hxparity`, which -|33: 22 runs each case in a file pane and in a shell and demands they agree. -|34: 23 -|35: 24 -|36: 25 ================================================================= -|37: 26 = PART 1 — MODES = -|38: 27 ================================================================= -|39: 28 -|40: 29 A pane is text on screen, a tag over a body. Some panes are live +|27: 16 Press j until you reach part 1. +|28: 17 +|29: 18 +|30: 19 ================================================================= +|31: 20 = PART 1 — MODES = +|32: 21 ================================================================= +|33: 22 +|34: 23 1. Look at the box left of this pane's tag: blank, so you are in +|35: 24 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then +|36: 25 Esc: blank again. +|37: 26 2. Press Esc once more, in NORMAL: the keyboard goes back to the +|38: 27 pane you were in before (not what helix does). Come back with +|39: 28 Esc again. +|40: 29 3. Press Alt-n: a terminal opens, in NORMAL mode. Press Ctrl-b: its == snap deleted grid=100x41 cursor=7,3 |5: |6: diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index c78fe3d8..eb005e7e 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -7,14 +7,14 @@ | /tmp/pardes-snap/tutor/cwd/+Tutor Save Tty Collapse Del | 1 | 2 PARDES TUTOR -| 3 tmux + vi + acme, from scratch. +| 3 tmux + vi + acme, by doing. | 4 -| 5 The model is acme's: EVERYTHING is text, editable and execu↩ -| table -| 6 the same way. Modal editing (helix-style) lives on top of t↩ -| hat. -| 7 Press j until you reach part 1. -| 8 -| 9 The lessons follow the guide (docs/typ/guide.typ, the "Guide" +| 5 This pane is +Tutor, a copy: edit it freely, and don't Save it +| 6 (Save would write a file named +Tutor in the session's directory). +| 7 `Del` in its tag closes it; once you have edited it, `Del` refuses +| 8 once and the second `Del` discards. `Tutor` or SPC h t opens a +| 9 fresh copy. +| 10 +| 11 The guide (docs/typ/guide.typ) explains; this is the hands-on part | /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del | ls -- cgit v1.3