--- a/master/animate.html	Fri Dec 06 15:03:57 2013 -0600
+++ b/master/animate.html	Sun Dec 08 21:13:54 2013 +0100
@@ -360,7 +360,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="HrefAttribute">xlink:href</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="HrefAttribute">xlink:href</dfn></td>
         <td><a>&lt;iri&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
@@ -419,7 +419,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AttributeNameAttribute">attributeName</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="AttributeNameAttribute">attributeName</dfn></td>
         <td><a>&lt;XML-Name&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
@@ -450,7 +450,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AttributeTypeAttribute">attributeType</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="AttributeTypeAttribute">attributeType</dfn></td>
         <td>CSS | XML | auto</td>
         <td>auto</td>
         <td>no</td>
@@ -661,7 +661,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="BeginAttribute">begin</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="BeginAttribute">begin</dfn></td>
         <td><a href="#BeginValueListSyntax">begin-value-list</a></td>
         <td>0s</td>
         <td>no</td>
@@ -784,7 +784,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="DurAttribute">dur</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="DurAttribute">dur</dfn></td>
         <td><a href="#ClockValueSyntax">Clock-value</a> | "media" | "indefinite"</td>
         <td>indefinite</td>
         <td>no</td>
@@ -831,7 +831,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="EndAttribute">end</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="EndAttribute">end</dfn></td>
         <td><a href="#EndValueListSyntax">end-value-list</a></td>
         <td>(none)</td>
         <td>no</td>
@@ -886,13 +886,13 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="MinAttribute">min</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="MinAttribute">min</dfn></td>
         <td><a href="#ClockValueSyntax">Clock-value</a> | "media"</td>
         <td>0s</td>
         <td>no</td>
       </tr>
       <tr>
-        <td><dfn id="MaxAttribute">max</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="MaxAttribute">max</dfn></td>
         <td><a href="#ClockValueSyntax">Clock-value</a> | "media"</td>
         <td>(none)</td>
         <td>no</td>
@@ -934,7 +934,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RestartAttribute">restart</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="RestartAttribute">restart</dfn></td>
         <td>always | whenNotActive | never</td>
         <td>always</td>
         <td>no</td>
@@ -975,7 +975,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RepeatCountAttribute">repeatCount</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="RepeatCountAttribute">repeatCount</dfn></td>
         <td><a>&lt;number&gt;</a> | indefinite</td>
         <td>(none)</td>
         <td>no</td>
@@ -1014,7 +1014,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RepeatDurAttribute">repeatDur</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="RepeatDurAttribute">repeatDur</dfn></td>
         <td><a href="#ClockValueSyntax">Clock-value</a> | "indefinite"</td>
         <td>(none)</td>
         <td>no</td>
@@ -1050,7 +1050,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="FillAttribute">fill</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="FillAttribute">fill</dfn></td>
         <td>freeze | remove</td>
         <td>remove</td>
         <td>no</td>
@@ -1234,7 +1234,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="ValuesAttribute">values</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="ValuesAttribute">values</dfn></td>
         <td>&lt;list&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1264,7 +1264,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="KeyTimesAttribute">keyTimes</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="KeyTimesAttribute">keyTimes</dfn></td>
         <td>&lt;list&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1342,7 +1342,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="KeySplinesAttribute">keySplines</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="KeySplinesAttribute">keySplines</dfn></td>
         <td>&lt;list&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1393,7 +1393,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="FromAttribute">from</dfn>,
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="FromAttribute">from</dfn>,
             <dfn id="ToAttribute">to</dfn>,
             <dfn id="ByAttribute">by</dfn></td>
         <td>&lt;value&gt;</td>
@@ -1628,7 +1628,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AdditiveAttribute">additive</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="AdditiveAttribute">additive</dfn></td>
         <td>replace | sum</td>
         <td>replace</td>
         <td>no</td>
@@ -1668,7 +1668,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AccumulateAttribute">accumulate</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="AccumulateAttribute">accumulate</dfn></td>
         <td>none | sum</td>
         <td>none</td>
         <td>no</td>
@@ -1788,7 +1788,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="SetElementToAttribute">to</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="set" id="SetElementToAttribute">to</dfn></td>
         <td>&lt;value&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1837,7 +1837,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AnimateMotionElementCalcModeAttribute">calcMode</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animateMotion" id="AnimateMotionElementCalcModeAttribute">calcMode</dfn></td>
         <td>discrete | linear | paced | spline</td>
         <td>paced</td>
         <td>no</td>
@@ -1862,7 +1862,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AnimateMotionElementPathAttribute">path</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animateMotion" id="AnimateMotionElementPathAttribute">path</dfn></td>
         <td>&lt;path-data&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1888,7 +1888,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="KeyPointsAttribute">keyPoints</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="KeyPointsAttribute">keyPoints</dfn></td>
         <td>&lt;list-of-numbers&gt;</td>
         <td>(none)</td>
         <td>no</td>
@@ -1925,7 +1925,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RotateAttribute">rotate</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="RotateAttribute">rotate</dfn></td>
         <td><a>&lt;number&gt;</a> | auto | auto-reverse</td>
         <td>0</td>
         <td>no</td>
@@ -1965,7 +1965,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="OriginAttribute">origin</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animate" id="OriginAttribute">origin</dfn></td>
         <td>default</td>
         <td>default</td>
         <td>no</td>
@@ -1995,7 +1995,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="MPathElementHrefAttribute">xlink:href</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="mpath" id="MPathElementHrefAttribute">xlink:href</dfn></td>
         <td><a>&lt;iri&gt;</a></td>
         <td>(none)</td>
         <td>no</td>
@@ -2271,7 +2271,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="AnimateTransformElementTypeAttribute">type</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="animateTransform" id="AnimateTransformElementTypeAttribute">type</dfn></td>
         <td>translate | scale | rotate | skewX | skewY</td>
         <td>translate</td>
         <td>no</td>

--- a/master/interact.html	Fri Dec 06 15:03:57 2013 -0600
+++ b/master/interact.html	Sun Dec 08 21:13:54 2013 +0100
@@ -1031,7 +1031,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="CursorElementXAttribute">x</dfn>, <dfn id="CursorElementYAttribute">y</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="cursor" id="CursorElementXAttribute">x</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="cursor" id="CursorElementYAttribute">y</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>

--- a/master/shapes.html	Fri Dec 06 15:03:57 2013 -0600
+++ b/master/shapes.html	Sun Dec 08 21:13:54 2013 +0100
@@ -118,7 +118,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RectElementXAttribute">x</dfn>, <dfn id="RectElementYAttribute">y</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="rect" id="RectElementXAttribute">x</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="rect" id="RectElementYAttribute">y</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
@@ -138,7 +138,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="RectElementWidthAttribute">width</dfn>, <dfn id="RectElementHeightAttribute">height</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="rect" id="RectElementWidthAttribute">width</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="rect" id="RectElementHeightAttribute">height</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>

--- a/master/struct.html	Fri Dec 06 15:03:57 2013 -0600
+++ b/master/struct.html	Sun Dec 08 21:13:54 2013 +0100
@@ -345,7 +345,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="SVGElementXAttribute">x</dfn>, <dfn id="SVGElementYAttribute">y</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="svg" id="SVGElementXAttribute">x</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="svg" id="SVGElementYAttribute">y</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
@@ -367,7 +367,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="SVGElementWidthAttribute">width</dfn>, <dfn id="SVGElementHeightAttribute">height</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="svg" id="SVGElementWidthAttribute">width</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="svg" id="SVGElementHeightAttribute">height</dfn></td>
         <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
         <td>100%</td>
         <td>yes</td>
@@ -1374,13 +1374,13 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="UseElementXAttribute">x</dfn>, <dfn id="UseElementYAttribute">y</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="use" id="UseElementXAttribute">x</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="use" id="UseElementYAttribute">y</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
       </tr>
       <tr>
-        <td><dfn id="UseElementWidthAttribute">width</dfn>, <dfn id="UseElementHeightAttribute">height</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="use" id="UseElementWidthAttribute">width</dfn>, <dfn id="UseElementHeightAttribute">height</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>(see prose)</td>
         <td>yes</td>
@@ -1595,13 +1595,13 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="ImageElementXAttribute">x</dfn>, <dfn id="ImageElementYAttribute">y</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementXAttribute">x</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementYAttribute">y</dfn></td>
         <td><a>&lt;length&gt;</a></td>
         <td>0</td>
         <td>yes</td>
       </tr>
       <tr>
-        <td><dfn id="ImageElementWidthAttribute">width</dfn>, <dfn id="ImageElementHeightAttribute">height</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementWidthAttribute">width</dfn>, <dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementHeightAttribute">height</dfn></td>
         <td><a>&lt;length&gt;</a> | auto</td>
         <td>0</td>
         <td>yes</td>
@@ -1640,7 +1640,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="ImageElementHrefAttribute">xlink:href</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementHrefAttribute">xlink:href</dfn></td>
         <td><a>&lt;iri&gt;</a></td>
         <td>(none)</td>
         <td>yes</td>
@@ -1660,7 +1660,7 @@
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="ImageElementPreserveAspectRatioAttribute">preserveAspectRatio</dfn></td>
+        <td><dfn data-dfn-type="element-attr" data-dfn-for="image" id="ImageElementPreserveAspectRatioAttribute">preserveAspectRatio</dfn></td>
         <td>defer? <a>&lt;align&gt;</a> [ meet | slice ]?</td>
         <td>xMidYMid meet</td>
         <td>yes</td>