diff --git a/assets/keylayout/ko_kr_2set_ksx5002.ime b/assets/keylayout/ko_kr_2set_ksx5002.ime index 58a13145f..4f30193d7 100644 --- a/assets/keylayout/ko_kr_2set_ksx5002.ime +++ b/assets/keylayout/ko_kr_2set_ksx5002.ime @@ -36,7 +36,7 @@ let states = {"keylayouts":[[""],[undefined], ["\u3157"], ["\u3151"], ["\u3153"], -["\u314F"], +["\u314F","\u318D"], ["\u3163"], ["\u3161"], ["\u315C"], @@ -261,14 +261,16 @@ let reset = () => { states.buf = [] } let inRange = (s,a,b) => (a <= s && s <= b) -let isHangul = (s) => (s === undefined) ? false : inRange(s.charCodeAt(0), 0x3131, 0x3163) +let isHangul = (s) => (s === undefined) ? false : inRange(s.charCodeAt(0), 0x3131, 0x318E) let isConsonant = (s) => (s === undefined) ? false : inRange(s.charCodeAt(0), 0x3131, 0x314E) -let isVowel = (s) => (s === undefined) ? false : inRange(s.charCodeAt(0), 0x314F, 0x3163) +let isVowel = (s) => (s === undefined) ? false : (inRange(s.charCodeAt(0), 0x314F, 0x3163) || inRange(s.charCodeAt(0), 0x318D, 0x318E)) +let isVowelSuper = (s) => (s === undefined) ? false : inRange(s.charCodeAt(0), 0x318D, 0x318E) let isJongseongConsonant = (s) => (s === undefined) ? false : (inRange(s.charCodeAt(0), 0x3131, 0x314E) && !([0x3138, 0x3143, 0x3149].includes(s.charCodeAt(0)))) let isJungseongDigraph1 = (s) => (s === undefined) ? false : ([0x3157, 0x315C].includes(s.charCodeAt(0))) let isJungseongDigraphO = (s) => (s === undefined) ? false : ([0x314F, 0x3150, 0x3163].includes(s.charCodeAt(0))) let isJungseongDigraphU = (s) => (s === undefined) ? false : ([0x3153, 0x3154, 0x3163].includes(s.charCodeAt(0))) let isJungseongDigraphEU = (s) => (s === undefined) ? false : ([0x3163].includes(s.charCodeAt(0))) +let isJungseongDigraphAA = (s) => (s === undefined) ? false : ([0x3163].includes(s.charCodeAt(0))) let isJongseongDigraphG = (s) => (s === undefined) ? false : ([0x3145].includes(s.charCodeAt(0))) let isJongseongDigraphN = (s) => (s === undefined) ? false : ([0x3148, 0x314E].includes(s.charCodeAt(0))) let isJongseongDigraphR = (s) => (s === undefined) ? false : ([0x3131, 0x3141, 0x3142, 0x3145, 0x314C, 0x314D, 0x314E].includes(s.charCodeAt(0))) @@ -276,12 +278,13 @@ let isJongseongDigraphB = (s) => (s === undefined) ? false : ([0x3145].includes( 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) ? false : ([0x3133, 0x3135, 0x3136, 0x313A, 0x313B, 0x313C, 0x313D, 0x313E, 0x313F, 0x3140, 0x3144].includes(s.charCodeAt(0))) -let isThisCharJungseongDigraph = (s) => (s === undefined) ? false : ([0x3158, 0x3159, 0x315A, 0x315D, 0x315E, 0x315F, 0x3162].includes(s.charCodeAt(0))) +let isThisCharJungseongDigraph = (s) => (s === undefined) ? false : ([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 = { @@ -304,25 +307,37 @@ let detachJungseongDigraph = { "\u315D":["\u315C","\u3153"], "\u315E":["\u315C","\u3154"], "\u315F":["\u315C","\u3163"], -"\u3162":["\u3161","\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 (isConsonant(states.buf[0]) && isVowel(states.buf[1]) && isConsonant(states.buf[2])) { + 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 (isConsonant(states.buf[0]) && isVowel(states.buf[1]) && undefined == states.buf[2]) { + 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('') } @@ -365,6 +380,10 @@ return Object.freeze({"n":"두벌식 표준","states":states,"c":"CuriousTo\uA75 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]