Handle the case where graphics in inlineequations are inline

diff --git a/xsl/fo/graphics.xsl b/xsl/fo/graphics.xsl
index 336951432b639b3618ae81455835751d50faf560..1de94707896fea7be9b6cb24a0af8e87a7e94e5d 100644 (file)
--- a/xsl/fo/graphics.xsl
+++ b/xsl/fo/graphics.xsl
@@ -193,9 +193,16 @@ FIXME: make is.graphic.* work correctly depending on the backend!
 <!-- ==================================================================== -->
 
 <xsl:template match="graphic">
-  <fo:block>
-    <xsl:call-template name="process.image"/>
-  </fo:block>
+  <xsl:choose>
+    <xsl:when test="../inlineequation">
+      <xsl:call-template name="process.image"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:block>
+        <xsl:call-template name="process.image"/>
+      </fo:block>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="inlinegraphic">

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 87c4c4d9352ff8c26cfdfb52d4559f4115f7b425..96e1d2089a7fee270449977e235a672001977008 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -249,10 +249,18 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="graphic">
-  <p>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="process.image"/>
-  </p>
+  <xsl:choose>
+    <xsl:when test="../inlineequation">
+      <xsl:call-template name="anchor"/>
+      <xsl:call-template name="process.image"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <p>
+        <xsl:call-template name="anchor"/>
+        <xsl:call-template name="process.image"/>
+      </p>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="inlinegraphic">