diff --git a/assets/keylayout/ko_kr_2set_ksx5002_alt.ime b/assets/keylayout/ko_kr_2set_ksx5002_alt.ime index a662b5585..708d66b23 100644 --- a/assets/keylayout/ko_kr_2set_ksx5002_alt.ime +++ b/assets/keylayout/ko_kr_2set_ksx5002_alt.ime @@ -310,7 +310,7 @@ let detachJungseongDigraph = { "\u3162":["\u3161","\u3163"], "\u318E":["\u318D","\u3163"] } -let bufAssemble = (isPreview) => { +let bufAssemble = () => { // nothing on the buffer if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined) return '' @@ -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)) { @@ -411,12 +402,16 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7 states.buf = [states.buf[0], states.buf[1], digraphs[0]] sendout = bufAssemble() states.buf = newbuf + + return ["0", bufAssemble()] } else if (vowelCollision) { let newbuf = [states.buf[2], s] states.buf = [states.buf[0], states.buf[1]] sendout = bufAssemble() states.buf = newbuf + + return ["0", bufAssemble()] } else { sendout = bufAssemble() @@ -425,24 +420,29 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7 states.buf[0] = s else states.buf[bufIndex] = s + + 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()}`) - } - return [bufAssemble(1), ""] + if (bufferEmpty) { +// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`) + return ["0", bufAssemble()] + } + else { +// console.log(`assembling: ${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: ${s}`) + return ["0", s] } }, "backspace":()=>{ @@ -464,7 +464,7 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7 // 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.notanime b/assets/keylayout/ko_kr_2set_ksx5002_alt.notanime new file mode 100644 index 000000000..a662b5585 --- /dev/null +++ b/assets/keylayout/ko_kr_2set_ksx5002_alt.notanime @@ -0,0 +1,477 @@ +let states = {"keylayouts":[[""],[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +["0",")"], +["1","!"], +["2","@"], +["3","#"], +["4","$"], +["5","%"], +["6","^"], +["7","&"], +["8","*"], +["9","("], +["*"], +["#"], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +["ㅁ"], +["ㅠ"], +["ㅊ"], +["ㅇ"], +["ㄷ","ㄸ"], +["ㄹ"], +["ㅎ"], +["ㅗ"], +["ㅑ"], +["ㅓ","·"], +["ㅏ","ㆍ"],// A & ARAE-A +["ㅣ","|"], +["ㅡ","…"], +["ㅜ"], +["ㅐ","ㅒ"], +["ㅔ","ㅖ"], +["ㅂ","ㅃ"], +["ㄱ","ㄲ"], +["ㄴ"], +["ㅅ","ㅆ"], +["ㅕ"], +["ㅍ"], +["ㅈ","ㅉ"], +["ㅌ","¤"], +["ㅛ"], +["ㅋ"], +[",","<"], +[".",">"], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[" "], +[undefined], +[undefined], +[undefined], +["\n"], +["\x08"], +["`","~"], +["-","_"], +["=","+"], +["[","{"], +["]","}"], +["\\","₩"], +["ㅆ",":"], +["'",'"'], +["/","?"], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +["0"], +["1"], +["2"], +["3"], +["4"], +["5"], +["6"], +["7"], +["8"], +["9"], +["/"], +["*"], +["-"], +["+"], +["."], +["."], +["\n"], +["="], +["("], +[")"], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined], +[undefined] +], +"code":0, +"buf":[]} +let reset = () => { + states.code = 0 + states.buf = [] +} +let inRange = (s,a,b) => (a <= s && s <= b) +let isHangul = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x3131, 0x318E) +let isConsonant = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x3131, 0x314E) +let isVowel = (s) => s !== undefined && (inRange(s.charCodeAt(0), 0x314F, 0x3163) || inRange(s.charCodeAt(0), 0x318D, 0x318E)) +let isVowelSuper = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x318D, 0x318E) +let isJongseongConsonant = (s) => s !== undefined && (inRange(s.charCodeAt(0), 0x3131, 0x314E) && !([0x3138, 0x3143, 0x3149].includes(s.charCodeAt(0)))) +let isJungseongDigraph1 = (s) => s !== undefined && ([0x3157, 0x315C].includes(s.charCodeAt(0))) +let isJungseongDigraphO = (s) => s !== undefined && ([0x314F, 0x3150, 0x3163].includes(s.charCodeAt(0))) +let isJungseongDigraphU = (s) => s !== undefined && ([0x3153, 0x3154, 0x3163].includes(s.charCodeAt(0))) +let isJungseongDigraphEU = (s) => s !== undefined && ([0x3163].includes(s.charCodeAt(0))) +let isJungseongDigraphAA = (s) => s !== undefined && ([0x3163].includes(s.charCodeAt(0))) +let isJongseongDigraphG = (s) => s !== undefined && ([0x3145].includes(s.charCodeAt(0))) +let isJongseongDigraphN = (s) => s !== undefined && ([0x3148, 0x314E].includes(s.charCodeAt(0))) +let isJongseongDigraphR = (s) => s !== undefined && ([0x3131, 0x3141, 0x3142, 0x3145, 0x314C, 0x314D, 0x314E].includes(s.charCodeAt(0))) +let isJongseongDigraphB = (s) => s !== undefined && ([0x3145].includes(s.charCodeAt(0))) +let jungseongDigraphsO = {"\u314F":"\u3158", "\u3150":"\u3159", "\u3163":"\u315A"} +let jungseongDigraphsU = {"\u3153":"\u315D", "\u3154":"\u315E", "\u3163":"\u315F"} +let jungseongDigraphsEU = {"\u3163":"\u3162"} +let jungseongDigraphsAA = {"\u3163":"\u318E"} +let jongseongDigraphsG = {"\u3145":"\u3133"} +let jongseongDigraphsN = {"\u3148":"\u3135", "\u314E":"\u3136"} +let jongseongDigraphsR = {"\u3131":"\u313A", "\u3141":"\u313B", "\u3142":"\u313C", "\u3145":"\u313D", "\u314C":"\u313E", "\u314D":"\u313F", "\u314E":"\u3140"} +let jongseongDigraphsB = {"\u3145":"\u3144"} +let isThisCharJongseongDigraph = (s) => s !== undefined && ([0x3133, 0x3135, 0x3136, 0x313A, 0x313B, 0x313C, 0x313D, 0x313E, 0x313F, 0x3140, 0x3144].includes(s.charCodeAt(0))) +let isThisCharJungseongDigraph = (s) => s !== undefined && ([0x3158, 0x3159, 0x315A, 0x315D, 0x315E, 0x315F, 0x3162, 0x318E].includes(s.charCodeAt(0))) +let choseongTable = {"\u3131":0,"\u3132":1,"\u3134":2,"\u3137":3,"\u3138":4,"\u3139":5,"\u3141":6,"\u3142":7,"\u3143":8,"\u3145":9,"\u3146":10,"\u3147":11,"\u3148":12,"\u3149":13,"\u314A":14,"\u314B":15,"\u314C":16,"\u314D":17,"\u314E":18} +let jongseongTable = {"\u3131":0,"\u3132":1,"\u3133":2,"\u3134":3,"\u3135":4,"\u3136":5,"\u3137":6,"\u3139":7,"\u313A":8,"\u313B":9,"\u313C":10,"\u313D":11,"\u313E":12,"\u313F":13,"\u3140":14,"\u3141":15,"\u3142":16,"\u3144":17,"\u3145":18,"\u3146":19,"\u3147":20,"\u3148":21,"\u314A":22,"\u314B":23,"\u314C":24,"\u314D":25,"\u314E":26} +let detachJongseongDigraph = { +"\u3133":["\u3131","\u3145"], +"\u3135":["\u3134","\u3148"], +"\u3136":["\u3134","\u314E"], +"\u313A":["\u3139","\u3131"], +"\u313B":["\u3139","\u3141"], +"\u313C":["\u3139","\u3142"], +"\u313D":["\u3139","\u3145"], +"\u313E":["\u3139","\u314C"], +"\u313F":["\u3139","\u314D"], +"\u3140":["\u3139","\u314E"], +"\u3144":["\u3142","\u3145"] +} +let detachJungseongDigraph = { +"\u3158":["\u3157","\u314F"], +"\u3159":["\u3157","\u3150"], +"\u315A":["\u3157","\u314E"], +"\u315D":["\u315C","\u3153"], +"\u315E":["\u315C","\u3154"], +"\u315F":["\u315C","\u3163"], +"\u3162":["\u3161","\u3163"], +"\u318E":["\u318D","\u3163"] +} +let bufAssemble = (isPreview) => { + // nothing on the buffer + if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined) + return '' + // Hangul: I P F + else if (!isVowelSuper(states.buf[1]) && isConsonant(states.buf[0]) && isVowel(states.buf[1]) && isConsonant(states.buf[2])) { + let i = choseongTable[states.buf[0]] + let p = states.buf[1].charCodeAt(0) - 0x314F + let f = jongseongTable[states.buf[2]] + 1 + return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28) + f) + } + // Hangul: I P x + else if (!isVowelSuper(states.buf[1]) && isConsonant(states.buf[0]) && isVowel(states.buf[1]) && undefined == states.buf[2]) { + let i = choseongTable[states.buf[0]] + let p = states.buf[1].charCodeAt(0) - 0x314F + return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28)) + } + else if (isVowelSuper(states.buf[1]) && isConsonant(states.buf[0]) && isConsonant(states.buf[2])) { + let i = choseongTable[states.buf[0]] + let p = (states.buf[1].charCodeAt(0) - 0x318D) * 3 + let f = jongseongTable[states.buf[2]] + 1 + return String.fromCodePoint(0x1100 + i, 0x119E + p, 0x11A7 + f) + } + else if (isVowelSuper(states.buf[1]) && isConsonant(states.buf[0])) { + let i = choseongTable[states.buf[0]] + let p = (states.buf[1].charCodeAt(0) - 0x318D) * 3 + return String.fromCodePoint(0x1100 + i, 0x119E + p) + } + else + return states.buf.join('') +} +//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", +"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)) { + let bufIndex = (isJongseongConsonant(s) && isConsonant(states.buf[0]) && undefined !== states.buf[1]) ? 2 : + (isVowel(s) && isConsonant(states.buf[0])) ? 1 : 0 + let vowelCollision = isVowel(states.buf[1]) && isVowel(s) + let hasJongseongAlready = (states.buf[2] !== undefined) + +// console.log(`accepting hangul '${s}' at buf[${bufIndex}] (vowelCollision = ${vowelCollision})`) + + // ㅘ ㅙ ㅚ + if (!hasJongseongAlready && 1 == bufIndex && "\u3157" == states.buf[1] && isJungseongDigraphO(s)) { + states.buf[1] = jungseongDigraphsO[s] + } + // ㅝ ㅞ ㅟ + else if (!hasJongseongAlready && 1 == bufIndex && "\u315C" == states.buf[1] && isJungseongDigraphU(s)) { + states.buf[1] = jungseongDigraphsU[s] + } + // ㅢ + else if (!hasJongseongAlready && 1 == bufIndex && "\u3161" == states.buf[1] && isJungseongDigraphEU(s)) { + states.buf[1] = jungseongDigraphsEU[s] + } + // ㆎ + else if (!hasJongseongAlready && 1 == bufIndex && "\u318D" == states.buf[1] && isJungseongDigraphAA(s)) { + states.buf[1] = jungseongDigraphsAA[s] + } + // ㄳ + else if (2 == bufIndex && "\u3131" == states.buf[2] && isJongseongDigraphG(s)) { + states.buf[2] = jongseongDigraphsG[s] + } + // ㄵ ㄶ + else if (2 == bufIndex && "\u3134" == states.buf[2] && isJongseongDigraphN(s)) { + states.buf[2] = jongseongDigraphsN[s] + } + // ㄺ ㄻ ㄼ ㄽ ㄾ ㄿ ㅀ + else if (2 == bufIndex && "\u3139" == states.buf[2] && isJongseongDigraphR(s)) { + states.buf[2] = jongseongDigraphsR[s] + } + // ㅄ + else if (2 == bufIndex && "\u3142" == states.buf[2] && isJongseongDigraphB(s)) { + states.buf[2] = jongseongDigraphsB[s] + } + // key inputs that bufIndex collides (end compose and accept incoming char as a new char state) + else if (states.buf[bufIndex] !== undefined) { + let oldbufstr = bufDebugStringify(states.buf) + let sendout = '' + 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 + } + else if (vowelCollision) { + let newbuf = [states.buf[2], s] + states.buf = [states.buf[0], states.buf[1]] + sendout = bufAssemble() + states.buf = newbuf + } + else { + sendout = bufAssemble() + reset() + if (bufIndex == 2) + states.buf[0] = s + else + states.buf[bufIndex] = s + } + let newbufstr = bufDebugStringify(states.buf) +// console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`) + return [bufAssemble(1), sendout] + } + else { + states.buf[bufIndex] = s +// console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`) + } + + return [bufAssemble(1), ""] + } + 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] + } +}, +"backspace":()=>{ + // disassemble jung/jongseong digraphs +// let oldbufstr = bufDebugStringify(states.buf) + let last = states.buf.pop() + + if (last !== undefined) { + // detach jongseong + if (isThisCharJongseongDigraph(last)) + states.buf[2] = detachJongseongDigraph[last][0] + // detach jungseong + else if (isThisCharJungseongDigraph(last)) + states.buf[1] = detachJungseongDigraph[last][0] + } + + if (states.buf.length == 0) reset() + +// let newbufstr = bufDebugStringify(states.buf) +// console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`) + + return bufAssemble(1) +}, +"end":()=>{ +// console.log(`end composing`) + let ret = bufAssemble() + reset() + return ret +}, +"reset":()=>{ reset() }, +"composing":()=>(states.code!=0) +}) \ No newline at end of file diff --git a/assets/keylayout/ko_kr_3set_shin_p2.ime b/assets/keylayout/ko_kr_3set_shin_p2.ime index 241e99cb5..e890ebdde 100644 --- a/assets/keylayout/ko_kr_3set_shin_p2.ime +++ b/assets/keylayout/ko_kr_3set_shin_p2.ime @@ -347,18 +347,18 @@ let normaliseLUT = { "\u11C1":"\u314D","\u11C2":"\u314E" } let normaliseBuf = (it) => normaliseLUT[it] || it -let bufAssemble = (isPreview) => { +let bufAssemble = () => { // nothing on the buffer if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined) return '' // Hangul: I x F - else if (isPreview && states.buf[1] === undefined && isHangul(states.buf[0])) + else if (states.buf[1] === undefined && isHangul(states.buf[0])) return [states.buf[0], "\u1160", states.buf[2]].join('') // Hangul: x P F - else if (isPreview && states.buf[0] === undefined && isHangul(states.buf[1])) + else if (states.buf[0] === undefined && isHangul(states.buf[1])) return ["\u115F", states.buf[1], states.buf[2]].join('') // Hangul: x x F - else if (isPreview && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined ) + else if (isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined ) return ["\u115F", "\u1160", states.buf[2]].join('') // Hangul: I P F → Hangul Syllables (\uAC00..\uD7A3) else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) { @@ -373,14 +373,11 @@ let bufAssemble = (isPreview) => { let p = states.buf[1].charCodeAt(0) - 0x1161 return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28)) } - // Normalise unterminated hangul assembly - else if (!isPreview && !isJungseongSuper(states.buf[1])) - return states.buf.map(it => normaliseBuf(it)).join('') else return states.buf.join('') } let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') -return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates", +return Object.freeze({"n":"신세벌식 P2","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)=>{ @@ -451,25 +448,33 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald", } // key inputs that bufIndex collides (end compose and accept incoming char as a new char state) else if (states.buf[bufIndex] !== undefined) { -// let oldbufstr = bufDebugStringify(states.buf) - let sendout = bufAssemble(); reset() + reset() states.buf[bufIndex] = s // let newbufstr = bufDebugStringify(states.buf) -// console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`) - return [bufAssemble(1), sendout] +// console.log(`sending out: ${newbufstr}`) + return ["0", bufAssemble()] } else { + let bufferEmpty = (states.buf[0] === undefined) states.buf[bufIndex] = s -// console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`) + + if (bufferEmpty) { +// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`) + return ["0", bufAssemble()] + } + else { +// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`) + return ["1", bufAssemble()] + } } - return [bufAssemble(1), ""] + return ["1", bufAssemble()] } else { -// 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: ${s}`) + return ["0", s] } }, "backspace":()=>{ @@ -492,9 +497,9 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald", if (states.buf.length == 0) reset() // let newbufstr = bufDebugStringify(states.buf) -// console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`) +// console.log(`popping assembly: ${oldbufstr} -> 1,${newbufstr}`) - return bufAssemble(1) + return bufAssemble() }, "end":()=>{ // console.log(`end composing`) diff --git a/assets/keylayout/ko_kr_3set_shin_p2_sr.ime b/assets/keylayout/ko_kr_3set_shin_p2.notanime similarity index 92% rename from assets/keylayout/ko_kr_3set_shin_p2_sr.ime rename to assets/keylayout/ko_kr_3set_shin_p2.notanime index 030f8590e..241e99cb5 100644 --- a/assets/keylayout/ko_kr_3set_shin_p2_sr.ime +++ b/assets/keylayout/ko_kr_3set_shin_p2.notanime @@ -347,18 +347,18 @@ let normaliseLUT = { "\u11C1":"\u314D","\u11C2":"\u314E" } let normaliseBuf = (it) => normaliseLUT[it] || it -let bufAssemble = () => { +let bufAssemble = (isPreview) => { // nothing on the buffer if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined) return '' // Hangul: I x F - else if (states.buf[1] === undefined && isHangul(states.buf[0])) + else if (isPreview && states.buf[1] === undefined && isHangul(states.buf[0])) return [states.buf[0], "\u1160", states.buf[2]].join('') // Hangul: x P F - else if (states.buf[0] === undefined && isHangul(states.buf[1])) + else if (isPreview && states.buf[0] === undefined && isHangul(states.buf[1])) return ["\u115F", states.buf[1], states.buf[2]].join('') // Hangul: x x F - else if (isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined ) + else if (isPreview && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined ) return ["\u115F", "\u1160", states.buf[2]].join('') // Hangul: I P F → Hangul Syllables (\uAC00..\uD7A3) else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) { @@ -373,11 +373,14 @@ let bufAssemble = () => { let p = states.buf[1].charCodeAt(0) - 0x1161 return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28)) } + // Normalise unterminated hangul assembly + else if (!isPreview && !isJungseongSuper(states.buf[1])) + return states.buf.map(it => normaliseBuf(it)).join('') else return states.buf.join('') } let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ') -return Object.freeze({"n":"SR Shin P2","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite", +return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates", "t":states.keylayouts.map(it => [it[0],it[1]]), // return: [displayed output, composed output] "accept":(headkey,shiftin,altgrin)=>{ @@ -448,33 +451,25 @@ return Object.freeze({"n":"SR Shin P2","v":"one","c":"CuriousTo\uA75Bvald","m":" } // key inputs that bufIndex collides (end compose and accept incoming char as a new char state) else if (states.buf[bufIndex] !== undefined) { - reset() +// let oldbufstr = bufDebugStringify(states.buf) + let sendout = bufAssemble(); reset() states.buf[bufIndex] = s // let newbufstr = bufDebugStringify(states.buf) -// console.log(`sending out: ${newbufstr}`) - return ["0", bufAssemble()] +// console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`) + return [bufAssemble(1), sendout] } else { - let bufferEmpty = (states.buf[0] === undefined) states.buf[bufIndex] = s - - if (bufferEmpty) { -// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`) - return ["0", bufAssemble()] - } - else { -// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`) - return ["1", bufAssemble()] - } +// console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`) } - return ["1", bufAssemble()] + return [bufAssemble(1), ""] } else { - reset() - // directly print out the character without using the buffer -// console.log(`sending1 out: ${s}`) - return ["0", s] +// let oldbufstr = bufDebugStringify(states.buf) + let sendout = bufAssemble() + (s || ''); reset() +// console.log(`sending out: ${oldbufstr} -> ${sendout}`) + return [bufAssemble(1), sendout] } }, "backspace":()=>{ @@ -497,9 +492,9 @@ return Object.freeze({"n":"SR Shin P2","v":"one","c":"CuriousTo\uA75Bvald","m":" if (states.buf.length == 0) reset() // let newbufstr = bufDebugStringify(states.buf) -// console.log(`popping assembly: ${oldbufstr} -> 1,${newbufstr}`) +// console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`) - return bufAssemble() + return bufAssemble(1) }, "end":()=>{ // console.log(`end composing`)