mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-09 18:14:06 +09:00
korean 2-set ime reimplemented using the string rewriting system
This commit is contained in:
@@ -396,6 +396,7 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7
|
|||||||
else if (states.buf[bufIndex] !== undefined) {
|
else if (states.buf[bufIndex] !== undefined) {
|
||||||
let oldbufstr = bufDebugStringify(states.buf)
|
let oldbufstr = bufDebugStringify(states.buf)
|
||||||
let sendout = ''
|
let sendout = ''
|
||||||
|
// e.g. 닳 -> 달해
|
||||||
if (vowelCollision && isThisCharJongseongDigraph(states.buf[2])) {
|
if (vowelCollision && isThisCharJongseongDigraph(states.buf[2])) {
|
||||||
let digraphs = detachJongseongDigraph[states.buf[2]]
|
let digraphs = detachJongseongDigraph[states.buf[2]]
|
||||||
let newbuf = [digraphs[1], s]
|
let newbuf = [digraphs[1], s]
|
||||||
@@ -403,24 +404,34 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7
|
|||||||
sendout = bufAssemble()
|
sendout = bufAssemble()
|
||||||
states.buf = newbuf
|
states.buf = newbuf
|
||||||
|
|
||||||
return ["0", bufAssemble()]
|
// 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]
|
let newbuf = [states.buf[2], s]
|
||||||
states.buf = [states.buf[0], states.buf[1]]
|
states.buf = [states.buf[0], states.buf[1]]
|
||||||
sendout = bufAssemble()
|
sendout = bufAssemble()
|
||||||
states.buf = newbuf
|
states.buf = newbuf
|
||||||
|
|
||||||
return ["0", bufAssemble()]
|
// 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 {
|
else {
|
||||||
sendout = bufAssemble()
|
|
||||||
reset()
|
reset()
|
||||||
if (bufIndex == 2)
|
if (bufIndex == 2)
|
||||||
states.buf[0] = s
|
states.buf[0] = s
|
||||||
else
|
else
|
||||||
states.buf[bufIndex] = s
|
states.buf[bufIndex] = s
|
||||||
|
|
||||||
|
// console.log(`rearr3: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
|
||||||
return ["0", bufAssemble()]
|
return ["0", bufAssemble()]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -428,20 +439,33 @@ return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA7
|
|||||||
let bufferEmpty = (states.buf[0] === undefined)
|
let bufferEmpty = (states.buf[0] === undefined)
|
||||||
states.buf[bufIndex] = s
|
states.buf[bufIndex] = s
|
||||||
|
|
||||||
if (bufferEmpty) {
|
// e.g. 2nd ㅏ as in 가ㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏㅏ
|
||||||
// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
|
// 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()]
|
return ["0", bufAssemble()]
|
||||||
}
|
}
|
||||||
|
// e.g. ㅜ ㄹ ㅐ ㄱ ㅜ ㅏ ㄴ as in 물과␣백두산
|
||||||
else {
|
else {
|
||||||
// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
|
// console.log(`assem2: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
|
||||||
return ["1", bufAssemble()]
|
return ["1", bufAssemble()]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// console.log(`assem-digraph: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
|
||||||
|
return ["1", bufAssemble()]
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
reset()
|
reset()
|
||||||
// directly print out the character without using the buffer
|
// directly print out the character without using the buffer
|
||||||
// console.log(`sending1 out: ${s}`)
|
// console.log(`sending1 out: 0,${s}`)
|
||||||
return ["0", s]
|
return ["0", s]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -468,6 +468,7 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald",
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// console.log(`assem-digraph: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
|
||||||
return ["1", bufAssemble()]
|
return ["1", bufAssemble()]
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
|
|||||||
import com.badlogic.gdx.graphics.glutils.FrameBuffer
|
import com.badlogic.gdx.graphics.glutils.FrameBuffer
|
||||||
import com.jme3.math.FastMath
|
import com.jme3.math.FastMath
|
||||||
import net.torvald.terrarum.*
|
import net.torvald.terrarum.*
|
||||||
|
import net.torvald.terrarum.App.printdbg
|
||||||
import net.torvald.terrarum.gamecontroller.*
|
import net.torvald.terrarum.gamecontroller.*
|
||||||
import net.torvald.terrarum.utils.Clipboard
|
import net.torvald.terrarum.utils.Clipboard
|
||||||
import net.torvald.terrarumsansbitmap.gdx.CodepointSequence
|
import net.torvald.terrarumsansbitmap.gdx.CodepointSequence
|
||||||
@@ -182,7 +183,7 @@ class UIItemTextLineInput(
|
|||||||
while (cursorX > 0) {
|
while (cursorX > 0) {
|
||||||
cursorX -= 1
|
cursorX -= 1
|
||||||
val charDeleted = textbuf.removeAt(cursorX)
|
val charDeleted = textbuf.removeAt(cursorX)
|
||||||
// printdbg(this, "$dbgprn)charDeleted=${charDeleted.toCharInfo()}")
|
printdbg(this, "$dbgprn)charDeleted=${charDeleted.toCharInfo()}")
|
||||||
|
|
||||||
if (charDeleted !in 0x1160..0x11FF) break
|
if (charDeleted !in 0x1160..0x11FF) break
|
||||||
}
|
}
|
||||||
@@ -382,8 +383,8 @@ class UIItemTextLineInput(
|
|||||||
|
|
||||||
private fun endComposing() {
|
private fun endComposing() {
|
||||||
getIME()?.let {
|
getIME()?.let {
|
||||||
|
val s = it.endCompose()
|
||||||
if (it.config.mode != TerrarumIMEMode.REWRITE) {
|
if (it.config.mode != TerrarumIMEMode.REWRITE) {
|
||||||
val s = it.endCompose()
|
|
||||||
paste(s.toCodePoints())
|
paste(s.toCodePoints())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user