diff --git a/format-master.xml b/format-master.xml
index e1a9733..5e659d9 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1210,13 +1210,15 @@
 		</latex>
 		<html>
 			<DIV CLASS="figure">
-				<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
-				<xsl:if test="count(id) != 0"><A NAME="{id}"></A></xsl:if>
-				<xsl:apply-templates select="*[not(self::caption)]"/>
-				<xsl:if test="count(caption) != 0">
-					<BR/>
-					<xsl:apply-templates select="caption"/>
-				</xsl:if>
+				<CENTER>
+					<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
+					<xsl:if test="count(id) != 0"><A NAME="{id}"></A></xsl:if>
+					<xsl:apply-templates select="*[not(self::caption)]"/>
+					<xsl:if test="count(caption) != 0">
+						<BR/>
+						<xsl:apply-templates select="caption"/>
+					</xsl:if>
+				</CENTER>
 			</DIV>
 		</html>
 	</template>
@@ -1234,12 +1236,14 @@
 		</latex>
 		<html>
 			<DIV CLASS="table">
-				<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
-				<xsl:apply-templates select="*[not(self::caption)]"/>
-				<xsl:if test="count(caption) != 0">
-					<BR/>
-					<xsl:apply-templates select="caption"/>
-				</xsl:if>
+				<CENTER>
+					<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
+					<xsl:apply-templates select="*[not(self::caption)]"/>
+					<xsl:if test="count(caption) != 0">
+						<BR/>
+						<xsl:apply-templates select="caption"/>
+					</xsl:if>
+				</CENTER>
 			</DIV>
 		</html>
 	</template>
@@ -1531,11 +1535,11 @@
 	
 	
 	<!-- Sometimes we might need to embed raw code to handle something tricky. -->
-	<template name="raw-latex" match="raw-code[@format = 'latex']">
+	<template name="raw-latex" match="raw-code[@format = 'latex']|raw-latex">
 		<latex><xsl:apply-templates/></latex>
 	</template>
 		
-	<template name="raw-html" match="raw-code[@format = 'html']">
+	<template name="raw-html" match="raw-code[@format = 'html']|raw-html">
 		<html><xsl:copy-of select="*"/></html>
 	</template>
 		
