diff --git a/lib/TerrarumSansBitmap.jar b/lib/TerrarumSansBitmap.jar index 02edf016e..9e5e5c5c5 100644 --- a/lib/TerrarumSansBitmap.jar +++ b/lib/TerrarumSansBitmap.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dee0b198de1726805b290cbb6d547ec56e731e7e03c7867fdc479da398a1fe62 -size 200228 +oid sha256:f021badb1c8363bc9232d2e6653cf3013368066db6981e5b5204b863d2c33581 +size 201979 diff --git a/src/net/torvald/btex/BTeXParser.kt b/src/net/torvald/btex/BTeXParser.kt index c05fb6c52..bbaa84c19 100644 --- a/src/net/torvald/btex/BTeXParser.kt +++ b/src/net/torvald/btex/BTeXParser.kt @@ -1408,6 +1408,8 @@ object BTeXParser { ): List { val strat = when (align) { "left" -> TypesettingStrategy.RAGGED_RIGHT + "right" -> TypesettingStrategy.RAGGED_LEFT + "center", "centre" -> TypesettingStrategy.CENTRED "justify" -> TypesettingStrategy.JUSTIFIED else -> throw IllegalArgumentException("Unknown text alignment") } @@ -1429,7 +1431,7 @@ object BTeXParser { val subset = linesOut to remainder val posYline = doc.linesPrintedOnPage[pageNum] - println("typeset par slugHeight=$slugHeight, remainder=$remainder, linesOut=$linesOut") +// println("typeset par slugHeight=$slugHeight, remainder=$remainder, linesOut=$linesOut") val textDrawCalls = textToDrawCall(handler, posYline, slugs, subset.first, subset.second) val objectDrawCalls = parseAndGetObjDrawCalls(textDrawCalls[0], font, handler, posYline, slugs, subset.first, subset.second) diff --git a/src/net/torvald/terrarum/tests/BTeXTest.kt b/src/net/torvald/terrarum/tests/BTeXTest.kt index 7309134b4..4382a941a 100644 --- a/src/net/torvald/terrarum/tests/BTeXTest.kt +++ b/src/net/torvald/terrarum/tests/BTeXTest.kt @@ -24,8 +24,8 @@ import kotlin.system.measureTimeMillis */ class BTeXTest : ApplicationAdapter() { - val filePath = "btex.xml" -// val filePath = "test.xml" +// val filePath = "btex.xml" + val filePath = "test.xml" // val filePath = "literature/en/daniel_defoe_robinson_crusoe.xml" // val filePath = "literature/ruRU/anton_chekhov_palata_no_6.xml" // val filePath = "literature/koKR/yisang_nalgae.xml"