Add functional dubeolsik standard layout

app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt

@@ -49,6 +49,69 @@ class HangulCombiner : Combiner {
                 return createEventChainFromSequence(text, event)
             } else {
                 when(jamo) {
+                    is HangulJamo.Consonant -> {
+                        val initial = jamo.toInitial()
+                        val final = jamo.toFinal()
+                        if(currentSyllable.final == null) {
+                            if(currentSyllable.initial != null) {
+                                val combination = COMBINATION_TABLE_DUBEOLSIK[currentSyllable.initial.codePoint to (initial?.codePoint ?: -1)]
+                                if(combination != null) {
+                                    history += currentSyllable.copy(initial = HangulJamo.Initial(combination))
+                                } else {
+                                    history += currentSyllable.copy(final = final)
+                                }
+                            } else {
+                                history += currentSyllable.copy(final = final)
+                            }
+                        } else {
+                            val pair = currentSyllable.final.codePoint to (final?.codePoint ?: -1)
+                            val combination = COMBINATION_TABLE_DUBEOLSIK[pair]
+                            if(combination != null) {
+                                history += currentSyllable.copy(final = HangulJamo.Final(combination, combinationPair = pair))
+                            } else {
+                                composingWord.append(currentSyllable.string)
+                                history.clear()
+                                history += HangulSyllable(initial = initial)
+                            }
+                        }
+                    }
+                    is HangulJamo.Vowel -> {
+                        val medial = jamo.toMedial()
+                        if(currentSyllable.final == null) {
+                            if(currentSyllable.medial != null) {
+                                val combination = COMBINATION_TABLE_DUBEOLSIK[currentSyllable.medial.codePoint to (medial?.codePoint ?: -1)]
+                                if(combination != null) {
+                                    history += currentSyllable.copy(medial = HangulJamo.Medial(combination))
+                                } else {
+                                    composingWord.append(currentSyllable.string)
+                                    history.clear()
+                                    history += HangulSyllable(medial = medial)
+                                }
+                            } else {
+                                history += currentSyllable.copy(medial = medial)
+                            }
+                        } else if(currentSyllable.final.combinationPair != null) {
+                            val pair = currentSyllable.final.combinationPair
+
+                            history.removeAt(history.lastIndex)
+                            val final = HangulJamo.Final(pair.first)
+                            history += currentSyllable.copy(final = final)
+                            composingWord.append(syllable?.string ?: "")
+                            history.clear()
+                            val initial = HangulJamo.Final(pair.second).toConsonant()?.toInitial()
+                            val newSyllable = HangulSyllable(initial = initial)
+                            history += newSyllable
+                            history += newSyllable.copy(medial = medial)
+                        } else {
+                            history.removeAt(history.lastIndex)
+                            composingWord.append(syllable?.string ?: "")
+                            history.clear()
+                            val initial = currentSyllable.final.toConsonant()?.toInitial()
+                            val newSyllable = HangulSyllable(initial = initial)
+                            history += newSyllable
+                            history += newSyllable.copy(medial = medial)
+                        }
+                    }
                     is HangulJamo.Initial -> {
                         if(currentSyllable.initial != null) {
                             val combination = COMBINATION_TABLE_SEBEOLSIK[currentSyllable.initial.codePoint to jamo.codePoint]
@@ -130,7 +193,7 @@ class HangulCombiner : Combiner {
                 return Vowel(codePoint.toInt())
             }
         }
-        data class Final(override val codePoint: Int) : HangulJamo() {
+        data class Final(override val codePoint: Int, val combinationPair: Pair<Int, Int>? = null) : HangulJamo() {
             override val modern: Boolean get() = codePoint in 0x11a8 .. 0x11c2
             val ordinal: Int get() = codePoint - 0x11a7
             fun toConsonant(): Consonant? {
@@ -170,6 +233,8 @@ class HangulCombiner : Combiner {
             const val CONVERT_FINALS = "ᆨᆩᆪᆫᆬᆭᆮ\u0000ᆯᆰᆱᆲᆳᆴᆵᆶᆷᆸ\u0000ᆹᆺᆻᆼᆽ\u0000ᆾᆿᇀᇁᇂ"
             fun of(codePoint: Int): HangulJamo {
                 return when(codePoint) {
+                    in 0x3131 .. 0x314e -> Consonant(codePoint)
+                    in 0x314f .. 0x3163 -> Vowel(codePoint)
                     in 0x1100 .. 0x115f -> Initial(codePoint)
                     in 0x1160 .. 0x11a7 -> Medial(codePoint)
                     in 0x11a8 .. 0x11ff -> Final(codePoint)

app/src/main/res/xml/kbd_korean_dubeolsik_standard.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/rows_korean_dubeolsik_standard" />
+</Keyboard>

app/src/main/res/xml/keyboard_layout_set_korean.xml

@@ -24,7 +24,7 @@
         latin:supportedScript="hangul" />
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_qwerty"
+        latin:elementKeyboard="@xml/kbd_korean_dubeolsik_standard"
         latin:enableProximityCharsCorrection="true" />
     <Element
         latin:elementName="symbols"

app/src/main/res/xml/rowkeys_korean_dubeolsik_standard_1.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Key
+        latin:keySpec="&#x3142;"
+        latin:keyHintLabel="&#x3143;"
+        latin:additionalMoreKeys="&#x3143;" />
+    <Key
+        latin:keySpec="&#x3148;"
+        latin:keyHintLabel="&#x3149;"
+        latin:additionalMoreKeys="&#x3149;" />
+    <Key
+        latin:keySpec="&#x3137;"
+        latin:keyHintLabel="&#x3138;"
+        latin:additionalMoreKeys="&#x3138;" />
+    <Key
+        latin:keySpec="&#x3131;"
+        latin:keyHintLabel="&#x3132;"
+        latin:additionalMoreKeys="&#x3132;" />
+    <Key
+        latin:keySpec="&#x3145;"
+        latin:keyHintLabel="&#x3146;"
+        latin:additionalMoreKeys="&#x3146;" />
+    <Key
+        latin:keySpec="&#x315b;" />
+    <Key
+        latin:keySpec="&#x3155;" />
+    <Key
+        latin:keySpec="&#x3151;" />
+    <Key
+        latin:keySpec="&#x3150;"
+        latin:keyHintLabel="&#x3152;"
+        latin:additionalMoreKeys="&#x3152;" />
+    <Key
+        latin:keySpec="&#x3154;"
+        latin:keyHintLabel="&#x3156;"
+        latin:additionalMoreKeys="&#x3156;" />
+</merge>

app/src/main/res/xml/rowkeys_korean_dubeolsik_standard_2.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Key
+        latin:keySpec="&#x3141;" />
+    <Key
+        latin:keySpec="&#x3134;" />
+    <Key
+        latin:keySpec="&#x3147;" />
+    <Key
+        latin:keySpec="&#x3139;" />
+    <Key
+        latin:keySpec="&#x314e;" />
+    <Key
+        latin:keySpec="&#x3157;" />
+    <Key
+        latin:keySpec="&#x3153;" />
+    <Key
+        latin:keySpec="&#x314f;" />
+    <Key
+        latin:keySpec="&#x3163;" />
+</merge>

app/src/main/res/xml/rowkeys_korean_dubeolsik_standard_3.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Key
+        latin:keySpec="&#x314b;" />
+    <Key
+        latin:keySpec="&#x314c;" />
+    <Key
+        latin:keySpec="&#x314a;" />
+    <Key
+        latin:keySpec="&#x314d;" />
+    <Key
+        latin:keySpec="&#x3160;" />
+    <Key
+        latin:keySpec="&#x315c;" />
+    <Key
+        latin:keySpec="&#x3161;" />
+</merge>

app/src/main/res/xml/rows_korean_dubeolsik_standard.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_dubeolsik_standard_1" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_dubeolsik_standard_2"
+            latin:keyXPos="5%p" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_korean_dubeolsik_standard_3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>