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

font update

Browse Source
This commit is contained in:
minjaesong
2021-11-16 17:05:45 +09:00
parent 5e8e8a64b6
commit 36b012b11f
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/fonts/terrarum-sans-bitmap/internal_variable.tga LFS Normal file
View File

Binary file not shown.

4
assets/keylayout/bg_bg_bds.ime
View File

@@ -384,7 +384,7 @@ return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC
// typing seq for diacritics: diacritics THEN a character // typing seq for diacritics: diacritics THEN a character
if (isDiacritics(s)) { if (isDiacritics(s)) {
states.code = s states.code = s
return ['0', ' '+s] // todo: insert diacritics placeholder char return ['0', '\uDBBF\uDE01'+s]
} }
else { else {
// has diacritecs // has diacritecs
@@ -395,7 +395,7 @@ return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC
} }
let composed = diacriticsMapping[states.code][s] let composed = diacriticsMapping[states.code][s]
reset() reset()
return ['2', composed || s] return ['3', composed || s]
} }
// nope! // nope!
else { else {

4
assets/keylayout/el_gr_phonetic.ime
View File

@@ -67,7 +67,7 @@ return Object.freeze({"n":"Ελ. Φωνητικό","v":"none","c":"CuriousTo\uA7
// typing seq for diacritics: diacritics THEN a character // typing seq for diacritics: diacritics THEN a character
if (isDiacritics(s)) { if (isDiacritics(s)) {
states.code = s states.code = s
return ['0', ' '+s] // todo: insert diacritics placeholder char return ['0', '\uDBBF\uDE01'+s]
} }
else { else {
// has diacritecs // 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 diacriticsLength = states.code.length // dialytika-tonos is two characters internally
let composed = diacriticsMapping[states.code][s] let composed = diacriticsMapping[states.code][s]
reset() reset()
return [''+(1+diacriticsLength), composed || s] return [''+(2+diacriticsLength), composed || s]
} }
// nope! // nope!
else { else {

4
assets/keylayout/ru_ru_jcuken.ime
View File

@@ -384,7 +384,7 @@ return Object.freeze({"n":"ЙЦУКЕН Многоязычна","v":"none","c":"
// typing seq for diacritics: diacritics THEN a character // typing seq for diacritics: diacritics THEN a character
if (isDiacritics(s)) { if (isDiacritics(s)) {
states.code = s states.code = s
return ['0', ' '+s] // todo: insert diacritics placeholder char return ['0', '\uDBBF\uDE01'+s]
} }
else { else {
// has diacritecs // has diacritecs
@@ -395,7 +395,7 @@ return Object.freeze({"n":"ЙЦУКЕН Многоязычна","v":"none","c":"
} }
let composed = diacriticsMapping[states.code][s] let composed = diacriticsMapping[states.code][s]
reset() reset()
return ['2', composed || s] return ['3', composed || s]
} }
// nope! // nope!
else { else {

BIN
lib/TerrarumSansBitmap.jar
View File

Binary file not shown.

2
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt
View File

@@ -352,7 +352,7 @@ private class UIItemInputKeycap(
else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1] else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1]
else keysym0[0]) ?: keysymLow else keysym0[0]) ?: keysymLow
if (isDiacritic(keysym[0].code)) if (isDiacritic(keysym[0].code))
keysym = "ɔ$keysym" keysym = "\uDBBF\uDE01$keysym"
if (keysym[0].code == 0xA0) if (keysym[0].code == 0xA0)
batch.draw(labels.get(22, 2), (posX + (width - 20) / 2).toFloat(), posY + 4f) batch.draw(labels.get(22, 2), (posX + (width - 20) / 2).toFloat(), posY + 4f)