2 files changed, 54 insertions, 5 deletions

diff --git a/res/help.gmi b/res/help.gmi
index 1652f392..ad569230 100644
--- a/res/help.gmi
+++ b/res/help.gmi
@@ -16,7 +16,11 @@
 
 ## Navigation
 
-Hold down Alt/Option to see link shortcut keys. Each visible link on the page gets an alphanumeric shortcut. For example, the first link can be opened by pressing Alt-1. The tenth link is Alt-A. Additionally hold down Control/Command to open the link in a new tab.
+When navigating via keyboard, hold down ${ALT} to see link shortcut keys. Try doing so now and see how the link icon below is replaced with a number.
+
+=> gemini://gemini.circumlunar.space/ Project Gemini
+
+Each visible link on the page gets an alphanumeric shortcut. For example, the first link can be opened by pressing ${ALT+}1. The tenth link is ${ALT+}A. Additionally hold down ${CTRL} to open the link in a new tab.
 
 ### SEomting
 
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 0d69861d..f0101080 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -278,18 +278,63 @@ static const iBlock *aboutPageSource_(iRangecc path) {
 }
 
 static const iBlock *replaceVariables_(const iBlock *block) {
-    iRegExp *var = new_RegExp("\\$\\{([A-Z_]+)\\}", 0);
+    iRegExp *var = new_RegExp("\\$\\{([A-Z_+-]+)\\}", 0);
     iRegExpMatch m;
     if (matchRange_RegExp(var, range_Block(block), &m)) {
         iBlock *replaced = collect_Block(copy_Block(block));
         do {
             const iRangei span = m.range;
-            remove_Block(replaced, span.start, size_Range(&span));
             const iRangecc name = capturedRange_RegExpMatch(&m, 1);
+            iRangecc repl = iNullRange;
             if (equal_Rangecc(&name, "APP_VERSION")) {
-                insertData_Block(replaced, span.start,
-                                 LAGRANGE_APP_VERSION, strlen(LAGRANGE_APP_VERSION));
+                repl = range_CStr(LAGRANGE_APP_VERSION);
+            }
+            else if (equal_Rangecc(&name, "ALT")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2325");
+#else
+                repl = range_CStr("Alt");
+#endif
+            }
+            else if (equal_Rangecc(&name, "ALT+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2325");
+#else
+                repl = range_CStr("Alt+");
+#endif
+            }
+            else if (equal_Rangecc(&name, "CTRL")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2318");
+#else
+                repl = range_CStr("Ctrl");
+#endif
             }
+            else if (equal_Rangecc(&name, "CTRL+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2318");
+#else
+                repl = range_CStr("Ctrl+");
+#endif
+            }
+            else if (equal_Rangecc(&name, "SHIFT")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u21e7");
+#else
+                repl = range_CStr("Shift");
+#endif
+            }
+            else if (equal_Rangecc(&name, "SHIFT+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u21e7");
+#else
+                repl = range_CStr("Shift+");
+#endif
+            }
+            remove_Block(replaced, span.start, size_Range(&span));
+            insertData_Block(replaced, span.start, repl.start, size_Range(&repl));
+            printf("{%s}\n", cstr_Block(replaced));
+            iZap(m);
         } while (matchRange_RegExp(var, range_Block(replaced), &m));
         block = replaced;
     }