--- a/master/struct.html	Sun Sep 16 06:26:08 2012 +1000
+++ b/master/struct.html	Sun Sep 16 06:44:13 2012 +1000
@@ -398,8 +398,8 @@
       </tr>
       <tr>
         <td><dfn id="SVGElementPreserveAspectRatioAttribute">preserveAspectRatio</dfn></td>
-        <td>[ defer ]? <a>&lt;align&gt;</a> [ meet | slice ]?</td>
-        <td>xMidYMid meet</td>
+        <td>defer? <a>&lt;align&gt;</a> [ meet | slice ]?</td>
+        <td>xMidYMid meet</td>
         <td>yes</td>
       </tr>
     </table>
@@ -1562,74 +1562,81 @@
   </table>
 </div>
 
-    <div class="adef-list">
-      <p><em>Attribute definitions:</em></p>
-      <dl>
-        <dt id="ImageElementXAttribute"><span
-        class="adef">x</span> = "<span class="attr-value"><a
-        href="types.html#DataTypeCoordinate">&lt;coordinate&gt;</a></span>"</dt>
-        <dd>The x-axis coordinate of one corner of the rectangular
-        region into which the referenced document is placed.<br />
-         If the attribute is not specified, the effect is as if a
-        value of <span class="attr-value">'0'</span> were specified.<br />
-         <span class="anim-target"><a
-        href="animate.html#Animatable">Animatable</a>:
-        yes.</span></dd>
-        <dt id="ImageElementYAttribute"><span
-        class="adef">y</span> = "<span class="attr-value"><a
-        href="types.html#DataTypeCoordinate">&lt;coordinate&gt;</a></span>"</dt>
-        <dd>The y-axis coordinate of one corner of the rectangular
-        region into which the referenced document is placed.<br />
-         If the attribute is not specified, the effect is as if a
-        value of <span class="attr-value">'0'</span> were specified.<br />
-         <span class="anim-target"><a
-        href="animate.html#Animatable">Animatable</a>:
-        yes.</span></dd>
-        <dt id="ImageElementWidthAttribute"><span
-        class="adef">width</span> = "<span class="attr-value"><a
-        href="types.html#DataTypeLength">&lt;length&gt;</a></span>"</dt>
-        <dd>The width of the rectangular region into which the
-        referenced document is placed.<br />
-         A negative value is an error (see <a
-        href="implnote.html#ErrorProcessing">Error processing</a>).
-        A value of zero disables rendering of the element.<br />
-         <span class="anim-target"><a
-        href="animate.html#Animatable">Animatable</a>:
-        yes.</span></dd>
-        <dt id="ImageElementHeightAttribute"><span
-        class="adef">height</span> = "<span class="attr-value"><a
-        href="types.html#DataTypeLength">&lt;length&gt;</a></span>"</dt>
-        <dd>The height of the rectangular region into which the
-        referenced document is placed.<br />
-         A negative value is an error (see <a
-        href="implnote.html#ErrorProcessing">Error processing</a>).
-        A value of zero disables rendering of the element.<br />
-         <span class="anim-target"><a
-        href="animate.html#Animatable">Animatable</a>:
-        yes.</span></dd>
-        <dt id="ImageElementHrefAttribute"><span
-        class="adef">xlink:href</span> = "<span
-        class="attr-value"><a
-        href="types.html#DataTypeIRI">&lt;iri&gt;</a></span>"</dt>
-        <dd>A <a href="linking.html#IRIReference">IRI
-        reference</a>.<br />
-         <span class="anim-target"><a
-        href="animate.html#Animatable">Animatable</a>:
-        yes.</span></dd>
-        <dt id="ImageElementPreserveAspectRatioAttribute">
-          <span class="adef">preserveAspectRatio</span> = "<span class='attr-value'><a href="coords.html#PreserveAspectRatioAttribute">[defer] &lt;align&gt; [&lt;meetOrSlice&gt;]</a></span>"
-        </dt>
-        <dd>
-          <p>
-            See <a>'preserveAspectRatio'</a>.
-          </p>
-          <p>
-            If attribute <a>'preserveAspectRatio'</a> is not specified, then the effect is as if a value of <span class="attr-value">xMidYMid meet</span> were specified.
-          </p>
-          <p><span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: yes.</span></p>
-        </dd>
-      </dl>
-    </div>
+<p><em>Attribute definitions:</em></p>
+
+<dl class="attrdef-list">
+  <dt>
+    <table class="propdef attrdef">
+      <tr>
+        <th>Name</th>
+        <th>Value</th>
+        <th>Lacuna value</th>
+        <th>Animatable</th>
+      </tr>
+      <tr>
+        <td><dfn id="ImageElementXAttribute">x</dfn>, <dfn id="ImageElementYAttribute">y</dfn></td>
+        <td><a>&lt;coordinate&gt;</a></td>
+        <td>0</td>
+        <td>yes</td>
+      </tr>
+      <tr>
+        <td><dfn id="ImageElementWidthAttribute">width</dfn>, <dfn id="ImageElementHeightAttribute">height</dfn></td>
+        <td><a>&lt;length&gt;</a></td>
+        <td>0</td>
+        <td>yes</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    <p>The <a>'x'</a>, <a>'y'</a>, <a>'width'</a> and <a>'height'</a>
+    attributes specify the rectangular region into which the referenced
+    image is placed.</p>
+    <p>A negative value for <a>'width'</a> or <a>'height'</a> is invalid
+    (see <a href="implnote.html#ErrorProcessing">Error processing</a>).
+    A value of zero for either attribute disables rendering of the element.</p>
+  </dd>
+  <dt>
+    <table class="propdef attrdef">
+      <tr>
+        <th>Name</th>
+        <th>Value</th>
+        <th>Lacuna value</th>
+        <th>Animatable</th>
+      </tr>
+      <tr>
+        <td><dfn id="ImageElementHrefAttribute">xlink:href</dfn></td>
+        <td><a>&lt;iri&gt;</a></td>
+        <td>(none)</td>
+        <td>yes</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    <p>An <a href="linking.html#IRIReference">IRI reference</a>
+    identifying the image to render.</p>
+  </dd>
+  <dt>
+    <table class="propdef attrdef">
+      <tr>
+        <th>Name</th>
+        <th>Value</th>
+        <th>Lacuna value</th>
+        <th>Animatable</th>
+      </tr>
+      <tr>
+        <td><dfn id="ImageElementPreserveAspectRatioAttribute">preserveAspectRatio</dfn></td>
+        <td>defer? <a>&lt;align&gt;</a> [ meet | slice ]?</td>
+        <td>xMidYMid meet</td>
+        <td>yes</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    <p>Specifies the fitting behavior when the aspect ratio of the referenced image
+    does not match the aspect ratio of the rectangle it is placed in.
+    See the definition of <a>'preserveAspectRatio'</a> for details.</p>
+  </dd>
+</dl>
 
 <p>An example:</p>