From ab37c29c884b7ba50b45631db29d3bfe16521a8b Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 13 Nov 2021 14:45:34 +0900
Subject: [PATCH] standard 2set is now rewriter ime

---
 assets/keylayout/ko_kr_2set_ksx5002.ime     | 70 ++++++++++++++-------
 assets/keylayout/ko_kr_2set_ksx5002_alt.ime |  2 +-
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/assets/keylayout/ko_kr_2set_ksx5002.ime b/assets/keylayout/ko_kr_2set_ksx5002.ime
index aa0f3d3a1..ee8b1e704 100644
--- a/assets/keylayout/ko_kr_2set_ksx5002.ime
+++ b/assets/keylayout/ko_kr_2set_ksx5002.ime
@@ -343,22 +343,13 @@ let bufAssemble = (isPreview) => {
 }
 //let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
 let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ')
-return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
+return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 // return: [displayed output, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    /*let purekeys = keycodes.filter(it => (
-            inRange(it,7,18) || // numeric
-            inRange(it,29,56) || // alph
-            it == 62 || // space
-            inRange(it,66,76) || // symbols
-            inRange(it,144,163) // numpad
-    ))
-    let headkey = purekeys[0]*/
-
     let s = states.keylayouts[headkey][layer]
 
     if (isHangul(s)) {
@@ -405,44 +396,77 @@ return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald"
         else if (states.buf[bufIndex] !== undefined) {
             let oldbufstr = bufDebugStringify(states.buf)
             let sendout = ''
+            // e.g. 닳 -> 달해
             if (vowelCollision && isThisCharJongseongDigraph(states.buf[2])) {
                 let digraphs = detachJongseongDigraph[states.buf[2]]
                 let newbuf = [digraphs[1], s]
                 states.buf = [states.buf[0], states.buf[1], digraphs[0]]
                 sendout = bufAssemble()
                 states.buf = newbuf
+
+//                console.log(`rearr1: ${bufDebugStringify(states.buf)} -> 1,${sendout}${bufAssemble()}`)
+                return ["1", sendout + bufAssemble()]
             }
-            else if (vowelCollision) {
+            // e.g. 둣 -> 두사
+            else if (vowelCollision && states.buf[2]) {
                 let newbuf = [states.buf[2], s]
                 states.buf = [states.buf[0], states.buf[1]]
                 sendout = bufAssemble()
                 states.buf = newbuf
+
+//                console.log(`rearr2: ${bufDebugStringify(states.buf)} -> 1,${sendout}${bufAssemble()}`)
+                return ["1", sendout + bufAssemble()]
             }
+            // e.g. 가 -> 가ㅏ (error; buf: ㄱ ㅏ · -> · ㅏ ·, that illegally allows C ㅏ · if any choseong is directly followed)
+            else if (vowelCollision) {
+                reset()
+//                console.log(`rearr4: 0,${s}`)
+                return ["0", s]
+            }
+            // Choseong after finalised IPK-syllable (ㅇ as in 밥이)
             else {
-                sendout = bufAssemble()
                 reset()
                 if (bufIndex == 2)
                     states.buf[0] = s
                 else
                     states.buf[bufIndex] = s
+
+//                console.log(`rearr3: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
+                return ["0", bufAssemble()]
             }
-            let newbufstr = bufDebugStringify(states.buf)
-//            console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`)
-            return [bufAssemble(1), sendout]
         }
         else {
+            let bufferEmpty = (states.buf[0] === undefined)
             states.buf[bufIndex] = s
-//            console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`)
+
+            // e.g. 2nd ㅏ as in 가ㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏ
+            // this merely cuts the "loop" where 4,6,8...th ㅏ are also inflicted
+            //
+            if (isVowel(states.buf[0]) && isVowel(states.buf[1])) {
+                reset()
+//                console.log(`assem0: 0,${s}`)
+                return ["0", s]
+            }
+            // e.g. ㅁ and ㅂ as in 물과␣백두산
+            else if (bufferEmpty) {
+//                console.log(`assem1: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
+                return ["0", bufAssemble()]
+            }
+            // e.g. ㅜ ㄹ ㅐ ㄱ ㅜ ㅏ ㄴ as in 물과␣백두산
+            else {
+//                console.log(`assem2: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
+                return ["1", bufAssemble()]
+            }
         }
 
-        return [bufAssemble(1), ""]
+//        console.log(`assem-digraph: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
+        return ["1", bufAssemble()]
     }
     else {
-//        console.log(`accepting char '${s}'`)
-        let oldbufstr = bufDebugStringify(states.buf)
-        let sendout = bufAssemble() + (s || ''); reset()
-//        console.log(`sending out: ${oldbufstr} -> ${sendout}`)
-        return [bufAssemble(1), sendout]
+        reset()
+        // directly print out the character without using the buffer
+//        console.log(`sending1 out: 0,${s}`)
+        return ["0", s]
     }
 },
 "backspace":()=>{
@@ -464,7 +488,7 @@ return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald"
 //    let newbufstr = bufDebugStringify(states.buf)
 //    console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`)
 
-    return bufAssemble(1)
+    return bufAssemble()
 },
 "end":()=>{
 //    console.log(`end composing`)
diff --git a/assets/keylayout/ko_kr_2set_ksx5002_alt.ime b/assets/keylayout/ko_kr_2set_ksx5002_alt.ime
index a5289c4c5..f43b99a1e 100644
--- a/assets/keylayout/ko_kr_2set_ksx5002_alt.ime
+++ b/assets/keylayout/ko_kr_2set_ksx5002_alt.ime
@@ -65,7 +65,7 @@ let states = {"keylayouts":[[""],[undefined],
 [undefined],
 ["\n"],
 ["\x08"],
-["`","~"],
+[";","~"],
 ["-","_"],
 ["=","+"],
 ["[","{"],