--- a/software/eXist/webapp/mpdl/presentation/functions-mpdl.xsl	Tue Apr 19 16:51:26 2011 +0200
+++ b/software/eXist/webapp/mpdl/presentation/functions-mpdl.xsl	Tue Apr 19 16:51:59 2011 +0200
@@ -70,14 +70,14 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  <xsl:variable name="figureText" select="concat('[Figure: ', $figureNumber, ']')"/>
+  <xsl:variable name="figureText" select="concat('[Figure ', $figureNumber, ']')"/>
   <div class="{$class}" style="{$style}">
-    <xsl:if test="$figureCaption != ''"><xsl:sequence select="$figureCaption"/><br/></xsl:if>
     <xsl:sequence select="$figureContent"/>
     <br/>
     <xsl:value-of select="$figureText"/>
-    <xsl:if test="$figureDescription != ''"><xsl:value-of select="': '"/><xsl:sequence select="$figureDescription"/></xsl:if>
-    <xsl:if test="$figureVariables != ''"><xsl:value-of select="'(Variables: '"/><xsl:sequence select="$figureVariables"/><xsl:value-of select="')'"/></xsl:if>
+    <xsl:if test="$figureCaption != ''"><xsl:value-of select="': '"/><xsl:sequence select="$figureCaption"/><br/></xsl:if>
+    <xsl:if test="$figureDescription != ''"><xsl:sequence select="$figureDescription"/><br/></xsl:if>
+    <xsl:if test="$figureVariables != ''"><xsl:sequence select="$figureVariables"/></xsl:if>
   </div>
 </xsl:function>
 
@@ -89,7 +89,7 @@
     <img title="Handwritten: {$href} not scanned" alt="Handwritten: {$href} not scanned" src="images/camera.png" width="30" height="30" border="0"/>
     <br/>
     <xsl:value-of select="$handwrittenText"/>
-    <p/>
+    <br/>
   </div>
 </xsl:function>