--- a/master/script.html	Tue Sep 24 11:02:20 2013 +1000
+++ b/master/script.html	Tue Sep 24 11:35:07 2013 +1000
@@ -236,16 +236,31 @@
 to determine whether it can have a <a>graphical event attribute</a>
 specified on it.)</p>
 
-<div class="adef-list">
-  <p><em>Attribute definitions:</em></p>
-  <dl>
-    <dt id="OnLoadEventAttribute"><span class="adef">onload</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dd>Specifies some script to execute when "bubbling" or "at target"
+<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="OnLoadEventAttribute">onload</dfn></td>
+        <td><a>&lt;anything&gt;</a></td>
+        <td>(none)</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    Specifies some script to execute when "bubbling" or "at target"
     phase listeners for the SVGLoad event are fired on the element
-    the attribute is specified on.<br/>
-    <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span></dd>
-  </dl>
-</div>
+    the attribute is specified on.
+  </dd>
+</dl>
 
 <h3 id="GraphicsEvents">Event attributes on graphics and container elements</h3>
 
@@ -258,28 +273,45 @@
 <p>Note that <a>'g/onload'</a>, defined above, is also classified as a
 <a>graphical event attribute</a>.</p>
 
-<div class="adef-list">
-  <p><em>Attribute definitions:</em></p>
-  <dl>
-    <dt id="OnFocusInEventAttribute"><span class="adef">onfocusin</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnFocusOutEventAttribute"><span class="adef">onfocusout</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnActivateEventAttribute"><span class="adef">onactivate</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnClickEventAttribute"><span class="adef">onclick</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnKeyDownEventAttribute"><span class="adef">onkeydown</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnKeyPressEventAttribute"><span class="adef">onkeypress</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnKeyUpEventAttribute"><span class="adef">onkeyup</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnMouseDownEventAttribute"><span class="adef">onmousedown</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnMouseUpEventAttribute"><span class="adef">onmouseup</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnMouseOverEventAttribute"><span class="adef">onmouseover</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnMouseMoveEventAttribute"><span class="adef">onmousemove</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnMouseOutEventAttribute"><span class="adef">onmouseout</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dd>Specifies some script to execute when "bubbling" or "at target"
+<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="OnFocusInEventAttribute">onfocusin</dfn>,
+          <dfn id="OnFocusOutEventAttribute">onfocusout</dfn>,
+          <dfn id="OnActivateEventAttribute">onactivate</dfn>,
+          <dfn id="OnClickEventAttribute">onclick</dfn>,
+          <dfn id="OnKeyDownEventAttribute">onkeydown</dfn>,
+          <dfn id="OnKeyPressEventAttribute">onkeypress</dfn>,
+          <dfn id="OnKeyUpEventAttribute">onkeyup</dfn>,
+          <dfn id="OnMouseDownEventAttribute">onmousedown</dfn>,
+          <dfn id="OnMouseUpEventAttribute">onmouseup</dfn>,
+          <dfn id="OnMouseOverEventAttribute">onmouseover</dfn>,
+          <dfn id="OnMouseMoveEventAttribute">onmousemove</dfn>,
+          <dfn id="OnMouseOutEventAttribute">onmouseout</dfn>
+        </td>
+        <td><a>&lt;anything&gt;</a></td>
+        <td>(none)</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    Specifies some script to execute when "bubbling" or "at target"
     phase listeners for the corresponding event are fired on the element
     the attribute is specified on.  See the <a href='interact.html#SVGEvents'>Complete list of support events</a>
-    to determine which event each of these event attributes corresponds to.<br/>
-    <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span></dd>
-  </dl>
-</div>
+    to determine which event each of these event attributes corresponds to.
+  </dd>
+</dl>
 
 <h3 id="DocumentEvents">Document-level event attributes</h3>
 
@@ -300,22 +332,39 @@
 that load external resources.  This is related to issue
 <a href="http://www.w3.org/Graphics/SVG/WG/track/issues/2254">2254</a>.</p>
 
-<div class="adef-list">
-  <p><em>Attribute definitions:</em></p>
-  <dl>
-    <dt id="OnUnloadEventAttribute"><span class="adef">onunload</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnAbortEventAttribute"><span class="adef">onabort</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnErrorEventAttribute"><span class="adef">onerror</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnResizeEventAttribute"><span class="adef">onresize</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnScrollEventAttribute"><span class="adef">onscroll</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnZoomEventAttribute"><span class="adef">onzoom</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dd>Specifies some script to execute when "bubbling" or "at target"
+<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="OnUnloadEventAttribute">onunload</dfn>,
+          <dfn id="OnAbortEventAttribute">onabort</dfn>,
+          <dfn id="OnErrorEventAttribute">onerror</dfn>,
+          <dfn id="OnResizeEventAttribute">onresize</dfn>,
+          <dfn id="OnScrollEventAttribute">onscroll</dfn>,
+          <dfn id="OnZoomEventAttribute">onzoom</dfn>
+        </td>
+        <td><a>&lt;anything&gt;</a></td>
+        <td>(none)</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    Specifies some script to execute when "bubbling" or "at target"
     phase listeners for the corresponding event are fired on the element
     the attribute is specified on.  See the <a href='interact.html#SVGEvents'>Complete list of support events</a>
-    to determine which event each of these event attributes corresponds to.<br/>
-    <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span></dd>
-  </dl>
-</div>
+    to determine which event each of these event attributes corresponds to.
+  </dd>
+</dl>
 
 <h3 id="AnimationEvents">Animation event attributes</h3>
 
@@ -325,19 +374,36 @@
 <p>Note that <a>'g/onload'</a>, defined above, is also classified as an
 <a>animation event attribute</a>.</p>
 
-<div class="adef-list">
-  <p><em>Attribute definitions:</em></p>
-  <dl>
-    <dt id="OnBeginEventAttribute"><span class="adef">onbegin</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnEndEventAttribute"><span class="adef">onend</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dt id="OnRepeatEventAttribute"><span class="adef">onrepeat</span> = "<span class="attr-value"><a href='types.html#DataTypeAnything'>&lt;anything&gt;</a></span>"</dt>
-    <dd>Specifies some script to execute when "bubbling" or "at target"
+<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="OnBeginEventAttribute">onbegin</dfn>,
+          <dfn id="OnEndEventAttribute">onend</dfn>,
+          <dfn id="OnRepeatEventAttribute">onrepeat</dfn>
+        </td>
+        <td><a>&lt;anything&gt;</a></td>
+        <td>(none)</td>
+        <td>no</td>
+      </tr>
+    </table>
+  </dt>
+  <dd>
+    Specifies some script to execute when "bubbling" or "at target"
     phase listeners for the corresponding event are fired on the element
     the attribute is specified on.  See the <a href='interact.html#SVGEvents'>Complete list of support events</a>
-    to determine which event each of these event attributes corresponds to.<br/>
-    <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span></dd>
-  </dl>
-</div>
+    to determine which event each of these event attributes corresponds to.
+  </dd>
+</dl>
 
 <h2 id="DOMInterfaces">DOM interfaces</h2>