diff options
| author | Gabriel Schneider <[email protected]> | 2026-10-01 15:48:04 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-10-01 15:48:24 -0300 |
| commit | 3c37c7c5c4516320819ed5cfeb95d590a4187f4a (patch) | |
| tree | 41420072971aac97da9e0680b739558f6b1c045e | |
| parent | 3d6e927b19848be10efcfa81da1fae508f2b81a5 (diff) | |
| download | pardes-3c37c7c5c4516320819ed5cfeb95d590a4187f4a.tar.gz pardes-3c37c7c5c4516320819ed5cfeb95d590a4187f4a.zip | |
The tutor opens with its title alone, and the slogan lines go: setup's opening, the guide's and reference's "carry" framings, the tutor's "Two carry the rest"
Co-Authored-By: Claude Opus 5.5 <[email protected]>
| -rw-r--r-- | docs/typ/guide.typ | 2 | ||||
| -rw-r--r-- | docs/typ/reference.typ | 2 | ||||
| -rw-r--r-- | docs/typ/setup.typ | 2 | ||||
| -rw-r--r-- | src/tutor.txt | 3 | ||||
| -rw-r--r-- | test/snapshots/builtins.golden | 94 | ||||
| -rw-r--r-- | test/snapshots/leader.golden | 52 | ||||
| -rw-r--r-- | test/snapshots/tutor.golden | 18 |
7 files changed, 85 insertions, 88 deletions
diff --git a/docs/typ/guide.typ b/docs/typ/guide.typ index 6a11e816..5957692a 100644 --- a/docs/typ/guide.typ +++ b/docs/typ/guide.typ @@ -3,7 +3,7 @@ // keys on the cheatsheet. #import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs, glossary, annotated, clip, mode-box -Two clicks carry pardes: #word("Look") (right-click) opens `src/bar.c:12`, and #word("Exec") (middle-click) runs `make`. +#word("Look") (right-click) opens `src/bar.c:12`; #word("Exec") (middle-click) runs `make`. #annotated("/docs/site/media/themes/orchard.png", (640, 513), alt: "a pardes window: workspace tag, column tag, a file pane, a terminal and a diff", diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ index 5fd51a46..9b107fe5 100644 --- a/docs/typ/reference.typ +++ b/docs/typ/reference.typ @@ -9,7 +9,7 @@ not .L), in acme's manner: panes, columns, tags and the session are files. Paths here are the served ones (#file("/pane/2/body")); through a mount they sit under the session's directory (`$m`; #doc("scripting", section: "find-the-session") says how to find it). The served #file("/README") is a -one-screen summary of this page. Two builtins carry the core: #word("Look") (right-click): open what the +one-screen summary of this page. Two builtins: #word("Look") (right-click): open what the text names, or else find it; #word("Exec") (middle-click): run the builtin it names, or else run it as a shell line. The files #file("look") and #file("exec") take a line each, as those clicks would. diff --git a/docs/typ/setup.typ b/docs/typ/setup.typ index 1c3a616b..df99a45f 100644 --- a/docs/typ/setup.typ +++ b/docs/typ/setup.typ @@ -3,8 +3,6 @@ // works best. Each snippet says in one line why it is there. #import "style.typ": key, keys, btn, chord, word, tag, addr, file, cmd, doc, pairs -pardes runs as it is; a few lines elsewhere make it fit. - = Install <install> #include "install.typ" diff --git a/src/tutor.txt b/src/tutor.txt index 7ae11c5f..7492b058 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -1,6 +1,5 @@ PARDES TUTOR - after acme and helix, by doing. This pane is +Tutor, a copy: edit it freely; there is no need to Save it (a bare Save asks for a path to write a copy to). @@ -10,7 +9,7 @@ The guide (docs/typ/guide.typ) explains; this is the hands-on part. Each lesson is a few things to do, then names its guide section. - Words in backticks, like `Save`, are builtins. Two carry the rest: + Words in backticks, like `Save`, are builtins. `Exec` (B2) runs the builtin a word names, or else runs it as a shell line; `Look` (B3) opens what the text names, or else finds it. Type a builtin in any tag and `Exec` it. Lines starting with diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 9d1dae65..2207ede6 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 after acme and helix, by doing. -|19: 4 -|20: 5 This pane is +Tutor, a copy: edit it freely; there is no need to -|21: 6 Save it (a bare Save asks for a path to write a copy to). -|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. Two carry the rest: -|29: 14 `Exec` (B2) runs the builtin a word names, or else runs it as a -|30: 15 shell line; `Look` (B3) opens what the text names, or else finds -|31: 16 it. Type a builtin in any tag and `Exec` it. Lines starting with -|32: 17 "| " are tags. -|33: 18 -|34: 19 Press j until you reach part 1. +|18: 3 +|19: 4 This pane is +Tutor, a copy: edit it freely; there is no need to +|20: 5 Save it (a bare Save asks for a path to write a copy to). +|21: 6 `Del` in its tag closes it; once you have edited it, `Del` refuses +|22: 7 once and the second `Del` discards. `Tutor` or SPC h t opens a +|23: 8 fresh copy. +|24: 9 +|25: 10 The guide (docs/typ/guide.typ) explains; this is the hands-on part. +|26: 11 Each lesson is a few things to do, then names its guide section. +|27: 12 Words in backticks, like `Save`, are builtins. +|28: 13 `Exec` (B2) runs the builtin a word names, or else runs it as a +|29: 14 shell line; `Look` (B3) opens what the text names, or else finds +|30: 15 it. Type a builtin in any tag and `Exec` it. Lines starting with +|31: 16 "| " are tags. +|32: 17 +|33: 18 Press j until you reach part 1. +|34: 19 |35: 20 -|36: 21 -|37: 22 ================================================================= -|38: 23 = PART 1 — MODES = -|39: 24 ================================================================= -|40: 25 -|41: 26 1. The box left of this pane's tag is blank, so you are in -|42: 27 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then -|43: 28 Esc: blank again. -|44: 29 2. Press Esc once more, in NORMAL: the keyboard goes back to the -|45: 30 pane you were in before (not what helix does). Come back with -|46: 31 Esc again. -|47: 32 3. Press Alt-n: a terminal opens, in NORMAL mode. Press Ctrl-b: its -|48: 33 box shows $ (RAW), and keys go to the shell. At its empty prompt, -|49: 34 Esc brings you back here; the terminal stays $. -|50: 35 -|51: 36 -> Guide: Modes +|36: 21 ================================================================= +|37: 22 = PART 1 — MODES = +|38: 23 ================================================================= +|39: 24 +|40: 25 1. The box left of this pane's tag is blank, so you are in +|41: 26 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then +|42: 27 Esc: blank again. +|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 |52: 37 -|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 +|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 diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 6d680fb9..cdc78e66 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 after acme and helix, by doing. -|15: 4 -|16: 5 This pane is +Tutor, a copy: edit it freely; there is no need to -|17: 6 Save it (a bare Save asks for a path to write a copy to). -|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. Two carry the rest: -|25: 14 `Exec` (B2) runs the builtin a word names, or else runs it as a -|26: 15 shell line; `Look` (B3) opens what the text names, or else finds -|27: 16 it. Type a builtin in any tag and `Exec` it. Lines starting with -|28: 17 "| " are tags. -|29: 18 -|30: 19 Press j until you reach part 1. +|14: 3 +|15: 4 This pane is +Tutor, a copy: edit it freely; there is no need to +|16: 5 Save it (a bare Save asks for a path to write a copy to). +|17: 6 `Del` in its tag closes it; once you have edited it, `Del` refuses +|18: 7 once and the second `Del` discards. `Tutor` or SPC h t opens a +|19: 8 fresh copy. +|20: 9 +|21: 10 The guide (docs/typ/guide.typ) explains; this is the hands-on part. +|22: 11 Each lesson is a few things to do, then names its guide section. +|23: 12 Words in backticks, like `Save`, are builtins. +|24: 13 `Exec` (B2) runs the builtin a word names, or else runs it as a +|25: 14 shell line; `Look` (B3) opens what the text names, or else finds +|26: 15 it. Type a builtin in any tag and `Exec` it. Lines starting with +|27: 16 "| " are tags. +|28: 17 +|29: 18 Press j until you reach part 1. +|30: 19 |31: 20 -|32: 21 -|33: 22 ================================================================= -|34: 23 = PART 1 — MODES = -|35: 24 ================================================================= -|36: 25 -|37: 26 1. The box left of this pane's tag is blank, so you are in -|38: 27 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then -|39: 28 Esc: blank again. -|40: 29 2. Press Esc once more, in NORMAL: the keyboard goes back to the +|32: 21 ================================================================= +|33: 22 = PART 1 — MODES = +|34: 23 ================================================================= +|35: 24 +|36: 25 1. The box left of this pane's tag is blank, so you are in +|37: 26 NORMAL mode. Press i: it shows ^ (INSERT). Type a word, then +|38: 27 Esc: blank again. +|39: 28 2. Press Esc once more, in NORMAL: the keyboard goes back to the +|40: 29 pane you were in before (not what helix does). Come back with == snap deleted grid=100x41 cursor=7,3 |5: |6: diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 7f1afb01..d861fcb9 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 after acme and helix, by doing. -| 4 -| 5 This pane is +Tutor, a copy: edit it freely; there is no need to -| 6 Save it (a bare Save asks for a path to write a copy to). -| 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 +| 3 +| 4 This pane is +Tutor, a copy: edit it freely; there is no need to +| 5 Save it (a bare Save asks for a path to write a copy to). +| 6 `Del` in its tag closes it; once you have edited it, `Del` refuses +| 7 once and the second `Del` discards. `Tutor` or SPC h t opens a +| 8 fresh copy. +| 9 +| 10 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 |
