From 72efdf6d42a71a9ac02d1cc2ec4bc21f190447ca Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 15 May 2016 23:19:57 +0200
Subject: Implement support for inline math expressions

---
 utility/formatter.xsl | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'utility')

diff --git a/utility/formatter.xsl b/utility/formatter.xsl
index 21cdff4..7b9292c 100644
--- a/utility/formatter.xsl
+++ b/utility/formatter.xsl
@@ -30,9 +30,7 @@
 		</xsl:call-template>
 	</xsl:variable>
 
-	<p class="math">
-		<xsl:copy-of select="xalan:nodeset($formatted_expression)/node()"/>
-	</p>
+	<xsl:copy-of select="xalan:nodeset($formatted_expression)/*"/>
 </xsl:template>
 
 <xsl:template name="code_highlighter">
@@ -89,9 +87,22 @@
 </xsl:template>
 
 <xsl:template match="script" mode="embellish">
-	<xsl:call-template name="math_highlighter">
-		<xsl:with-param name="source" select="text()"/>
-	</xsl:call-template>
+	<xsl:choose>
+		<xsl:when test="contains(@type, 'mode=display')">
+			<p class="math">
+				<xsl:call-template name="math_highlighter">
+					<xsl:with-param name="source" select="text()"/>
+				</xsl:call-template>
+			</p>
+		</xsl:when>
+		<xsl:otherwise>
+			<span class="math">
+				<xsl:call-template name="math_highlighter">
+					<xsl:with-param name="source" select="text()"/>
+				</xsl:call-template>
+			</span>
+		</xsl:otherwise>
+	</xsl:choose>
 </xsl:template>
 
 <xsl:template name="formatter">
-- 
cgit v1.2.3