curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 04:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

rewriting rewrite wip

Browse Source
This commit is contained in:
minjaesong
2021-11-12 23:31:11 +09:00
parent 3c321b466e
commit 36d72ffa6f
4 changed files with 545 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
assets/keylayout/ko_kr_3set_shin_p2.ime
View File

@@ -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`)