Fix the spacebar in Hangul combining (#1244)

* Fix the spacebar in Hangul combining

The encoding for the spacebar changed and the Hangul combining code was
not updated.

* Change the default layout for Korean

3 files changed, 12 insertions, 4 deletions

diff --git a/gen_method_xml.py b/gen_method_xml.py
index 9b266d5..b5479bd 100644
--- a/gen_method_xml.py
+++ b/gen_method_xml.py
@@ -50,7 +50,7 @@ LOCALES = [
   loc("ka_GE", "latin", "georgian_mes"),
   loc("kk_KZ", "latin", "cyrl_jcuken_kk"),
   loc("kn_IN", "kannada", "kann_kannada"),
-  loc("ko_KR", "hangul", "latn_qwerty_us"),
+  loc("ko_KR", "hangul", "hang_dubeolsik_kr"),
   loc("lt_LT", "latin", "latn_qwerty_lt", extra_keys="accent_ogonek:ą:ę:į:ų@s|accent_caron:č:š:ž@f|accent_dot_above:ė@s|accent_macron:ū@o|€"),
   loc("lv_LV", "latin", "latn_qwerty_lv", extra_keys="accent_macron:ā:ē:ī:ū@o|accent_caron:č:š:ž@f|accent_ogonek:ķ:ļ:ņ@s|accent_cedille:ģ@c|€"),
   loc("mk", "cyrillic", "cyrl_lynyertdz_mk", extra_keys="ѕ|ѓ|ќ|ѝ|ѐ|љ|њ|џ|„|“|€"),
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 036bf1f..e1169d7 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -45,7 +45,7 @@
   <subtype android:label="%s" android:languageTag="ka" android:imeSubtypeLocale="ka_GE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=georgian_mes,dictionary=ka" />
   <subtype android:label="%s" android:languageTag="kk" android:imeSubtypeLocale="kk_KZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_kk" />
   <subtype android:label="%s" android:languageTag="kn" android:imeSubtypeLocale="kn_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=kannada,default_layout=kann_kannada,dictionary=kn" />
-  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=latn_qwerty_us" />
+  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=hang_dubeolsik_kr" />
   <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lt,dictionary=lt,extra_keys=accent_ogonek:ą:ę:į:ų@s|accent_caron:č:š:ž@f|accent_dot_above:ė@s|accent_macron:ū@o|€" />
   <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lv,dictionary=lv,extra_keys=accent_macron:ā:ē:ī:ū@o|accent_caron:č:š:ž@f|accent_ogonek:ķ:ļ:ņ@s|accent_cedille:ģ@c|€" />
   <subtype android:label="%s" android:languageTag="mk" android:imeSubtypeLocale="mk" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_lynyertdz_mk,extra_keys=ѕ|ѓ|ќ|ѝ|ѐ|љ|њ|џ|„|“|€" />
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 3ef16bc..d45c9a1 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -535,9 +535,17 @@ public final class KeyModifier
       case Hangul_initial:
         // Finals that can also be initials have this kind.
         return combine_hangul_medial(kv, kv.getString().charAt(0), precomposed);
-      default:
-        return kv;
+      case Editing:
+        switch (kv.getEditing())
+        {
+          case SPACE_BAR:
+            return combine_hangul_medial(kv, ' ', precomposed);
+          default: break;
+        }
+        break;
+      default: break;
     }
+    return kv;
   }
 
   private static KeyValue combine_hangul_medial(KeyValue kv, char c,