diff --git a/format-master.xml b/format-master.xml
index 94f00f8..95e6d6f 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1426,6 +1426,7 @@
 		<latex>
 			<xsl:text>\includegraphics</xsl:text>
 			<xsl:if test="count(latex-scaling) != 0">
+				<xsl:message terminate="no">&lt;latex-scaling&gt; element is deprecated in &lt;image&gt;; please use latex-options attribute instead.</xsl:message>
 				<xsl:text>[scale=</xsl:text>
 				<xsl:value-of select="latex-scaling"/>
 				<xsl:text>]</xsl:text>
@@ -1437,25 +1438,24 @@
 				<xsl:value-of select="@latex-options"/>
 				<xsl:text>]</xsl:text>
 			</xsl:if>
-			<!-- Use whatever standard image folder is appropriate for the context. -->
 			<xsl:text>{</xsl:text>
+			<!--
+				Work out the full path specification for the file
+				to be included = base-path + location + basename.
+			-->
+			<xsl:value-of select="$base-path"/>
+			<xsl:text>/</xsl:text>			
+
+			<!-- Use whatever standard image folder is appropriate for the context. -->
 			<xsl:choose>
 				<!-- Could possibly change this to test="/document/@class = 'tutorial'" or similar? -->
 				<!-- Sounds nicer...I think ideally the XSL processor would automatically figure out the path to the graphics based on the path to the source XML file.  Can this be done? -->
-				<xsl:when test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial'">
-					<xsl:text>\tutroot/</xsl:text>
-					<!-- Note: support for format-number() is poor/nonexistent in Xalan, unless you build it (and Xerces) with the ICU package.  Which you can't do using Cygwin. :^( -->
-					<!-- Xalan also seems to require numbers to be written with a decimal point, otherwise it treats them as text. -->
-					<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/>
-					<xsl:text>/Graphics</xsl:text>			
-				</xsl:when>
-				<xsl:when test="name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
-					<xsl:text>\labroot/</xsl:text>
-					<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/><xsl:text>/Graphics</xsl:text>
+				<xsl:when test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial' or name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
+					<xsl:text>Graphics</xsl:text>
 				</xsl:when>
 				<!-- Allow the author to specify a non-standard image location on the fly. -->
-				<xsl:when test="count(location) != 0">
-					<xsl:value-of select="location"/>
+				<xsl:when test="@location">
+					<xsl:value-of select="@location"/>
 				</xsl:when>
 				<!-- new style in progress... -->
 				<xsl:otherwise>
@@ -1463,16 +1463,21 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>/</xsl:text>
-			<!-- need to phase out "basename" as an element and swith to using an attribute -->
+
+			<!-- need to phase out "basename" as an element and switch to using an attribute -->
 			<xsl:if test="count(basename) != 0">
+				<xsl:message terminate="no">&lt;basename&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
 				<xsl:value-of select="basename"/>
 			</xsl:if>
 			<xsl:if test="@basename">
 				<xsl:value-of select="@basename"/>
 			</xsl:if>
 			<xsl:text>.</xsl:text>
+			
+			<!-- Figure out the image format. -->
 			<xsl:choose>
 				<xsl:when test="count(format) != 0">
+					<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
 					<xsl:value-of select="format"/>
 				</xsl:when>
 				<xsl:otherwise>
@@ -1509,6 +1514,7 @@
 					<xsl:choose>
 						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 						<xsl:when test="count(format) != 0">
+							<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
 							<xsl:value-of select="format"/>
 						</xsl:when>
 						<xsl:otherwise>
@@ -1564,6 +1570,7 @@
 						<xsl:choose>
 							<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 							<xsl:when test="count(format) != 0">
+								<xsl:message terminate="no">&lt;format&gt; element is deprecated in &lt;image&gt;; please use basename attribute instead.</xsl:message>
 								<xsl:value-of select="format"/>
 							</xsl:when>
 							<xsl:otherwise>