From: Lanius Trolling <lanius@laniustrolling.dev>
Date: Fri, 1 Mar 2024 20:34:46 +0000 (-0500)
Subject: Separate inline code and block code tags
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=2eac4625202c5be2d7332e5a7ad8c82082cce4d7;p=factbooks

Separate inline code and block code tags
---

diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/parser.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/parser.kt
index 17230a0..d3379c1 100644
--- a/src/jvmMain/kotlin/info/mechyrdia/lore/parser.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/lore/parser.kt
@@ -60,13 +60,18 @@ sealed class TextParserState<TContext>(
 		appendTextRaw(newline)
 	}
 	
+	protected fun lastParagraph() {
+		if (!internalState.suppressEndParagraph)
+			appendTextRaw("</p>")
+	}
+	
 	protected fun cancelEndParagraph() {
 		internalState.suppressEndParagraph = true
 	}
 	
 	protected fun cancelStartParagraph() {
 		if (scope.write.endsWith("<p>"))
-			scope.write.deleteRange(scope.write.length - 3, scope.write.length)
+			scope.write.deleteRange(scope.write.length - "<p>".length, scope.write.length)
 	}
 	
 	class Initial<TContext>(scope: TextParserScope<TContext>) : TextParserState<TContext>(scope, listOf(), TextParserInternalState()) {
@@ -102,7 +107,7 @@ sealed class TextParserState<TContext>(
 		override fun processEndOfText() {
 			appendText(text.removeSuffix("\n"))
 			if (text.isNotBlank())
-				appendTextRaw("</p>")
+				lastParagraph()
 		}
 	}
 	
@@ -123,7 +128,7 @@ sealed class TextParserState<TContext>(
 		override fun processEndOfText() {
 			appendText(text.removeSuffix("\n"))
 			if (text.isNotBlank())
-				appendTextRaw("</p>")
+				lastParagraph()
 		}
 	}
 	
@@ -158,7 +163,7 @@ sealed class TextParserState<TContext>(
 		
 		override fun processEndOfText() {
 			appendText("[$tag")
-			appendTextRaw("</p>")
+			lastParagraph()
 		}
 	}
 	
@@ -185,7 +190,7 @@ sealed class TextParserState<TContext>(
 		
 		override fun processEndOfText() {
 			appendText("[$tag=$param")
-			appendTextRaw("</p>")
+			lastParagraph()
 		}
 	}
 	
@@ -213,7 +218,7 @@ sealed class TextParserState<TContext>(
 		
 		override fun processEndOfText() {
 			appendText("[/$tag")
-			appendTextRaw("</p>")
+			lastParagraph()
 		}
 	}
 	
diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/parser_tags.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/parser_tags.kt
index a978416..22806f0 100644
--- a/src/jvmMain/kotlin/info/mechyrdia/lore/parser_tags.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/lore/parser_tags.kt
@@ -112,8 +112,15 @@ enum class TextParserFormattingTag(val type: TextParserTagType<Unit>) {
 	CODE(
 		TextParserTagType.Direct(
 			false,
-			{ _, _ -> "<span style='font-family: JetBrains Mono'><pre>" },
-			{ _ -> "</pre></span>" },
+			{ _, _ -> "<span style='font-family: JetBrains Mono'>" },
+			{ _ -> "</span>" },
+		)
+	),
+	CODE_BLOCK(
+		TextParserTagType.Direct(
+			true,
+			{ _, _ -> "<div style='font-family: JetBrains Mono'><pre>" },
+			{ _ -> "</pre></div>" },
 		)
 	),
 	H1(