diff --git a/java/res/xml/rowkeys_qwerty1_left5.xml b/java/res/xml/rowkeys_qwerty1_left5.xml
index 3655e3881..4258e6f3b 100644
--- a/java/res/xml/rowkeys_qwerty1_left5.xml
+++ b/java/res/xml/rowkeys_qwerty1_left5.xml
@@ -24,26 +24,26 @@
diff --git a/java/res/xml/rowkeys_qwerty1_right5.xml b/java/res/xml/rowkeys_qwerty1_right5.xml
index 5fb548bd4..2e4068af8 100644
--- a/java/res/xml/rowkeys_qwerty1_right5.xml
+++ b/java/res/xml/rowkeys_qwerty1_right5.xml
@@ -24,25 +24,25 @@
+ latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
diff --git a/java/res/xml/rowkeys_qwerty3_right3.xml b/java/res/xml/rowkeys_qwerty3_right3.xml
index 458df8108..6bd989467 100644
--- a/java/res/xml/rowkeys_qwerty3_right3.xml
+++ b/java/res/xml/rowkeys_qwerty3_right3.xml
@@ -32,6 +32,6 @@
latin:moreKeys="!text/morekeys_n" />
+ latin:keyHintLabel="\?"
+ latin:additionalMoreKeys="\?,/" />
diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml
index 28f6a2c7c..aee292eda 100644
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ b/java/res/xml/rowkeys_qwertz1.xml
@@ -22,51 +22,52 @@
xmlns:latin="http://schemas.android.com/apk/res-auto"
>
+ latin:additionalMoreKeys="1,\\%"
+ latin:moreKeys="!text/morekeys_q" />
-
+ latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml
index 959d4fba2..52a3c3653 100644
--- a/java/res/xml/rowkeys_qwertz3.xml
+++ b/java/res/xml/rowkeys_qwertz3.xml
@@ -23,20 +23,35 @@
>
+ latin:keySpec="x"
+ latin:keyHintLabel="""
+ latin:additionalMoreKeys="""
+ latin:moreKeys="!text/morekeys_x" />
+ latin:keySpec="b"
+ latin:keyHintLabel=";"
+ latin:additionalMoreKeys=";" />
+ latin:keySpec="m"
+ latin:keyHintLabel="\?"
+ latin:additionalMoreKeys="\?,/" />
diff --git a/java/src/org/futo/inputmethod/keyboard/Key.java b/java/src/org/futo/inputmethod/keyboard/Key.java
index a696d7098..e8ef09caa 100644
--- a/java/src/org/futo/inputmethod/keyboard/Key.java
+++ b/java/src/org/futo/inputmethod/keyboard/Key.java
@@ -376,7 +376,9 @@ public class Key implements Comparable {
}
if(moreKeys != null && moreKeys.length > 0) {
- final String hintLabelCandidate = moreKeys[0];
+ String hintLabelCandidate = moreKeys[0];
+ if(hintLabelCandidate.startsWith("\\")) hintLabelCandidate = hintLabelCandidate.substring(1);
+
if(hintLabelCandidate.length() == 1) {
hintLabel = hintLabelCandidate;
}
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
index e2b8d5467..bac35a5e4 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -302,7 +302,7 @@ public final class KeyboardTextsTable {
/* ~ additional_morekeys_symbols_0 */
/* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation",
/* morekeys_nordic_row2_11 */ EMPTY,
- /* morekeys_punctuation */ "_,\\\\,|,=",
+ /* morekeys_punctuation */ "?,!,\u203d,\u2026,_,\\\\,|,=",
/* keyspec_tablet_comma */ ",",
// Period key
/* keyspec_period */ ".",
@@ -342,7 +342,7 @@ public final class KeyboardTextsTable {
/* morekeys_tablet_comma */ EMPTY,
/* keyhintlabel_period */ EMPTY,
// U+00BF: "¿" INVERTED QUESTION MARK
- /* morekeys_question */ "\u00BF",
+ /* morekeys_question */ "\u00BF,\u203d",
/* morekeys_h ~ */
EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
/* ~ keyspec_south_slavic_row3_8 */
@@ -395,7 +395,7 @@ public final class KeyboardTextsTable {
/* morekeys_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote",
/* morekeys_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
// U+00A1: "¡" INVERTED EXCLAMATION MARK
- /* morekeys_exclamation */ "\u00A1",
+ /* morekeys_exclamation */ "\u00A1,\u203d",
/* morekeys_currency_generic */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
// U+00B9: "¹" SUPERSCRIPT ONE
// U+00BD: "½" VULGAR FRACTION ONE HALF