@@ -109,29 +109,7 @@ _________________________________________________________________
109 Notice that when you type i, 'NOR' changes to 'INS'.
109 Notice that when you type i, 'NOR' changes to 'INS'.
111=================================================================
111=================================================================
112−= 1.5 MORE ON INSERT MODE =
113−=================================================================
115− As you saw, you can type i to enter Insert mode at the current
116− position of the cursor. There are a few other ways you can
117− enter Insert mode at different locations.
119− Common examples of insertion commands include:
120− i - Insert before the selection.
121− a - Insert after the selection. (a means 'append')
122− I - Insert at the start of the line.
123− A - Insert at the end of the line.
125− 1. Move to anywhere in the line below marked -->.
126− 2. Type A (<SHIFT> + a), your cursor will move to the end of
127− the line and you will be able to type.
128− 3. Type the text necessary to match the line below.
130− --> This sentence is miss
131− This sentence is missing some text.
133−=================================================================
134−= 1.6 SAVING A FILE =
112+= 1.5 SAVING A FILE =
135=================================================================
113=================================================================
137 Type :w/:write to save a file.
115 Type :w/:write to save a file.
@@ -169,13 +147,79 @@ _________________________________________________________________
170 * Type i to enter Insert mode and type text. Type <ESC> to
148 * Type i to enter Insert mode and type text. Type <ESC> to
171 return to Normal mode.
149 return to Normal mode.
172− * Use a to enter Insert mode after the current selection.
150+
173− * Use I to enter Insert mode at the first non-whitespace
151+
174− character at the start of a line.
152+
175− * Use A to enter Insert mode at the end of a line.
153+
177=================================================================
155=================================================================
156+= 2.1 MORE INSERT COMMANDS =
157+=================================================================
159+ As you saw, you can type i to enter Insert mode at the current
160+ position of the cursor. There are a few other ways you can
161+ enter Insert mode at different locations.
163+ Common examples of insertion commands include:
164+ i - Insert before the selection.
165+ a - Insert after the selection. (a means 'append')
166+ I - Insert at the start of the line.
167+ A - Insert at the end of the line.
169+ 1. Move to anywhere in the line below marked -->.
170+ 2. Type A (<SHIFT> + a), your cursor will move to the end of
171+ the line and you will be able to type.
172+ 3. Type the text necessary to match the line below.
174+ --> This sentence is miss
175+ This sentence is missing some text.
177+=================================================================
178+= 2.2 OPENING LINES =
179+=================================================================
181+ Type o to add a newline and insert below the cursor.
182+ Type O to add a newline and insert above the cursor.
184+ 1. Move the cursor to the line below marked -->.
185+ 2. Type o to open a line below and type your answer.
187+ --> What is the best editor?
199+=================================================================
201+=================================================================
203+ * Type a to append to the selection.
205+ * Type I to enter Insert mode at the first non-whitespace
206+ character at the start of a line.
208+ * Type A to enter Insert mode at the end of a line.
210+ * Use o and O to open lines below/above the cursor respectively.
221+=================================================================
178−= 2.1 MOTIONS AND SELECTIONS =
222+= 3.1 MOTIONS AND SELECTIONS =
179=================================================================
223=================================================================
181 Type w to select forward until the next word.
225 Type w to select forward until the next word.
@@ -197,7 +241,7 @@ _________________________________________________________________
199=================================================================
243=================================================================
200−= 2.2 MORE ON MOTIONS =
244+= 3.2 MORE ON MOTIONS =
201=================================================================
245=================================================================
203 As you saw, typing w moves the cursor forward until the start
247 As you saw, typing w moves the cursor forward until the start
@@ -219,7 +263,7 @@ _________________________________________________________________
221=================================================================
265=================================================================
222−= 2.3 THE CHANGE COMMAND =
266+= 3.3 THE CHANGE COMMAND =
223=================================================================
267=================================================================
225 Type c to change the current selection.
269 Type c to change the current selection.
@@ -241,7 +285,7 @@ _________________________________________________________________
243=================================================================
287=================================================================
244−= 2.4 COUNTS WITH MOTIONS =
288+= 3.4 COUNTS WITH MOTIONS =
245=================================================================
289=================================================================
247 Type a number before a motion to repeat it that many times.
291 Type a number before a motion to repeat it that many times.
@@ -263,7 +307,7 @@ _________________________________________________________________
265=================================================================
309=================================================================
266−= 2.5 SELECTING LINES =
310+= 3.5 SELECTING LINES =
267=================================================================
311=================================================================
269 Type x to select a whole line. Type x again to select the next.
313 Type x to select a whole line. Type x again to select the next.
@@ -285,7 +329,29 @@ _________________________________________________________________
287=================================================================
331=================================================================
333+=================================================================
335+ * Type w to select forward until the next word.
336+ * Type e to select to the end of the current word.
337+ * Type b to select backward to the start of the current word.
338+ * Use uppercase counterparts, W,E,B, to traverse WORDS.
340+ * Typing d deletes the entire selection, so you can delete a
341+ word forward by typing wd.
343+ * Type c to delete the selection and enter Insert mode.
345+ * Type a number before a motion to repeat it that many times.
347+ * Type x to select the entire current line. Type x again to
348+ select the next line.
353+=================================================================
288−= 2.6 UNDOING =
354+= 4.1 UNDOING =
289=================================================================
355=================================================================
291 Type u to undo. Type U to redo.
357 Type u to undo. Type U to redo.
@@ -307,29 +373,73 @@ _________________________________________________________________
309=================================================================
375=================================================================
310−= CHAPTER 2 RECAP =
376+= 4.2 COPYING AND PASTING TEXT =
311=================================================================
377=================================================================
313− * Type w to select forward until the next word.
379+ Type y to yank (copy) the selection.
314− * Type e to select to the end of the current word.
380+ Type p to paste the yanked selection after the cursor.
315− * Type b to select backward to the start of the current word.
381+ Type P to paste the yanked text before the cursor.
316− * Use uppercase counterparts, W,E,B, to traverse WORDS.
318− * Typing d deletes the entire selection, so you can delete a
383+ 1. Move the cursor to the line below marked -->.
319− word forward by typing wd.
384+ Make sure your cursor is on the "b" of banana.
385+ 2. Type w to select "banana" and y to yank it.
386+ 3. Move to the space between "2" and "3" and type p to paste.
387+ 4. Repeat between "3" and "4".
321− * Type c to delete the selection and enter Insert mode.
389+ --> 1 banana 2 3 4
390+ 1 banana 2 banana 3 banana 4
323− * Type a number before a motion to repeat it that many times.
392+ Note: Whenever you delete or change text, Helix will copy the
393+ altered text. Use alt-d/c instead to avoid this.
394+ Note: Helix doesn't share the system clipboard by default. Type
395+ space-y/p to yank/paste on your computer's main clipboard.
325− * Type x to select the entire current line. Type x again to
397+=================================================================
326− select the next line.
398+= 4.3 SEARCHING IN FILE =
399+=================================================================
401+ Type / to search forward in file, enter to confirm search.
402+ Type n to go to the next search match.
403+ Type N to go to the previous search match.
405+ 1. Type / and type in a common word, like 'banana'.
406+ 2. Type enter to confirm the search.
407+ 3. Use n and N to cycle through the matches.
409+ Like the select command, searching also uses regex.
411+ Note: To search backwards, type ? (shift-/).
413+ Note: Unlike Vim, N doesn't change the search direction.
414+ N always goes backwards and n always goes forwards.
419+=================================================================
421+=================================================================
328 * Type u to undo. Type U to redo.
423 * Type u to undo. Type U to redo.
425+ * Type y to yank (copy) text and p to paste.
426+ * Use space-Y and space-P to yank/paste on the system
429+ * Type / to search forward in file, and ? to search backwards.
430+ * Use n and N to cycle through search matches.
331=================================================================
441=================================================================
332−= 3.1 MULTIPLE CURSORS =
442+= 5.1 MULTIPLE CURSORS =
333=================================================================
443=================================================================
335 Type C to duplicate the cursor to the next suitable line.
445 Type C to duplicate the cursor to the next suitable line.
@@ -351,7 +461,7 @@ _________________________________________________________________
351 Note: Type alt-C to do the same above the cursor.
461 Note: Type alt-C to do the same above the cursor.
353=================================================================
463=================================================================
354−= 3.2 THE SELECT COMMAND =
464+= 5.2 THE SELECT COMMAND =
355=================================================================
465=================================================================
357 Type s to select matches in the selection.
467 Type s to select matches in the selection.
@@ -373,7 +483,7 @@ _________________________________________________________________
375=================================================================
485=================================================================
376−= 3.3 SELECTING VIA REGEX =
486+= 5.3 SELECTING VIA REGEX =
377=================================================================
487=================================================================
379 The select command selects regular expressions, not just exact
489 The select command selects regular expressions, not just exact
@@ -395,7 +505,7 @@ _________________________________________________________________
397=================================================================
507=================================================================
398−= 3.4 COLLAPSING SELECTIONS =
508+= 5.4 COLLAPSING SELECTIONS =
399=================================================================
509=================================================================
401 Type ; to collapse selections to single cursors.
511 Type ; to collapse selections to single cursors.
@@ -417,7 +527,7 @@ _________________________________________________________________
419=================================================================
529=================================================================
420−= 3.5 SELECTING TO A CHARACTER =
530+= 5.5 SELECTING TO A CHARACTER =
421=================================================================
531=================================================================
423 Type f<ch> to select up to and including (find) a character.
533 Type f<ch> to select up to and including (find) a character.
@@ -439,7 +549,7 @@ _________________________________________________________________
439 current line. It searches for the character in the file.
549 current line. It searches for the character in the file.
441=================================================================
551=================================================================
442−= CHAPTER 3 RECAP =
552+= CHAPTER 5 RECAP =
443=================================================================
553=================================================================
445 * Type C to copy the current selection to below and Alt-C for
555 * Type C to copy the current selection to below and Alt-C for
@@ -461,29 +571,7 @@ _________________________________________________________________
463=================================================================
573=================================================================
464−= 4.1 COPYING AND PASTING TEXT =
465−=================================================================
467− Type y to yank (copy) the selection.
468− Type p to paste the yanked selection after the cursor.
469− Type P to paste the yanked text before the cursor.
471− 1. Move the cursor to the line below marked -->.
472− Make sure your cursor is on the "b" of banana.
473− 2. Type w to select "banana" and y to yank it.
474− 3. Move to the space between "2" and "3" and type p to paste.
475− 4. Repeat between "3" and "4".
478− 1 banana 2 banana 3 banana 4
480− Note: Whenever you delete or change text, Helix will copy the
481− altered text. Use alt-d/c instead to avoid this.
482− Note: Helix doesn't share the system clipboard by default. Type
483− space-y/p to yank/paste on your computer's main clipboard.
485−=================================================================
486−= 4.2 CHANGING CASE =
574+= 6.2 CHANGING CASE =
487=================================================================
575=================================================================
489 Type ~ to switch the case of all selected letters.
577 Type ~ to switch the case of all selected letters.
@@ -505,7 +593,7 @@ _________________________________________________________________
505 --> THIS sentence should ALL BE IN uppercase!
593 --> THIS sentence should ALL BE IN uppercase!
507=================================================================
595=================================================================
508−= 4.3 MACROS =
596+= 6.3 MACROS =
509=================================================================
597=================================================================
511 Macros are a way to record a set of actions you want to repeat.
599 Macros are a way to record a set of actions you want to repeat.
@@ -527,13 +615,9 @@ _________________________________________________________________
527 This sentence doesn't have it's first and last word.
615 This sentence doesn't have it's first and last word.
529=================================================================
617=================================================================
530−= CHAPTER 4 RECAP =
618+= CHAPTER 6 RECAP =
531=================================================================
619=================================================================
533− * Type y to yank (copy) text and p to paste.
534− * Type space-Y and space-P to yank/paste on the system
537 * Type ~ to alternate case of selected letters.
621 * Type ~ to alternate case of selected letters.
538 * Use ` and alt-` to set the case of selected layers to
622 * Use ` and alt-` to set the case of selected layers to
539 upper and lower respectively.
623 upper and lower respectively.
@@ -548,8 +632,12 @@ _________________________________________________________________
551=================================================================
639=================================================================
552−= 5.1 USING THE JUMPLIST =
640+= 7.1 USING THE JUMPLIST =
553=================================================================
641=================================================================
555 Helix can keep track of "jumps" which are big movements, like
643 Helix can keep track of "jumps" which are big movements, like
@@ -571,36 +659,14 @@ _________________________________________________________________
573=================================================================
661=================================================================
574−= 5.2 SEARCHING IN FILE =
575−=================================================================
577− Type / to search forward in file, enter to confirm search.
578− Type n to go to the next search match.
579− Type N to go to the previous search match.
581− 1. Type / and type in a common word, like 'banana'.
582− 2. Type enter to confirm the search.
583− 3. Use n and N to cycle through the matches.
585− Like the select command, searching also uses regex.
587− Note: To search backwards, type ? (shift-/).
589− Note: Unlike Vim, N doesn't change the search direction.
590− N always goes backwards and n always goes forwards.
595−=================================================================
596−= CHAPTER 5 RECAP =
662+= CHAPTER 7 RECAP =
597=================================================================
663=================================================================
599 * Type C-s to save position to the jumplist.
665 * Type C-s to save position to the jumplist.
600 * Type C-i and C-o to go forward and backward in the jumplist.
666 * Type C-i and C-o to go forward and backward in the jumplist.
602− * Type / to search forward in file, and ? to search backwards.
668+
603− * Use n and N to cycle through search matches.
669+
@@ -615,7 +681,7 @@ _________________________________________________________________
617=================================================================
683=================================================================
618−= 6.1 JOINING LINES =
684+= 8.1 JOINING LINES =
619=================================================================
685=================================================================
621 Type J to join together lines in selection.
687 Type J to join together lines in selection.
@@ -637,7 +703,7 @@ lines.
639=================================================================
705=================================================================
640−= 6.2 INDENTING LINES =
706+= 8.2 INDENTING LINES =
641=================================================================
707=================================================================
643 Type > to indent a line and < to outdent it.
709 Type > to indent a line and < to outdent it.
@@ -659,36 +725,14 @@ lines.
661=================================================================
727=================================================================
662−= 6.3 OPENING LINES =
663−=================================================================
665− Type o to add a newline and insert below the cursor.
666− Type O to add a newline and insert above the cursor.
668− 1. Move the cursor to the line below marked -->.
669− 2. Type o to open a line below and type your answer.
671− --> What is the best editor?
683−=================================================================
684−= CHAPTER 6 RECAP =
728+= CHAPTER 8 RECAP =
685=================================================================
729=================================================================
687 * Type J to join lines within selection.
731 * Type J to join lines within selection.
689 * Type > and < to indent and outdent selected lines.
733 * Type > and < to indent and outdent selected lines.
691− * Use o and O to open lines.
735+