diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/internal_variable.tga b/assets/graphics/fonts/terrarum-sans-bitmap/internal_variable.tga new file mode 100644 index 000000000..efd2c7d40 --- /dev/null +++ b/assets/graphics/fonts/terrarum-sans-bitmap/internal_variable.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc2bcedf43567eed501b46aa2500bb090b65fef91a9d7e0a43b070ded260251f +size 327698 diff --git a/assets/keylayout/bg_bg_bds.ime b/assets/keylayout/bg_bg_bds.ime index 8256828c4..b8b686b08 100644 --- a/assets/keylayout/bg_bg_bds.ime +++ b/assets/keylayout/bg_bg_bds.ime @@ -384,7 +384,7 @@ return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC // typing seq for diacritics: diacritics THEN a character if (isDiacritics(s)) { states.code = s - return ['0', ' '+s] // todo: insert diacritics placeholder char + return ['0', '\uDBBF\uDE01'+s] } else { // has diacritecs @@ -395,7 +395,7 @@ return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC } let composed = diacriticsMapping[states.code][s] reset() - return ['2', composed || s] + return ['3', composed || s] } // nope! else { diff --git a/assets/keylayout/el_gr_phonetic.ime b/assets/keylayout/el_gr_phonetic.ime index 7cea89442..e1d234f43 100644 --- a/assets/keylayout/el_gr_phonetic.ime +++ b/assets/keylayout/el_gr_phonetic.ime @@ -67,7 +67,7 @@ return Object.freeze({"n":"Ελ. Φωνητικό","v":"none","c":"CuriousTo\uA7 // typing seq for diacritics: diacritics THEN a character if (isDiacritics(s)) { states.code = s - return ['0', ' '+s] // todo: insert diacritics placeholder char + return ['0', '\uDBBF\uDE01'+s] } else { // has diacritecs @@ -79,7 +79,7 @@ return Object.freeze({"n":"Ελ. Φωνητικό","v":"none","c":"CuriousTo\uA7 let diacriticsLength = states.code.length // dialytika-tonos is two characters internally let composed = diacriticsMapping[states.code][s] reset() - return [''+(1+diacriticsLength), composed || s] + return [''+(2+diacriticsLength), composed || s] } // nope! else { diff --git a/assets/keylayout/ru_ru_jcuken.ime b/assets/keylayout/ru_ru_jcuken.ime index 832af16a5..0dd94c397 100644 --- a/assets/keylayout/ru_ru_jcuken.ime +++ b/assets/keylayout/ru_ru_jcuken.ime @@ -384,7 +384,7 @@ return Object.freeze({"n":"ЙЦУКЕН Многоязычна","v":"none","c":" // typing seq for diacritics: diacritics THEN a character if (isDiacritics(s)) { states.code = s - return ['0', ' '+s] // todo: insert diacritics placeholder char + return ['0', '\uDBBF\uDE01'+s] } else { // has diacritecs @@ -395,7 +395,7 @@ return Object.freeze({"n":"ЙЦУКЕН Многоязычна","v":"none","c":" } let composed = diacriticsMapping[states.code][s] reset() - return ['2', composed || s] + return ['3', composed || s] } // nope! else { diff --git a/lib/TerrarumSansBitmap.jar b/lib/TerrarumSansBitmap.jar index de2259586..3f7f26c3c 100644 Binary files a/lib/TerrarumSansBitmap.jar and b/lib/TerrarumSansBitmap.jar differ diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt index 9d34f9e8d..71de5f14b 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt @@ -352,7 +352,7 @@ private class UIItemInputKeycap( else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1] else keysym0[0]) ?: keysymLow if (isDiacritic(keysym[0].code)) - keysym = "ɔ$keysym" + keysym = "\uDBBF\uDE01$keysym" if (keysym[0].code == 0xA0) batch.draw(labels.get(22, 2), (posX + (width - 20) / 2).toFloat(), posY + 4f)