diff --git a/.gitignore b/.gitignore index a1b30b5..760aaa2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ demo/lib/* demo/assets/* out/* lib/* -Terrarum-sans-bitmap*.zip \ No newline at end of file +Terrarum-sans-bitmap*.zip +TerrarumSansBitmap*.jar +Font*.jar diff --git a/FontTestGDX/lib/TerrarumSansBitmap.jar b/FontTestGDX/lib/TerrarumSansBitmap.jar index 2821b34..51beba5 100644 Binary files a/FontTestGDX/lib/TerrarumSansBitmap.jar and b/FontTestGDX/lib/TerrarumSansBitmap.jar differ diff --git a/FontTestGDX/src/FontTestGDX.kt b/FontTestGDX/src/FontTestGDX.kt index 9f42b36..692e05f 100644 --- a/FontTestGDX/src/FontTestGDX.kt +++ b/FontTestGDX/src/FontTestGDX.kt @@ -23,10 +23,10 @@ class FontTestGDX : Game() { lateinit var camera: OrthographicCamera override fun create() { - font = GameFontBase("./assets", flipY = false, errorOnUnknownChar = true) // must test for two flipY cases + font = GameFontBase("./assets", flipY = false, errorOnUnknownChar = false) // must test for two flipY cases - val inTextFile = Gdx.files.internal("./FontTestGDX/demotext.txt") - val reader = inTextFile.reader() + val inTextFile = Gdx.files.internal("./demotext.txt") + val reader = inTextFile.reader("UTF-8") inputText = reader.readLines() reader.close() diff --git a/demo.PNG b/demo.PNG index 62e411a..76ff774 100644 Binary files a/demo.PNG and b/demo.PNG differ diff --git a/FontTestGDX/demotext.txt b/demotext.txt similarity index 98% rename from FontTestGDX/demotext.txt rename to demotext.txt index c79305d..ab43f38 100644 --- a/FontTestGDX/demotext.txt +++ b/demotext.txt @@ -33,13 +33,13 @@ How multilingual? Real multilingual! 􏻬Příliš žluťoučký kůň úpěl ďábelské ódy􀀀 􏻬Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon􀀀 􏻬PACK MY BOX WITH FIVE DOZEN LIQUOR JUGS􀀀 + 􏻬hƿæt ƿe ᵹardena inᵹear ꝺaᵹum þeoꝺ cynninᵹa þꞃym ᵹeꝼꞃumon􀀀 􏻬Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich GROẞEN GROẞE􀀀 􏻬ζαφείρι δέξου πάγκαλο, βαθων ψυχης το σημα􀀀 􏻬ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ􀀀 􏻬სწრაფი ყავისფერი მელა გადაახტა ზარმაც ძაღლს ᲘᲜᲢᲔᲚ ᲞᲔᲜᲢᲘᲣᲛᲘ ᲛᲘᲙᲠᲝᲞᲠᲝᲪᲔᲡᲝᲠᲘ􀀀 􏻬ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम अयोध्या के महाराज दशरथ के􀀀 􏻬Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa􀀀 - 􏻬Ꝺꝼuaꞅcail Íoꞅa Úꞃṁac na hÓiᵹe Beannaiꞇe póꞃ Éaḃa aᵹus Áꝺaiṁ􀀀 􏻬Ċuaiġ bé ṁórṡáċ le dlúṫspád fíorḟinn trí hata mo ḋea-ṗorcáin ḃig􀀀 􏻬あめつちほしそら やまかはみねたに くもきりむろこけ ひといぬうへすゑ ゆわさるおふせよ えの𛀁をなれゐて􀀀 􏻬トリナクコヱス ユメサマセ ミヨアケワタル ヒンカシヲ ソライロハエテ オキツヘニ ホフネムレヰヌ モヤノウチ􀀀 diff --git a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt index 5bdb181..70dd094 100644 --- a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt +++ b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt @@ -939,6 +939,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo // manually add width of one orphan insular letter // WARNING: glyphs in 0xA770..0xA778 has invalid data, further care is required glyphProps[0x1D79] = GlyphProps(9, 0) + + + glyphProps[0xFFFD] = nullProp } private val glyphLayout = GlyphLayout()