Merge branch 'main' into osnr/checkerboard-calibration

Author: osnr

README.md

@@ -426,9 +426,10 @@ and then future holds with that key, `ball position`, will
 overwrite this statement but not override different holds with
 different keys
 
-(there's currently no way to overwrite state from other pages, but we
-could probably add a way to provide an absolute key that would allow
-that if it was useful.)
+You can overwrite another program's Hold with the `on` parameter, like
+`Hold (on 852) { ... }` (if the Hold is from page 852) or `Hold (on
+virtual-programs/example.folk) { ... }` (if the Hold is from the
+example.folk virtual program)
 
 ### Every time
 

live-build/README.md

@@ -4,7 +4,7 @@ Builds a bootable Folk OS image.
 
 To run Folk on a PC, [download the latest pre-built Folk image for USB
 stick from the Releases
-page.](https://github.com/FolkComputer/folk-live-build/releases)
+page.](https://github.com/FolkComputer/folk/releases)
 Follow the instructions there.
 
 ---

virtual-programs/editor.folk

@@ -200,7 +200,6 @@ When /page/ is a keyboard with path /kbPath/ /...anything/ & /page/ is an editor
     set timestamp [dict get $options timestamp]
 
     if {$timestamp > ($startTime * 1000) && ($keyState == "down" || $keyState == "repeat")} {
-      # handle printable (character) input
       if {[dict exists $options printable]} {
         Hold "cursor$kbPath" {
           Claim the $kbPath cursor is [updateCursor $cursor {x 1}]

virtual-programs/keyboard.folk

@@ -122,7 +122,8 @@ foreach keyboard $keyboardDevices {
 
                 set now [clock milliseconds]
                 set options [dict create timestamp $now]
-                if {$keychar ne ""} {
+                set modKeyNotHeld [expr {$mods <= 1}] ;# excluding Shift
+                if {$keychar ne "" && $modKeyNotHeld} {
                     dict set options printable $keychar
                 }
                 Assert keyboard $keyboard claims key $key is $keyState with {*}$options