This commit is contained in:
2 files changed
+27
-7
No files matched your search
@@ -68,6 +68,9 @@ object MarkdownInlineStyler {
|
|||||||
val src = text
|
val src = text
|
||||||
|
|
||||||
while (i < src.length) {
|
while (i < src.length) {
|
||||||
|
// Cheap prefix gate: URL_PATTERN only matches at "http(s)://", so skip the regex elsewhere.
|
||||||
|
val urlMatch =
|
||||||
|
if (src.startsWith("http", i, ignoreCase = true)) URL_PATTERN.matchAt(src, i) else null
|
||||||
when {
|
when {
|
||||||
// Inline code is opaque to emphasis parsing, and delimiters must match by run length.
|
// Inline code is opaque to emphasis parsing, and delimiters must match by run length.
|
||||||
src[i] == '`' -> {
|
src[i] == '`' -> {
|
||||||
@@ -312,9 +315,8 @@ object MarkdownInlineStyler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// bare URL
|
// bare URL
|
||||||
URL_PATTERN.matchAt(src, i) != null -> {
|
urlMatch != null -> {
|
||||||
val match = URL_PATTERN.matchAt(src, i)!!
|
val url = urlMatch.value
|
||||||
val url = match.value
|
|
||||||
val urlToAppend = if (isRtl) BidiUtils.wrapLtrIsolate(url) else url
|
val urlToAppend = if (isRtl) BidiUtils.wrapLtrIsolate(url) else url
|
||||||
pushLink(LinkAnnotation.Url(url))
|
pushLink(LinkAnnotation.Url(url))
|
||||||
withStyle(
|
withStyle(
|
||||||
@@ -326,7 +328,7 @@ object MarkdownInlineStyler {
|
|||||||
append(urlToAppend)
|
append(urlToAppend)
|
||||||
}
|
}
|
||||||
pop()
|
pop()
|
||||||
i = match.range.last + 1
|
i = urlMatch.range.last + 1
|
||||||
}
|
}
|
||||||
|
|
||||||
// Plain text / words in RTL
|
// Plain text / words in RTL
|
||||||
|
|||||||
@@ -66,24 +66,41 @@ fun MarkdownInlineText(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val config =
|
val config =
|
||||||
|
remember(style.fontSize, textColor) {
|
||||||
LatexConfig(
|
LatexConfig(
|
||||||
fontSize = style.fontSize,
|
fontSize = style.fontSize,
|
||||||
theme = LatexTheme.light(color = textColor, backgroundColor = Color.Transparent),
|
theme = LatexTheme.light(color = textColor, backgroundColor = Color.Transparent),
|
||||||
accessibilityEnabled = true,
|
accessibilityEnabled = true,
|
||||||
)
|
)
|
||||||
val inlineContent = mutableMapOf<String, InlineTextContent>()
|
}
|
||||||
|
val inlineContent =
|
||||||
|
remember(segments, latexMeasurer, config) {
|
||||||
|
val map = mutableMapOf<String, InlineTextContent>()
|
||||||
segments.forEachIndexed { index, segment ->
|
segments.forEachIndexed { index, segment ->
|
||||||
if (segment is InlineMathSegment.Math) {
|
if (segment is InlineMathSegment.Math) {
|
||||||
latexMeasurer.inlineContent(segment.latex, config)?.let { inlineContent["latex-$index"] = it }
|
latexMeasurer.inlineContent(segment.latex, config)?.let { map["latex-$index"] = it }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
map
|
||||||
|
}
|
||||||
val annotated =
|
val annotated =
|
||||||
|
remember(
|
||||||
|
segments,
|
||||||
|
inlineContent,
|
||||||
|
textColor,
|
||||||
|
searchQuery,
|
||||||
|
isCurrentMatch,
|
||||||
|
linkColor,
|
||||||
|
highlights,
|
||||||
|
isRtl,
|
||||||
|
) {
|
||||||
buildAnnotatedString {
|
buildAnnotatedString {
|
||||||
segments.forEachIndexed { index, segment ->
|
segments.forEachIndexed { index, segment ->
|
||||||
when (segment) {
|
when (segment) {
|
||||||
is InlineMathSegment.Math -> {
|
is InlineMathSegment.Math -> {
|
||||||
val id = "latex-$index"
|
val id = "latex-$index"
|
||||||
if (id in inlineContent) appendInlineContent(id, segment.latex) else append(segment.latex)
|
val measured = id in inlineContent
|
||||||
|
if (measured) appendInlineContent(id, segment.latex) else append(segment.latex)
|
||||||
}
|
}
|
||||||
|
|
||||||
is InlineMathSegment.Text -> {
|
is InlineMathSegment.Text -> {
|
||||||
@@ -102,6 +119,7 @@ fun MarkdownInlineText(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Text(
|
Text(
|
||||||
text = annotated,
|
text = annotated,
|
||||||
inlineContent = inlineContent,
|
inlineContent = inlineContent,
|
||||||
|
|||||||
Reference in new issue
Block a user