diff --git a/Makefile b/Makefile index 296dc297..07f15082 100644 --- a/Makefile +++ b/Makefile @@ -90,13 +90,15 @@ sim: sim/gcc111libbid.a \ clangdb: sim/$(TARGET).mak .ALWAYS cd sim && rm -f *.o && compiledb make -f $(TARGET).mak && mv compile_commands.json .. -keyboard: sim/keyboard-db48x.png Keyboard-Layout.png Keyboard-Cutout.png +keyboard: Keyboard-Layout.png Keyboard-Cutout.png sim/keyboard-db48x.png help/keyboard.png doc/keyboard.png Keyboard-Layout.png: DB48X-Keys/DB48X-Keys.001.png cp $< $@ Keyboard-Cutout.png: DB48X-Keys/DB48X-Keys.002.png cp $< $@ sim/keyboard-db48x.png: DB48X-Keys/DB48X-Keys.001.png convert $< -crop 698x878+151+138 $@ +%/keyboard.png: sim/keyboard-db48x.png + cp $< $@ QMAKE_debug=debug QMAKE_release=release diff --git a/doc/0-Overview.md b/doc/0-Overview.md index 9e6da1bc..d80ae8ae 100755 --- a/doc/0-Overview.md +++ b/doc/0-Overview.md @@ -118,6 +118,8 @@ gives a variety of special characters. ### Key mapping +![DB48X keyboard layout](keyboard.png) + Some keys that have little use or no direct equivalent for RPL are remapped as follows: diff --git a/doc/keyboard.png b/doc/keyboard.png new file mode 100644 index 00000000..1a4daf00 Binary files /dev/null and b/doc/keyboard.png differ diff --git a/help/db48x.md b/help/db48x.md index b1b99bbc..f84089d9 100644 --- a/help/db48x.md +++ b/help/db48x.md @@ -118,6 +118,8 @@ gives a variety of special characters. ### Key mapping +![db48x keyboard layout](keyboard.png) + Some keys that have little use or no direct equivalent for RPL are remapped as follows: diff --git a/help/db50x.md b/help/db50x.md index f0df1b94..e8d3721f 100644 --- a/help/db50x.md +++ b/help/db50x.md @@ -83,7 +83,7 @@ characters are labeled on the right of each key on the DM42's keyboard. When *Alpha* mode is active, an _ABC_ indicator shows up in the annunciator area at the top of the screen. For lowercase entry, the indicator changes to -_abc_. In the rest of this document, Alpha mode will be indicated as 🔤. +_abc_. There are three ways to enter *Alpha* mode: @@ -118,6 +118,8 @@ gives a variety of special characters. ### Key mapping +![db50x keyboard layout](keyboard.png) + Some keys that have little use or no direct equivalent for RPL are remapped as follows: diff --git a/help/keyboard.png b/help/keyboard.png new file mode 100644 index 00000000..1a4daf00 Binary files /dev/null and b/help/keyboard.png differ diff --git a/src/user_interface.cc b/src/user_interface.cc index 8958b7fb..752e6b6b 100644 --- a/src/user_interface.cc +++ b/src/user_interface.cc @@ -2411,6 +2411,17 @@ bool user_interface::draw_help() } break; + case '!': + // Skip images + if (last == '\n') + { + unicode c = helpfile.get(); + while (c != '\n' && c != unicode(EOF)) + c = helpfile.get(); + } + skip = true; + break; + case '*': if (last == '\n' && helpfile.peek() == ' ') {