feat: add support for other html-encoded entities i've found

jherkenhoff · Oct 6, 2024 · ca21ca1 · ca21ca1
1 parent 4aa2dbd
commit ca21ca1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/src/main/java/com/jherkenhoff/qalculate/ui/calculator/mathExpressionFormatter.kt b/app/src/main/java/com/jherkenhoff/qalculate/ui/calculator/mathExpressionFormatter.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.em
 fun mathExpressionFormatter(
     text: String
 ): AnnotatedString {
-    val tokens = Regex("""<.*?>|(&nbsp;)+|([^<&]+)?""").findAll(text)
+    val tokens = Regex("""<.*?>|(&[a-z]+;)+|([^<&]+)?""").findAll(text)
 
     // TODO: Implement <small> tags. (Apparently only used for base designation? https://github.com/Qalculate/libqalculate/blob/21f28b27bf99dc6d9f3325c4960a92ec9ee8934d/libqalculate/MathStructure-print.cc#L3604 )
 
@@ -33,6 +33,9 @@ fun mathExpressionFormatter(
                 "<sub>" -> pushStyle(SpanStyle(baselineShift = BaselineShift.Subscript, fontSize = 0.7.em))
                 "</sub>" -> pop()
                 "&nbsp;" -> append("")
+                "&lt;" -> append("<")
+                "&gt;" -> append(">")
+                "&amp;" -> append("&")
                 else -> append(token.value)
             }
         }