Merge pull request #373 from fmasa/style-fix

Core Rulebook: Fix minor import issues
fmasa · Nov 18, 2024 · c7e85c3 · c7e85c3
2 parents c9ed187 + 551584d
commit c7e85c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...tlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/CoreRulebook.kt b/...tlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/CoreRulebook.kt
@@ -379,15 +379,15 @@ object CoreRulebook :
     }
 
     override fun resolveToken(textToken: TextToken): Token? {
-        if (textToken.fontName == "CaslonAntique" && textToken.fontSizePt == 15f) {
+        if (textToken.fontName.endsWith("CaslonAntique") && textToken.fontSizePt == 15f) {
             return Token.BoxHeader(textToken.text)
         }
 
-        if (textToken.fontName == "CaslonAntique" && textToken.fontSizePt == 10f) {
+        if (textToken.fontName.endsWith("CaslonAntique") && textToken.fontSizePt == 10f) {
             return Token.BoxContent(textToken.text)
         }
 
-        if (textToken.fontName == "CaslonAntique,Bold") {
+        if (textToken.fontName.endsWith("CaslonAntique,Bold")) {
             if (textToken.fontSizePt == 19f) {
                 return Token.Heading1(textToken.text)
             }
@@ -401,7 +401,7 @@ object CoreRulebook :
             return Token.CrossIcon
         }
 
-        if (textToken.fontName == "CaslonAntique-Bold-SC700") {
+        if (textToken.fontName.endsWith("CaslonAntique-Bold-SC700")) {
             if (textToken.fontSizePt == 12f || textToken.fontSizePt == 18f) {
                 return Token.Heading2(textToken.text)
             }
@@ -413,16 +413,16 @@ object CoreRulebook :
             return Token.Heading3(textToken.text)
         }
 
-        if (textToken.fontName.endsWith("HPBTHP+ACaslonPro-Regular") && textToken.text.startsWith("•")) {
+        if (textToken.text.startsWith("•")) {
             return Token.BulletPoint
         }
 
         if (textToken.fontSizePt == 9.0f) {
-            if (textToken.fontName == "ACaslonPro-Bold") {
+            if (textToken.fontName.endsWith("ACaslonPro-Bold")) {
                 return Token.BoldPart(textToken.text)
             }
 
-            if (textToken.fontName == "ACaslonPro-Regular") {
+            if (textToken.fontName.endsWith("ACaslonPro-Regular")) {
                 if (heightEquals(textToken.height, 6.39f)) {
                     return Token.ItalicsPart(textToken.text)
                 }

diff --git a/...cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/MarkdownBuilder.kt b/...cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/MarkdownBuilder.kt
@@ -4,7 +4,7 @@ import arrow.core.NonEmptyList
 import arrow.core.nonEmptyListOf
 
 object MarkdownBuilder {
-    private const val BULLET_POINT_PLACEHOLDER = "<bullet-point>"
+    private const val BULLET_POINT_PLACEHOLDER = "•"
 
     fun buildMarkdown(tokens: List<Token.ParagraphToken>): String {
         val flattened = mutableListOf<NonEmptyList<Token.ParagraphToken>>()

diff --git a/...lin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/TextCleaner.kt b/...lin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/TextCleaner.kt
@@ -7,4 +7,5 @@ object TextCleaner {
             .replace("( ", "(")
             .replace(" )", ")")
             .replace(" ,", ",")
+            .replace("\t", " ")
 }