Merge rendering chapter changes
authorNikos Andronikos <nikos.andronikos@cisra.canon.com.au>
Fri, 07 Sep 2012 16:16:40 +1000
changeset 399 4e8546324940
parent 398 1cb5605d8dec (current diff)
parent 365 dd51ba05bd19 (diff)
child 400 78f52c402bad
Merge rendering chapter changes
master/escript.html
master/idl2java.xsl
master/java.html
master/render.html
master/svg.idl
--- a/Makefile	Fri Sep 07 15:54:44 2012 +1000
+++ b/Makefile	Fri Sep 07 16:16:40 2012 +1000
@@ -7,10 +7,6 @@
 
 all :
 	[ -f /usr/bin/cygpath.exe ] || $(MAKE) -C master/images/implnote/arcs/
-	@../svg2-tools/build.py -n
-
-old :
-	[ -f /usr/bin/cygpath.exe ] || $(MAKE) -C master/images/implnote/arcs/
 	@../svg2-tools/build.py
 
 pdf : all
--- a/master/access.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/access.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,7 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
-  <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
   <!-- W3C style sheet will be added here during processing. -->
 </head>
--- a/master/animate.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/animate.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,7 +6,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
-  <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
   <!-- W3C style sheet will be added here during processing. -->
 </head>
@@ -14,46 +13,50 @@
 
 <h1>Animation</h1>
 
-<div class="annotation">
- <p>
-   SVG 2 Requirements:
- </p>
- <ul>
-   <li>Support for non-negative speed on time containers</li>
-   <li>Support path-based animations of pairs of attributes</li>
-   <li>Define all explicitly undefined parts of the SVG 1.1 spec (wrt to to-animations)</li>
-   <li>Support motion animation of a specified speed</li>
-   <li>Apply the changes from SVG Tiny 1.2 Animations chapter</li>
- </ul>
- <p>
-   Resolution: Will be addressed in separate <a href="https://dvcs.w3.org/hg/FXTF/raw-file/tip/web-anim/index.html">Web Animations specification</a>.
- </p>
- <ul>
-   <li>
-    <a href="http://www.w3.org/2012/01/10-svg-irc#T05-49-00">SVG F2F Day 1</a>
-   </li>
-   <li>
-    <a href="http://www.w3.org/2011/12/08-svg-irc#T20-53-32">2011-12-08 Telcon</a>
-   </li>
-   <li>
-    <a href="http://www.w3.org/2012/01/10-svg-irc#T05-09-32">SVG F2F Day 1</a>
-   </li>
-   <li>
-    <a href="http://www.w3.org/2012/01/13-svg-irc#T23-16-28">SVG F2F Day 4</a>
-   </li>
-   <li>
-    <a href="http://www.w3.org/2012/03/08-svg-irc#T21-18-10">2012-03-08 Telcon</a>
-   </li>
- </ul>
- <p>
-   Purpose: Improve animation features of SVG 2.
- </p>
- <p>
-   Owner: Brian Birtles
- </p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirements:</th>
+      <td>
+        <ul>
+          <li>Support for non-negative speed on time containers</li>
+          <li>Support path-based animations of pairs of attributes</li>
+          <li>Define all explicitly undefined parts of the SVG 1.1 spec (wrt to to-animations)</li>
+          <li>Support motion animation of a specified speed</li>
+          <li>Apply the changes from SVG Tiny 1.2 Animations chapter</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <th>Resolutions:</th>
+      <td>
+        <ul>
+          <li><a href="http://www.w3.org/2012/01/10-svg-irc#T05-49-00">We will solve animation reversing in SVG 2.</a></li>
+          <li><a href="http://www.w3.org/2012/01/10-svg-irc#T05-49-00">We will have support for non-negative speed="" on time containers (if we decide to include time containers) in SVG 2.</a></li>
+          <li><a href="http://www.w3.org/2011/12/08-svg-irc#T20-53-32">We will support path-based animation of pairs of attributes.</a></li>
+          <li><a href="http://www.w3.org/2012/01/10-svg-irc#T05-09-32">We will allow <code>&lt;animateTransform type="matrix"&gt;</code> in SVG 2.</a></li>
+          <li><a href="http://www.w3.org/2012/01/13-svg-irc#T23-16-28">We will support motion animation of a specified speed in SVG 2.</a></li>
+          <li><a href="http://www.w3.org/2012/03/08-svg-irc#T21-18-10">SVG 2 will apply the changes from SVG 1.2 Tiny to the SVG animation section.</a></li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>General improvements to the animation features of SVG 2.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Brian (no action)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>These will be addressed in the separate <a href="https://dvcs.w3.org/hg/FXTF/raw-file/tip/web-anim/index.html">Web Animations specification</a>,
+      which SVG 2 will eventually reference.</td>
+    </tr>
+  </table>
 </div>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="Introduction">Introduction</h2>
 
 <p>Because the Web is a dynamic medium, SVG supports the
@@ -62,7 +65,7 @@
 
 <ul>
   <li>Using <a href="http://www.w3.org/TR/2012/WD-css3-animations-20120403/"><cite>CSS Animations</cite></a>
-  [<a href="refs.html#ref-CSS3Animations">CSSANIMATIONS</a>]. A CSS
+  [<a href="refs.html#ref-CSS3ANIMATIONS">CSSANIMATIONS</a>]. A CSS
   module that describes a way for authors to animate the values of
   CSS properties over time, using keyframes. The behavior of these
   keyframe animations can be controlled by specifying their duration,
@@ -78,11 +81,8 @@
   effects, and objects that grow, shrink, spin or change color.</li>
 
   <li>Using the <a href="svgdom.html">SVG DOM</a>. The SVG DOM
-  conforms to key aspects of the <a href="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/"><cite>Document Object Model (DOM)
-  Level 1</cite></a> [<a href="refs.html#ref-DOM1">DOM1</a>] and
-  <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/"><cite>Document Object Model (DOM) Level 2</cite></a>
-  [<a href="refs.html#ref-DOM2">DOM2</a>]
-  specifications. Every attribute and style sheet setting is
+  is defined based on the DOM4 specification [<a href="refs.html#ref-DOM4">DOM4</a>].
+  Every attribute and style sheet setting is
   accessible to scripting, and SVG offers a set of additional
   DOM interfaces to support efficient animation via scripting.
   As a result, virtually any kind of animation can be achieved.
@@ -135,7 +135,7 @@
 <p>SVG supports the following four animation elements which are
 defined in the SMIL Animation specification:</p>
 
-    <table class='vert offset' summary="animation elements from SMIL Animation">
+    <table class='vert offset'>
       <tr>
         <td><a>'animate'</a></td>
         <td>allows scalar attributes and properties to be assigned
@@ -165,7 +165,7 @@
 <p id="SVGExtensionsToSMILAnimation">Additionally, SVG includes the following compatible
 extensions to SMIL Animation:</p>
 
-<table class='vert offset' summary="extensions to SMIL Animation">
+<table class='vert offset'>
   <tr>
     <td><a>'animateTransform'</a></td>
     <td>modifies one of SVG's transformation attributes over
@@ -201,6 +201,9 @@
   </tr>
 </table>
 
+<p class="issue">The description of <a>'animateTransform'</a> above should
+reference the <a>'transform'</a> property.</p>
+
 <p>For compatibility with other aspects of the language, SVG
 uses <a>IRI references</a> via an <a>'set/xlink:href'</a> attribute to
 identify the elements which are to be targets of the animations,
@@ -303,28 +306,28 @@
   supported multiple images.
   -->
 <div class="figure">
-<table summary="Example anim01">
-  <caption align="bottom">
+<table >
+  <caption>
     Example anim01
   </caption>
   <tr>
-    <td width="256"><img width="256" height="91"
+    <td><img width="256" height="91"
     alt="Example anim01 - at zero seconds"
     src="images/animate/anim01a.png" /> <span
     class="table-heading-1">At zero seconds</span></td>
-    <td width="20">&nbsp;</td>
-    <td width="256"><img width="256" height="91"
+    <td>&nbsp;</td>
+    <td><img width="256" height="91"
     alt="Example anim01 - at three seconds"
     src="images/animate/anim01b.png" /> <span
     class="table-heading-1">At three seconds</span></td>
   </tr>
   <tr>
-    <td width="256"><img width="256" height="91"
+    <td><img width="256" height="91"
     alt="Example anim01 - at six seconds"
     src="images/animate/anim01c.png" /> <span
     class="table-heading-1">At six seconds</span></td>
-    <td width="20">&nbsp;</td>
-    <td width="256"><img width="256" height="91"
+    <td>&nbsp;</td>
+    <td><img width="256" height="91"
     alt="Example anim01 - at nine seconds"
     src="images/animate/anim01d.png" /> <span
     class="table-heading-1">At nine seconds</span></td>
@@ -783,7 +786,7 @@
           </dl>
           <p>A value of <span class="attr-value">'indefinite'</span>
           specifies that the end of the animation will be
-          determined by an <a>ElementTimeControl::endElement</a> method call (the animation
+          determined by an <a>SVGAnimationElement::endElement</a> method call (the animation
           DOM methods are described in <a href="#DOMInterfaces">DOM
           interfaces</a>).</p>
           <p>Except for any SVG-specific rules explicitly mentioned
@@ -1283,27 +1286,27 @@
       href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#TimingAndRealWorldClockTime">
       Timing and real-world clock times</a>.</p>
       <div class="example">
-      <table summary="examples of keySplines" style="border-collapse:separate; border-spacing: 20px;">
-        <caption align="bottom">
+      <table  style="border-collapse:separate; border-spacing: 20px;">
+        <caption>
           Examples of <span class="attr-name">keySplines</span>
         </caption>
         <tr>
-          <td width="250"><img class="bordered" width="250" height="250"
+          <td><img class="bordered" width="250" height="250"
           alt="Example keySplines01 - keySplines of 0 0 1 1 (the default)"
            src="images/animate/keySplines01.svg" /> <span
           class="table-heading-1">keySplines="0&nbsp;0&nbsp;1&nbsp;1"
           (the default)</span></td>
-          <td width="250"><img class="bordered" width="250" height="250"
+          <td><img class="bordered" width="250" height="250"
           alt="Example keySplines01 - keySplines of .5 0 .5 1"
           src="images/animate/keySplines02.svg" /> <span
           class="table-heading-1">keySplines=".5&nbsp;0&nbsp;.5&nbsp;1"</span></td>
         </tr>
         <tr>
-          <td width="250"><img class="bordered" width="250" height="250"
+          <td><img class="bordered" width="250" height="250"
           alt="Example keySplines01 - keySplines of 0 .75 .25 1"
           src="images/animate/keySplines03.svg" /> <span
           class="table-heading-1">keySplines="0&nbsp;.75&nbsp;.25&nbsp;1"</span></td>
-          <td width="250"><img class="bordered" width="250" height="250"
+          <td><img class="bordered" width="250" height="250"
           alt="Example keySplines01 - keySplines of 1 0 .25 .25"
           src="images/animate/keySplines04.svg" /><span
           class="table-heading-1">keySplines="1&nbsp;0&nbsp;.25&nbsp;.25"</span></td>
@@ -1731,7 +1734,7 @@
     by the offset of the motion path relative to the origin of the
     current user coordinate system. The supplemental transformation is
     applied on top of any transformations due to the target element's
-    <a>'transform'</a> attribute or any animations on that attribute due
+    <a>'transform'</a> property or any animations on that attribute due
     to <a>'animateTransform'</a> elements on the target element.</p>
 
     <p>The <a>'additive'</a> and <a>'accumulate'</a> attributes apply
@@ -1740,7 +1743,7 @@
     be additive with respect to each other; however, the transformations
     which result from the <a>'animateMotion'</a> elements are always
     supplemental to any transformations due to the target element's
-    <a>'transform'</a> attribute or any <a>'animateTransform'</a>
+    <a>'transform'</a> property or any <a>'animateTransform'</a>
     elements.</p>
 
     <p>The default calculation mode (<a>'calcMode'</a>) for
@@ -1795,8 +1798,7 @@
     transformation matrices that are computed during a motion path
     animation.</p>
 
-    <a id="ExampleAnimMotion01" name="ExampleAnimMotion01"></a> 
-    <p><span class="example-ref">Example animMotion01</span> shows
+    <p id="ExampleAnimMotion01"><span class="example-ref">Example animMotion01</span> shows
     a triangle moving along a motion path.</p>
 <pre><![CDATA[
 <?xml version="1.0" standalone="no"?>
@@ -1825,24 +1827,22 @@
   </path>
 </svg>
 ]]></pre>
-    <table summary="Example animMotion01">
-      <caption align="bottom">
+    <table >
+      <caption>
         Example animMotion01
       </caption>
       <tr>
-        <td width="144"><img width="144" height="91"
+        <td><img width="144" height="91"
         alt="Example animMotion01 - at zero seconds"
-        src="images/animate/animMotion01a.png" /> <span
+        src="images/animate/animMotion01a.png" /><br/><span
         class="table-heading-1">At zero seconds</span></td>
-        <td width="20">&nbsp;</td>
-        <td width="144"><img width="144" height="91"
+        <td><img width="144" height="91"
         alt="Example animMotion01 - at three seconds"
-        src="images/animate/animMotion01b.png" /> <span
+        src="images/animate/animMotion01b.png" /> <br/><span
         class="table-heading-1">At three seconds</span></td>
-        <td width="20">&nbsp;</td>
-        <td width="144"><img width="144" height="91"
+        <td><img width="144" height="91"
         alt="Example animMotion01 - at six seconds"
-        src="images/animate/animMotion01c.png" /> <span
+        src="images/animate/animMotion01c.png" /> <br/><span
         class="table-heading-1">At six seconds</span></td>
       </tr>
     </table>
@@ -1941,6 +1941,8 @@
 on a target element, thereby allowing animations to control translation,
 scaling, rotation and/or skewing.</p>
 
+<p class="issue">This section should talk about the <a>'transform'</a> property.</p>
+
 <edit:elementsummary name='animateTransform'/>
 
 <div class="adef-list">
@@ -2417,25 +2419,23 @@
 ]]></pre>
 
 <div class="figure">
-<table summary="Example dom01">
-  <caption align="bottom">
+<table >
+  <caption>
     Example dom01
   </caption>
   <tr>
-    <td width="151"><img width="151" height="76"
+    <td><img width="151" height="76"
     alt="Example dom01 - at zero seconds"
-    src="images/animate/dom01a.png" /> <span
-    class="table-heading-1">At zero seconds</span></td>
-    <td width="20">&nbsp;</td>
-    <td width="151"><img width="151" height="76"
+    src="images/animate/dom01a.png" /> <br/>
+    At zero seconds</td>
+    <td><img width="151" height="76"
     alt="Example dom01 - at three seconds"
-    src="images/animate/dom01b.png" /> <span
-    class="table-heading-1">At 2.5 seconds</span></td>
-    <td width="20">&nbsp;</td>
-    <td width="151"><img width="151" height="76"
+    src="images/animate/dom01b.png" /> <br/>
+    At 2.5 seconds</td>
+    <td><img width="151" height="76"
     alt="Example dom01 - at six seconds"
-    src="images/animate/dom01c.png" /> <span
-    class="table-heading-1">At five seconds</span></td>
+    src="images/animate/dom01c.png" /> <br/>
+    At five seconds</td>
   </tr>
 </table>
 </div>
@@ -2497,157 +2497,9 @@
 <h2 id="DOMInterfaces">DOM interfaces</h2>
 
 <p>Below are the DOM interfaces for the elements defined in this chapter.
-In addition, <a>ElementTimeControl</a> and <a>TimeEvent</a>, which are
+In addition, <a>TimeEvent</a>, which is
 from <a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/">SMIL Animation</a>,
-are included here for easy reference.</p>
-
-<h3 id="InterfaceElementTimeControl">Interface ElementTimeControl</h3>
-
-<p>SMIL Animation supports several methods for controlling the behavior of
-animation: <code>beginElement()</code>, <code>beginElementAt()</code>,
-<code>endElement()</code> and <code>endElementAt()</code>. These methods
-are used to begin and end the active duration of an element. Authors can
-(but are not required to) declare the timing to respond to the DOM using
-the following syntax:
-</p>
-
-<pre>&lt;animate begin="indefinite" end="indefinite" .../&gt;</pre>
-
-<p>If a DOM method call is made to begin or end the element (using
-<code>beginElement()</code>, <code>beginElementAt()</code>,
-<code>endElement()</code> or <code>endElementAt()</code>), each method call
-creates a single instance time (in the appropriate instance times list).
-These times are then interpreted as part of the semantics of lists of
-times, as described in
-<a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-EvaluationOfBeginEndTimeLists">Evaluation of begin and end time lists</a>.
-</p>
-
-
-<ul>
-
-<li>The instance time associated with a <code>beginElement()</code> or
-<code>endElement()</code> call is the current presentation time at the
-time of the DOM method call.
-</li>
-
-
-<li>The instance time associated with a <code>beginElementAt()</code> or
-<code>endElementAt()</code> call is the current presentation time at the
-time of the DOM method call, plus or minus the specified offset.
-</li>
-
-
-<li>Note that <code>beginElement()</code> is subject to the <a>'animate/restart'</a>
-attribute in the same manner that event-based begin timing is.  Refer
-also to <a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Restart">SMIL Animation: Restarting animation</a>
-([<a href="refs.html#ref-SMILANIM">SMILANIM</a>], section 3.3.7).
-</li>
-
-</ul>
-
-
-<p>The expectation of the following interface is that an instance of the
-<a>ElementTimeControl</a> interface can be obtained by using binding-specific
-casting methods on an instance of an animation element.  A DOM application
-can use the <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-5CED94D7">hasFeature</a>
-method of the <a>DOMImplementation</a> interface to determine whether the
-<a>ElementTimeControl</a> interface is supported or not.  The feature string
-for this interface is "TimeControl".
-</p>
-<pre class="idl">interface <b>ElementTimeControl</b> {
-  void <a href="animate.html#__smil__ElementTimeControl__beginElement">beginElement</a>();
-  void <a href="animate.html#__smil__ElementTimeControl__beginElementAt">beginElementAt</a>(in float offset);
-  void <a href="animate.html#__smil__ElementTimeControl__endElement">endElement</a>();
-  void <a href="animate.html#__smil__ElementTimeControl__endElementAt">endElementAt</a>(in float offset);
-};</pre><dl class="interface">
-<dt class="operations-header">Operations:</dt>
-<dd>
-<dl class="attributes">
-
-<dt id="__smil__ElementTimeControl__beginElement" class="operation first-child">void <b>beginElement</b>()
-</dt>
-<dd class="operation">
-<div>
-Creates a begin instance time for the current time. The new instance
-time is added to the <a
-   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>begin instance times list</em></a>.
-The behavior of this method is equivalent to <code>beginElementAt(0)</code>.
-
-</div>
-</dd>
-
-<dt id="__smil__ElementTimeControl__beginElementAt" class="operation">void <b>beginElementAt</b>(in float <var>offset</var>)
-</dt>
-<dd class="operation">
-<div>
-Creates a begin instance time for the current time plus the specified
-offset. The new instance time is added to the
-<a
-   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>begin instance times list</em></a>.
-
-
-</div>
-<dl class="operation">
-<dt class="parameters-header">Parameters</dt>
-<dd>
-<ol class="parameters">
-<li class="parameter first-child">
-<div>float <var>offset</var></div> 
-<div> The offset from the current document time, in seconds, at
-which to begin the element.
-
-</div>
-</li>
-</ol>
-</dd>
-</dl>
-</dd>
-
-<dt id="__smil__ElementTimeControl__endElement" class="operation">void <b>endElement</b>()
-</dt>
-<dd class="operation">
-<div>
-Creates an end instance time for the current time. The new instance time is added to the
-<a
-   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>end instance times list</em></a>.
-The behavior of this method is equivalent to <code>endElementAt(0)</code>.
-
-</div>
-</dd>
-
-<dt id="__smil__ElementTimeControl__endElementAt" class="operation">void <b>endElementAt</b>(in float <var>offset</var>)
-</dt>
-<dd class="operation">
-<div>
-Creates a end instance time for the current time plus the specified
-offset. The new instance time is added to the
-<a
-   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>end instance times list</em></a>.
-
-
-</div>
-<dl class="operation">
-<dt class="parameters-header">Parameters</dt>
-<dd>
-<ol class="parameters">
-<li class="parameter first-child">
-<div>float <var>offset</var></div> 
-<div> offset from the current document time, in seconds, at
-which to end the element.
-
-</div>
-</li>
-</ol>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-
-<p>For the corresponding Java binding, see
-<a href='http://www.w3.org/TR/2001/REC-smil-animation-20010904/#SMIL-Java-ElementTimeControl'>section 6.4</a>
-of SMIL Animation [<a href='refs.html#ref-SMILANIM'>SMILANIM</a>].</p>
+is included here for easy reference.</p>
 
 <h3 id="InterfaceTimeEvent">Interface TimeEvent</h3>
 
@@ -2670,8 +2522,8 @@
 repeats). It may be raised both in the course of normal
 (i.e. scheduled or interactive) timeline play, as well as
 in the case that the element was begun with the
-<a>ElementTimeControl::beginElement</a> or
-<a>ElementTimeControl::beginElementAt</a> methods. Note that if an
+<a>SVGAnimationElement::beginElement</a> or
+<a>SVGAnimationElement::beginElementAt</a> methods. Note that if an
 element is restarted while it is currently playing, the
 element will raise an end event and another begin event, as
 the element restarts. 
@@ -2696,7 +2548,7 @@
 repeat. This event may be raised both in the course of
 normal (i.e. scheduled or interactive) timeline play, as
 well as in the case that the element was ended with the
-<a>ElementTimeControl::endElement</a> or <a>ElementTimeControl::endElementAt</a>
+<a>SVGAnimationElement::endElement</a> or <a>SVGAnimationElement::endElementAt</a>
 methods. Note that if an element is restarted while it is
 currently playing, the element will raise an end event and
 another begin event, as the element restarts. 
@@ -2742,17 +2594,17 @@
    href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-Event">Event</a> {
 
   readonly attribute <a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> <a href="animate.html#__smil__TimeEvent__view">view</a>;
-  readonly attribute long <a href="animate.html#__smil__TimeEvent__detail">detail</a>;
-
-  void <a href="animate.html#__smil__TimeEvent__initTimeEvent">initTimeEvent</a>(in DOMString typeArg, in <a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> viewArg, in long detailArg);
+   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> <a href="animate.html#__svg__TimeEvent__view">view</a>;
+  readonly attribute long <a href="animate.html#__svg__TimeEvent__detail">detail</a>;
+
+  void <a href="animate.html#__svg__TimeEvent__initTimeEvent">initTimeEvent</a>(DOMString typeArg, <a class="idlinterface"
+   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> viewArg, long detailArg);
 };</pre><dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
 
-<dt id="__smil__TimeEvent__view" class="attribute first-child"><b>view</b><span class="idl-type-parenthetical"> (readonly <a class="idlinterface"
+<dt id="__svg__TimeEvent__view" class="attribute first-child"><b>view</b><span class="idl-type-parenthetical"> (readonly <a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a>)</span></dt>
 <dd class="attribute">
 <div>
@@ -2763,7 +2615,7 @@
 </div>
 </dd>
 
-<dt id="__smil__TimeEvent__detail" class="attribute"><b>detail</b><span class="idl-type-parenthetical"> (readonly long)</span></dt>
+<dt id="__svg__TimeEvent__detail" class="attribute"><b>detail</b><span class="idl-type-parenthetical"> (readonly long)</span></dt>
 <dd class="attribute">
 <div>
 Specifies some detail information about the Event, depending on the type
@@ -2778,13 +2630,13 @@
 <dd>
 <dl class="attributes">
 
-<dt id="__smil__TimeEvent__initTimeEvent" class="operation first-child">void <b>initTimeEvent</b>(in DOMString <var>typeArg</var>, in <a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> <var>viewArg</var>, in long <var>detailArg</var>)
+<dt id="__svg__TimeEvent__initTimeEvent" class="operation first-child">void <b>initTimeEvent</b>(DOMString <var>typeArg</var>, <a class="idlinterface"
+   href="http://www.w3.org/TR/DOM-Level-2-Views/views.html#Views-AbstractView">AbstractView</a> <var>viewArg</var>, long <var>detailArg</var>)
 </dt>
 <dd class="operation">
 <div>
 The <a>TimeEvent::initTimeEvent</a> method is used to initialize the value of a
-<a>TimeEvent</a> created through the <a>DocumentEvent</a> interface. This
+<a>TimeEvent</a> created with <code>document.createEvent()</code>. This
 method may only be called before the <a>TimeEvent</a> has been dispatched
 via the dispatchEvent method, though it may be called multiple times
 during that phase if necessary. If called multiple times, the final
@@ -2823,20 +2675,13 @@
 </dd>
 </dl>
 
-<p>For the corresponding Java binding, see
-<a href='http://www.w3.org/TR/2001/REC-smil-animation-20010904/#SMIL-Java-TimeEvent'>section 6.4</a>
-of SMIL Animation [<a href='refs.html#ref-SMILANIM'>SMILANIM</a>].</p>
-
 
 <h3 id="InterfaceSVGAnimationElement">Interface SVGAnimationElement</h3>
 
-
-
 <p>The <a>SVGAnimationElement</a> interface is the base interface for all
 of the animation element interfaces: <a>SVGAnimateElement</a>,
 <a>SVGSetElement</a>, <a>SVGAnimateColorElement</a>,
-<a>SVGAnimateMotionElement</a> and <a>SVGAnimateTransformElement</a>.
-</p>
+<a>SVGAnimateMotionElement</a> and <a>SVGAnimateTransformElement</a>.</p>
 
 
 <p>Unlike other SVG DOM interfaces, the SVG DOM does not specify
@@ -2848,21 +2693,59 @@
 animation elements is to use the standard <code>getAttribute</code>,
 <code>setAttribute</code>, <code>getAttributeNS</code> and
 <code>setAttributeNS</code> defined in
-<a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/">DOM Level 2 Core</a>
-[<a href="refs.html#ref-DOM2">DOM2</a>].
-</p>
-<pre class="idl">interface <b>SVGAnimationElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                                <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
-                                <a class="idlinterface" href="animate.html#InterfaceElementTimeControl">ElementTimeControl</a> {
+<a href="http://www.w3.org/TR/dom/">DOM4</a>
+[<a href="refs.html#ref-DOM4">DOM4</a>].</p>
+
+<p>SMIL Animation supports several methods for controlling the behavior of
+animation: <code>beginElement()</code>, <code>beginElementAt()</code>,
+<code>endElement()</code> and <code>endElementAt()</code>. These methods
+are used to begin and end the active duration of an element. Authors can
+(but are not required to) declare the timing to respond to the DOM using
+the following syntax:</p>
+
+<pre>&lt;animate begin="indefinite" end="indefinite" .../&gt;</pre>
+
+<p>If a DOM method call is made to begin or end the element (using
+<code>beginElement()</code>, <code>beginElementAt()</code>,
+<code>endElement()</code> or <code>endElementAt()</code>), each method call
+creates a single instance time (in the appropriate instance times list).
+These times are then interpreted as part of the semantics of lists of
+times, as described in
+<a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-EvaluationOfBeginEndTimeLists">Evaluation of begin and end time lists</a>.</p>
+
+
+<ul>
+  <li>The instance time associated with a <code>beginElement()</code> or
+  <code>endElement()</code> call is the current presentation time at the
+  time of the DOM method call.</li>
+
+  <li>The instance time associated with a <code>beginElementAt()</code> or
+  <code>endElementAt()</code> call is the current presentation time at the
+  time of the DOM method call, plus or minus the specified offset.</li>
+
+  <li>Note that <code>beginElement()</code> is subject to the <a>'animate/restart'</a>
+  attribute in the same manner that event-based begin timing is.  Refer
+  also to <a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Restart">SMIL Animation: Restarting animation</a>
+  ([<a href="refs.html#ref-SMILANIM">SMILANIM</a>], section 3.3.7).</li>
+</ul>
+
+<pre class="idl">interface <b>SVGAnimationElement</b> : <a>SVGElement</a> {
 
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> <a href="animate.html#__svg__SVGAnimationElement__targetElement">targetElement</a>;
 
-  float <a href="animate.html#__svg__SVGAnimationElement__getStartTime">getStartTime</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
+  float <a href="animate.html#__svg__SVGAnimationElement__getStartTime">getStartTime</a>();
   float <a href="animate.html#__svg__SVGAnimationElement__getCurrentTime">getCurrentTime</a>();
-  float <a href="animate.html#__svg__SVGAnimationElement__getSimpleDuration">getSimpleDuration</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  float <a href="animate.html#__svg__SVGAnimationElement__getSimpleDuration">getSimpleDuration</a>();
+
+  void <a href="animate.html#__svg__SVGAnimationElement__beginElement">beginElement</a>();
+  void <a href="animate.html#__svg__SVGAnimationElement__beginElementAt">beginElementAt</a>(float offset);
+  void <a href="animate.html#__svg__SVGAnimationElement__endElement">endElement</a>();
+  void <a href="animate.html#__svg__SVGAnimationElement__endElementAt">endElementAt</a>(float offset);
+};
+
+<a>SVGAnimationElement</a> implements <a>SVGTests</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -2965,6 +2848,84 @@
 </dd>
 </dl>
 </dd>
+
+<dt id="__svg__SVGAnimationElement__beginElement" class="operation first-child">void <b>beginElement</b>()
+</dt>
+<dd class="operation">
+<div>
+Creates a begin instance time for the current time. The new instance
+time is added to the <a
+   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>begin instance times list</em></a>.
+The behavior of this method is equivalent to <code>beginElementAt(0)</code>.
+
+</div>
+</dd>
+
+<dt id="__svg__SVGAnimationElement__beginElementAt" class="operation">void <b>beginElementAt</b>(float <var>offset</var>)
+</dt>
+<dd class="operation">
+<div>
+Creates a begin instance time for the current time plus the specified
+offset. The new instance time is added to the
+<a
+   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>begin instance times list</em></a>.
+
+
+</div>
+<dl class="operation">
+<dt class="parameters-header">Parameters</dt>
+<dd>
+<ol class="parameters">
+<li class="parameter first-child">
+<div>float <var>offset</var></div> 
+<div> The offset from the current document time, in seconds, at
+which to begin the element.
+
+</div>
+</li>
+</ol>
+</dd>
+</dl>
+</dd>
+
+<dt id="__svg__SVGAnimationElement__endElement" class="operation">void <b>endElement</b>()
+</dt>
+<dd class="operation">
+<div>
+Creates an end instance time for the current time. The new instance time is added to the
+<a
+   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>end instance times list</em></a>.
+The behavior of this method is equivalent to <code>endElementAt(0)</code>.
+
+</div>
+</dd>
+
+<dt id="__svg__SVGAnimationElement__endElementAt" class="operation">void <b>endElementAt</b>(float <var>offset</var>)
+</dt>
+<dd class="operation">
+<div>
+Creates a end instance time for the current time plus the specified
+offset. The new instance time is added to the
+<a
+   href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-InstanceTimesLists"><em>end instance times list</em></a>.
+
+
+</div>
+<dl class="operation">
+<dt class="parameters-header">Parameters</dt>
+<dd>
+<ol class="parameters">
+<li class="parameter first-child">
+<div>float <var>offset</var></div> 
+<div>The offset from the current document time, in seconds, at
+which to end the element.
+
+</div>
+</li>
+</ol>
+</dd>
+</dl>
+</dd>
 </dl>
 </dd>
 </dl>
@@ -2984,8 +2945,7 @@
 <p>Object-oriented access to the attributes of the <a>'animate'</a> element
 via the SVG DOM is not available.
 </p>
-<pre class="idl">interface <b>SVGAnimateElement</b> : <a class="idlinterface" href="animate.html#InterfaceSVGAnimationElement">SVGAnimationElement</a>,
-                              <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a> {
+<pre class="idl">interface <b>SVGAnimateElement</b> : <a class="idlinterface" href="animate.html#InterfaceSVGAnimationElement">SVGAnimationElement</a> {
 };</pre>
 
 </edit:with>
@@ -3037,9 +2997,10 @@
 <p>The <a>SVGMPathElement</a> interface corresponds to the <a>'mpath'</a>
 element.
 </p>
-<pre class="idl">interface <b>SVGMPathElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                            <a class="idlinterface" href="types.html#InterfaceSVGURIReference">SVGURIReference</a> {
-};</pre>
+<pre class="idl">interface <b>SVGMPathElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
+};
+
+<a>SVGMPathElement</a> implements <a>SVGURIReference</a>;</pre>
 
 </edit:with>
 
@@ -3057,8 +3018,7 @@
 <p>Object-oriented access to the attributes of the <a>'animateColor'</a>
 element via the SVG DOM is not available.
 </p>
-<pre class="idl">interface <b>SVGAnimateColorElement</b> : <a class="idlinterface" href="animate.html#InterfaceSVGAnimationElement">SVGAnimationElement</a>,
-                                   <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a> {
+<pre class="idl">interface <b>SVGAnimateColorElement</b> : <a class="idlinterface" href="animate.html#InterfaceSVGAnimationElement">SVGAnimationElement</a> {
 };</pre>
 
 </edit:with>
--- a/master/attindex.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/attindex.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -33,19 +35,27 @@
 The table below lists the presentation attributes and the elements on which
 they may be specified.</p>
 
-<table class='vert property-table' summary='List of presentation attributes and the elements on which they may be specified'>
-  <tr>
-    <th>Presentation attributes</th>
-    <th>Elements on which the attributes may be specified</th>
-  </tr>
-  <tr>
-    <td>
-      <edit:attributecategory name='presentation'/>
-    </td>
-    <td>
-      <edit:elementswithattributecategory name='presentation'/>
-    </td>
-  </tr>
+<p class="issue">Since the plan is to allow all SVG elements to be stylable,
+we will likely allow all presentation attributes on all SVG elements, and this
+table can then be removed.</p>
+
+<table class='proptable attrtable'>
+  <thead>
+    <tr>
+      <th>Presentation attributes</th>
+      <th>Elements on which the attributes may be specified</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>
+        <edit:attributecategory name='presentation' omitquotes='yes'/>
+      </th>
+      <td>
+        <edit:elementswithattributecategory name='presentation' omitquotes='yes'/>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 </body>
--- a/master/backward.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/backward.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
--- a/master/changes.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/changes.html	Fri Sep 07 16:16:40 2012 +1000
@@ -2,17 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional+edit//EN" "xhtml1-transitional+edit.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:edit="http://xmlns.grorg.org/SVGT12NG/">
 <head>
-  <title>Changes</title>
+  <title>Changes from SVG 1.1</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
-<h1>Changes</h1>
+<h1>Changes from SVG 1.1</h1>
      
 <p class="normativity"><em>This appendix is informative, not normative.</em></p>
 
@@ -39,6 +41,21 @@
 
 <ul>
   <li>References to the SVG DTD have been removed.</li>
+
+  <li>IDL has been updated to use Web IDL syntax.</li>
+</ul>
+
+<h3 id="types">Basic Data Types and Interfaces chapter</h3>
+
+<ul>
+  <li>Removed the SVGStylable and SVGLangSpace interfaces and moved all of their members on to <a>SVGElement</a>.</li>
+
+  <li>Turned SVGLocatable and SVGTransformable into <a>SVGLocatableElement</a> and <a>SVGTransformableElement</a>,
+  which directly inherit from <a>SVGElement</a>.</li>
+
+  <li>Added <a>SVGGraphicsElement</a> and <a>SVGDefinitionElement</a> interfaces.</li>
+
+  <li>Removed the SVGExternalResourcesRequired interface.</li>
 </ul>
 
 <h3 id="structure">Document Structure chapter</h3>
@@ -88,6 +105,17 @@
   <li>Added the <a>'buffered-rendering'</a> property.</li>
 </ul>
 
+<h3 id="color">Color chapter</h3>
+
+<ul>
+  <li>Added requirements for images to be color managed.</li>
+  
+  <li>Added new color syntaxes from the SVG Color specification: RGBA colors, HSL colors,
+  LAB colors, ICC named colors and device colors.</li>
+
+  <li>Removed the <span class="property">'color-profile'</span> property.</li>
+</ul>
+
 <h3 id="pservers">Paint Servers chapter</h3>
 
 <ul>
@@ -106,8 +134,8 @@
 <ul>
   <li>Added the <a>'mask/maskType'</a> attribute to the <a>'mask element'</a> element.</li>
   <li>Extended the <a>'mask property'</a> property to allow targetting child elements and specifying the mask type.</li>
-  <li>Extended the <a>'mask property'</a> property to allow targetting content
-  that is not wrapped in a <a>'mask element'</a> element.</li>
+  <li>Extended the <a>'mask property'</a> property to allow targetting a CSS
+  <a>&lt;image&gt;</a> or <a href="pservers.html">paint server</a> element.</li>
 </ul>
 
 <h3 id="filters">Filter Effects chapter</h3>
@@ -123,10 +151,16 @@
   <li>Removed the <span class="attr-name">'contentScriptType'</span> attribute.</li>
 </ul>
 
-<h3 id="fonts">Fonts</h3>
+<h3 id="animate">Animation chapter</h3>
 
 <ul>
-	<li>Added WOFF requirement, rearranged content.</li>
+  <li>Folded the ElementTimeControl interface into <a>SVGAnimationElement</a>.</li>
+</ul>
+
+<h3 id="fonts">Fonts chapter</h3>
+
+<ul>
+  <li>Added WOFF requirement, rearranged content.</li>
 </ul>
 
 <h3 id="svgdtd">Document Type Definition appendix</h3>
@@ -135,5 +169,48 @@
   <li>Removed this appendix, as SVG 2 is not defined in terms of a DTD.</li>
 </ul>
 
+<h3 id="svgdom">SVG Document Object Model (DOM) appendix</h3>
+
+<ul>
+  <li>Added text to require IDL fragments be interpreted as Web IDL.</li>
+
+  <li>Removed some unnecessary text.</li>
+
+  <li>Removed mention of read only nodes in the DOM, since that concept no longer
+  exists in DOM4.</li>
+</ul>
+
+<h3 id="java">Java Language Binding appendix</h3>
+
+<ul>
+  <li>Removed this appendix, as language bindings are now defined by
+  Web IDL.</li>
+</ul>
+
+<h3 id="escript">ECMAScript Language Binding appendix</h3>
+
+<ul>
+  <li>Removed this appendix, as language bindings are now defined by
+  Web IDL.</li>
+</ul>
+
+<h3 id="refs">References appendix</h3>
+
+<ul>
+  <li>Removed normative reference to CSS2.</li>
+
+  <li>Removed informative reference to DOM Level 3 Core.</li>
+
+  <li>Changed normative reference to DOM Level 1 Core to be informative.</li>
+
+  <li>Changed normative reference from DOM Level 2 Core to DOM4.</li>
+
+  <li>Changed informative reference to SMIL 3 to be normative.</li>
+
+  <li>Added normative references to CSS3 Color, CSS3 Fonts, CSS3 Line Box, CSS3 Transforms, CSS3 UI, CSS3 Values and Units, CSS4 Images, Filter Effects, WOFF, Web IDL.</li>
+
+  <li>Added informative references to CSS 3 Transitions and Animations.</li>
+</ul>
+
 </body>
 </html>
--- a/master/color.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/color.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,63 +6,368 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
 <h1>Color</h1>
 
-<p class="annotation">
-  This section should include an overall discussion of color in SVG as well as links to all the places color
-  is discussed in the specification: currentColor, SVG colors, etc.
-</p>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Add color management subject to deciding the exact conformance classes required.</p>
-  <p>Resolution: SVG color management becomes a chapter in SVG 2. (No longer an independent module.)</p>
-  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T16-52-12">Conference call 2011-10-28</a>.</p>
-  <p>Purpose: Align with mainstream graphics use. Allow fluorescent colors, more than 8bit color, etc.</p>
-  <p>Owner: Chris.</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support color management.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T16-52-12">SVG 2 will depend on SVG color management subject to deciding the exact conformance classes required.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To align with mainstream graphcs use, allow fluorescent colors, more than 8 bit color, etc.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3160">ACTION-3160</a>)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>SVG color management will become a chapter in SVG 2, no longer an independent module.</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Support CSS3 Color syntax.</p>
-  <p>Resolution: ?.</p>
-  <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">F2F Seattle 2011</a>.</p>
-  <p>Purpose: Align with CSS. Already widely implemented.</p>
-  <p>Owner: Chris.</p>
-</div>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Add new paint values currentFillPaint, currentStrokePaint.</p>
-  <p>Resolution: We will add new paint values currentFillPaint, currentStrokePaint etc. to SVG 2.</p>
-  <p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item01">Seattle 2011 F2F Day 3</a>.</p>
-  <p>Purpose: Among other things, to provide an easy way to match marker color to stroke color.</p>
-  <p>Owner: Chris.</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support CSS3 Color syntax.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item08">SVG 2 will depend on CSS3 Color.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To align with CSS, given CSS3 Color is widely implemented.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris (no action)</td>
+    </tr>
+  </table>
 </div>
 
 
 <h2 id="ColorIntroduction">Introduction</h2>
+  
+<p class="normativity"><em>This introduction is informative, not normative.</em></p>
+  
+  <p>Several properties used in SVG take a color specification. Also, external media such as images or video
+  contain colors.</p>
 
-<p>All SVG colors are specified in the sRGB color space
-[<a href="refs.html#ref-SRGB">SRGB</a>]. At a minimum, SVG user
-agents shall conform to the color behavior requirements specified in the
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#color-units">color units section</a>
-and the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/colors.html#gamma-correction">minimal gamma correction rules</a>
-defined in the CSS2 specification.</p>
+<p>All SVG colors used as property values include a fallback specified in the sRGB color space
+[<a href="refs.html#ref-SRGB">SRGB</a>]. </p>
 
 <p>Additionally, SVG content can specify an alternate color specification
-using an ICC profile [<a href="refs.html#ref-ICC42">ICC42</a>]
-as described in <a href="painting.html#SpecifyingPaint">Specifying paint</a>.
-If ICC-based colors are provided and the SVG user agent supports ICC color,
+using an ICC profile [<a href="refs.html#ref-ICC42">ICC42</a>].
+<!-- check paint chapter for content that should be here, and move it -->
+If ICC-based colors are provided,
 then the ICC-based color takes precedence over the sRGB color specification;
-otherwise, the RGB fallback colors must be used.
-Note that, in this specification, color interpolation occurs in an RGB color space even if an
-ICC-based color specification is provided (see <a>'color-interpolation'</a>).</p>
+otherwise, the sRGB fallback colors will be used.
+Note that, in this specification, by default color interpolation occurs in sRGB color space even if an
+ICC-based color specification is provided, but this can be changed (see <a>'color-interpolation'</a>).</p>
+  
+  <div class="ready-for-wider-review">
+    <h2 id="color-managed-images">Color-managed images</h2>
+    
+    <p class="note">
+      New in SVG 2.</p>
+    
+    <p>Implementations of SVG 2 are required to color-manage all images. The embedded profile is used. If there is no embedded profile, sRGB is assumed, for RGB images.</p>
+      
+    <p class="issue">Define processing for untagged greyscale and CMYK images. Could be a default profile, or an 'explicitly undefined' with a warning to avoid untagged non-RGB images when authoring.</p>
 
-<div class="ready-for-wg-review">
+    <p class="issue">References to "SVG 2 User Agent" might need to be replaced
+    with one of the conformance classes listed in the <a href="conform.html">Conformance</a>
+    appendix.</p>
+    
+    <p><span class="requirement" id="assert_taggedImages">If a referenced image
+    contains color profile information, a SVG 2 User Agent MUST use that profile
+    to render the image.</span>
+    <span class="requirement" id="assert_untaggedImages">Otherwise,
+    if a referenced image contains no color profile information, a
+    SVG 2 User Agent MUST use the sRGB profile to render the image.</span></p>
+    
+
+    <h2 id="Color_syntax">Color syntax</h2>
+    
+    
+    <h3 id="sRGBcolor">
+      sRGB colors</h3>
+    
+    <p  class="prop-value"><a href="#color">&lt;color&gt;</a></p>
+    
+    <p>Example (these all represent the same color):</p>
+    <div class="example">
+      <pre>
+&lt;circle fill="rgb(205,133,63)"/>
+&lt;circle fill="peru"/>
+&lt;circle fill="rgb(80.392%, 52.157%, 24.706%)"/>
+&lt;circle fill="#CD853F"/>
+&lt;circle fill="hsl(30, 59%, 53%)"/></pre>
+      </div>
+    
+    <p class="note">
+       Includes all syntactic forms supported by  SVG 1.1, adds hsl() from  [<a href="refs.html#ref-CSS3COLOR">CSS3COLOR</a>].</p>
+    <p class="note">See the CSS Color Module Level 3 specification for the
+      definition of the color type.
+      [<a href="refs.html#ref-CSS3COLOR">CSS3COLOR</a>]</p>
+    
+    <div class="requirement" id="assert_base_syntax">
+      <p>All the syntactic forms for an sRGB color, including the full set of color keywords, shall be supported by an SVG 2 User Agent.</p>
+    </div>
+    
+    <p>The rendering requirements for sRGB colors are more strict than for SVG 1.1  User Agents,
+      where color management is optional.</p>
+    <div class="requirement" id="assert_render_sRGB">
+      <p>
+        When an sRGB color is used - because it is the sole color specification, or in a
+        permitted fallback situation - a conformant SVG 2 User Agent 
+        shall render it in conformance with the ICC profile for sRGB, to obtain the
+        desired color appearance.
+      </p>
+    </div>
+    
+    <p class="issue">
+      Define 'permitted fallback situation' and link to it.
+    </p>
+    
+    <h3 id="sRGBcoloralpha">
+      sRGB colors with alpha</h3>
+    
+    <p  class="prop-value"><a href="#color">rgba(r, g, b, a)</a></p>
+    
+    <p>Example </p>
+    <div class="example">
+      <pre>
+&lt;circle fill="rgba(205,133,63, 0.5)"/></pre>
+      </div>
+
+    
+    <p class="note">
+      New in SVG 2, added from  [<a href="refs.html#ref-CSS3COLOR">CSS3COLOR</a>].</p>
+    
+    <div class="requirement" id="assert_combine-alpha">
+      <p>When an sRGB color with alpha is used in a property value,  an SVG 2 User Agent shall combine the alpha value with any separately specified alpha value that applies to that property, by multiplying the alpha values together.</p>
+    </div>
+    
+    <p>Example (these render as the same color)</p>
+    <div class="example">
+      <pre>
+&lt;circle fill="rgba(205,133,63, 0.25)"/>
+&lt;circle fill="rgba(205,133,63, 1.0)" fill-opacity="0.25"/>
+&lt;circle fill="rgba(205,133,63, 0.5)" fill-opacity="0.5"/></pre>
+</div>
+    
+   
+    <div class="requirement" id="assert_render_sRGB_alpha">
+      <p>
+        When an sRGB color with alpha is used - because it is the sole color specification, or in a
+        permitted fallback situation - a conformant SVG 2 User Agent 
+        shall render it in conformance with the ICC profile for sRGB, to obtain the
+        desired color appearance.
+      </p>
+    </div>
+    
+    <h3 id="icc-colors">
+      ICC colors</h3>
+    
+    <p  class="prop-value"><a href="#fallback">&lt;fallback&gt;</a>
+      <a href="#icccolor"> icc-color(&lt;name&gt; [,&lt;icccolorvalue&gt;]*)</a></p>
+    
+    <p>Example:</p>
+    <div class="example">
+      <pre>
+&lt;style>
+@color-profile {
+  name: acmecmyk;
+  src: url(http://printers.example.com/acmecorp/model1234);
+}
+&lt;/style>
+&lt;circle fill="#CD853F icc-color(acmecmyk, 0.11, 0.48, 0.83, 0.00)"/></pre>
+    </div>
+    
+    <p>Example:</p>
+    <div class="example">
+      <pre>
+&lt;color-profile name="acmecmyk" href="http://printers.example.com/acmecorp/model1234"/>
+&lt;circle fill="#CD853F icc-color(acmecmyk, 0.11, 0.48, 0.83, 0.00)"/></pre>
+      </div>
+    
+    <p class="note">Same syntax as SVG 1.1, increased conformance requirement.</p>
+    
+    <p>SVG 2  uses the extended ICC color specification from SVG 1.1.  In SVG 1.1,  parsing the syntax was required but implementing the ICC colour itself  was optional,  as indicated by  phrases such as "If ICC-based colors are provided and the SVG user agent supports ICC color, then...". An SVG 1.1 user agent which also conforms to this specification "supports ICC color" for the purposes of conforming to SVG 1.1.</p>
+    
+    <p>
+      As with SVG Full 1.1, SVG 2 content may specify color using an ICC profile (see
+      [<a href="refs.html#ref-ICC42">ICC42</a>]); an sRGB fallback must still be provided.
+    </p>
+    
+    <p>An SVG 2 User Agent searches the color profile description database for
+      a <a href="#ColorProfileDescriptions">color profile description</a> entry whose
+      name descriptor matches &lt;name&gt; and uses the last matching entry that is found;
+      painting shall be done using the given ICC color, where the comma-separated list
+      (with optional white space) of <strong>&lt;icccolorvalue&gt;</strong>'s is a set
+      of ICC-profile-specific color values, expressed as <a>&lt;number&gt;</a>s
+      (see <a href="#icc-colors">ICC colors</a>). If no match is
+      found, then the fallback sRGB color is used.
+    </p>
+    
+    <div class="requirement" id="assert_ICCColorPrecedence">
+      <p>
+        If ICC-based colors are provided, an SVG 2 User Agent
+        MUST use the the ICC-based color in preference to the sRGB fallback color,
+        unless the ICC color profile cannot be used (is unavailable, malformed, or uses an unsupported profile connection
+        space).</p>
+    </div>
+    <div class="requirement" id="assert_useICC">
+      <p>When rendering, if both ICC and sRGB fallback colors are provided and the referenced ICC profile can be used, a SVG 2 User Agent MUST render using the ICC color values, using the specified ICC profile as the input profile.</p>
+    </div>
+    
+    <h3 id="LAB">LAB color</h3>
+    
+    <p class="note">
+      New in SVG 2.</p>
+    
+    <p   class="prop-value"><a href="#fallback">&lt;fallback&gt;</a> 
+      <a href="#cielabcolor">cielab(&lt;Lightness&gt;, &lt;a&gt; &lt;b&gt;)</a> | <br />
+      <a href="#fallback">&lt;fallback&gt;</a>
+      <a href="#cielchabcolor">cielchab(&lt;Lightness&gt; &lt;Chroma&gt;, &lt;Hue&gt; )</a>
+    </p>
+    
+<div class="example">
+    <pre>
+&lt;circle fill="#CD853F cielab(62.253188, 23.950124, 48.410653)"/>
+&lt;circle fill="#CD853F cielch(62.253188, 54.011108, 63.677091)"/>
+</pre>
+    </div>
+  
+    
+    <p>An SVG 2 User Agent directly uses the CIE LAB or CIE LCHab values, where the comma-separated list
+      (with optional white space) of <strong>&lt;icccolorvalue&gt;</strong>'s is a set
+      of Lightness, a and b or Lightness, Hue and Chroma values, expressed as
+      <a>&lt;number&gt;</a>s. A color profile is not referenced in the SVG, although profile-based implementations may 
+    choose to implement this by providing and using an LAB profile.</p>
+          
+          <p>The white point  is D50, which is the whitepoint defined by the CIE for CIELab profile connection space and the 
+            whitepoint used for image editors that provide LAB functionality.
+          LAB measurements relative to a different whitepoint should be adapted to D50 to be used in SVG 2; the linear Bradford chromatic adaptation transform [<a href="refs.html#ref-BRADFORD">BRADFORD</a>] is suggested for this.</p>
+    
+    <div class="requirement" id="assert_LABColorPrecedence">
+      <p>
+        If LAB-based colors are provided, an SVG 2 User Agent
+        MUST use the the LAB-based color in preference to the sRGB fallback color.</p>
+    </div>
+    <div class="requirement" id="assert_useLAB">
+      <p>When rendering, if both LAB and sRGB fallback colors are provided, a SVG 2 User Agent MUST render using the ICC color values, using the specified ICC profile as the input profile.</p>
+    </div>
+          
+          <p>A fallback sRGB color must still be provided, for non-color-managed user agents.</p>
+    
+    <h3 id="named">
+    ICC named color</h3>
+    
+    <p class="note">
+      New in SVG 2.</p>
+    
+    
+    <p   class="prop-value"><a href="#fallback">&lt;fallback&gt;</a>
+      <a href="#iccnamedcolor">icc-named-color(&lt;name&gt;, &lt;namedColor&gt;)</a></p>
+    
+    <p>Example:</p>
+    <div class="example">
+    <pre >
+&lt;color-profile name="FooColors" href="http://swatches.example.com/Foo"/>
+&lt;circle fill="#CD853F icc-color(FooColors, Sandy23C)"/></pre>
+      </div>
+    
+    <p>
+      SVG 2 introduces the ability to specify a color using a 'Named Color Profile'.
+    </p>
+    <p>An SVG 2 User Agent searches the color profile description database for
+      a <a href="#ColorProfileDescriptions">color profile description</a> entry whose
+      name descriptor matches &lt;name&gt; and uses the last matching entry that is found;
+      painting shall be done using the given ICC color, where namedColor is a
+      &lt;string&gt; indicating the named color to use.</p>
+    
+    <p class="issue">This might need to be an &lt;ident&gt; rather than a &lt;string&gt;.</p>
+
+    <p>ICC named color profiles provide a platform- and implementation-neutral way
+    to share a swatch of colors, or to use user-created names for colors.</p>
+    
+    <div class="requirement" id="assert_ICCNamedColorPrecedence">
+      <p>
+        If ICC-based named colors are provided, a conformant SVG 2 User Agent 
+        MUST use the the ICC-based named color in preference to the sRGB fallback
+        color, unless the ICC named color profile is unavailable, malformed, or uses a profile
+        connection space other than CIE XYZ or CIE LAB.</p>
+    </div>
+    <div class="requirement" id="assert_useICCNamed">
+      <p>
+        When an ICC named color is used, a conformant SVG 2 User Agent 
+        shall render it in conformance with the specified ICC profile to obtain the
+        desired color appearance.</p>
+    </div>
+    
+  </div>
+  
+<div class="ready-for-wider-review">
+  <h2 id="Unmanaged">Unmanaged colors</h2>
+  <h3 id="device">
+  Uncalibrated device color</h3>
+  
+  <p class="note">
+    New in SVG 2.</p>
+  
+  <p  class="prop-value"><a href="#fallback">&lt;fallback&gt;</a>
+    <a href="#devicegray">device-gray(&lt;gray&gt;)</a> |  <br />
+    <a href="#fallback">&lt;fallback&gt;</a>
+    <a href="#devicergb">device-rgb(&lt;red&gt; &lt;green&gt; &lt;blue&gt;)</a> |  <br />
+    <a href="#fallback">&lt;fallback&gt;</a>
+    <a href="#devicecmyk">device-cmyk(&lt;cyan&gt; &lt;magenta&gt; &lt;yellow&gt; 
+      &lt;black&gt;)</a> |  <br />
+    <a href="#fallback">&lt;fallback&gt;</a>
+    <a href="#devicegray">device-nchannel(&lt;number&gt;+)</a> |
+  </p>
+  
+ 
+  <div class="example">
+  <pre>
+&lt;circle fill="#CD853F device-cmyk(0.11, 0.48, 0.83, 0.00)"/></pre>
+  </div>
+  
+  <p>
+    SVG 2  introduces a method of specifying uncalibrated device colors. This
+    is sometimes useful in print workflows, for example to produce patches of known 
+    ink density used for quality control purposes. </p>
+  
+  <p>An SVG 2 User Agent which supports the indicated class of output device
+    will pass the values through without color management. If the class of output device 
+    (for example, cmyk) is not supported, then the fallback
+    sRGB color is used.
+  </p>
+  <p>
+    As these are uncalibrated, any interpolation or compositing occurs using the fallback
+    sRGB color value.</p>
+  
+</div>
+
+<div class="ready-for-wider-review">
 <h2 id="ColorProperty">The effect of the <span class="property">'color'</span> property</h2>
 
 <p class="note">See the CSS Color Module Level 3 specification for the
@@ -115,24 +420,21 @@
 
 <h2 id="ColorProfileDescriptions">Color profile descriptions</h2>
 
-<h3 id="ColorProfileDescriptionsOverview">Overview of color profile descriptions</h3>
-
-<p>The <a href="http://www.color.org/">International Color
-Consortium</a> has established a standard, the ICC Profile
-[<a href="refs.html#ref-ICC42">ICC42</a>], for
-documenting the color characteristics of input and output
-devices. Using these profiles, it is possible to build a
-transform and correct visual data for viewing on different
-devices.</p>
-
-<p>A <dfn id='color-profile-description'>color profile description</dfn>
-provides the bridge between an ICC profile and references to
-that ICC profile within SVG content. The color profile
-description is added to the user agent's list of known color
-profiles and then used to select the relevant profile. The
-color profile description contains descriptors for the location
-of the color profile on the Web, a name to reference the
-profile and information about rendering intent.</p>
+  <h3 id="ColorProfileDescriptionsOverview">
+    Overview of color profile descriptions</h3>
+  <p>
+    The <a href="http://www.color.org/">International Color Consortium</a> has established
+    a standard, the ICC Profile [<a href="http://www.color.org/ICC-1A_1999-04.PDF">ICC32</a>],
+    for documenting the color characteristics of input and output devices. Using these
+    profiles, it is possible to build a transform and correct visual data for viewing
+    on different devices.</p>
+  <p>
+    A <span class="SVG-Term">color profile description</span> provides the bridge between
+    an ICC profile and references to that ICC profile within SVG content. The color
+    profile description is added to the user agent's list of known color profiles and
+    then used to select the relevant profile. The color profile description contains
+    descriptors for the location of the color profile on the Web, a name to reference
+    the profile and information about rendering intent.</p>
 
 <h3 id="ColorProfileAlternatives">Alternative ways of defining a color profile description</h3>
 
@@ -141,11 +443,10 @@
 <ul>
   <li>a <a>'color-profile element'</a> element</li>
 
-  <li>an <em>@color-profile</em> rule within a CSS style sheet (only
-  applicable for user agents which support using CSS to style the SVG
-  content [<a href="refs.html#ref-CSS2">CSS2</a>])</li>
+  <li>an <em>@color-profile</em> rule within a CSS style sheet </li>
 </ul>
 
+
 <p>If a color profile with the same <em>name</em> value has
 been identified by both a <a>'color-profile element'</a> element and
 <em>@color-profile</em> rules within a CSS style sheet, then
@@ -155,6 +456,9 @@
 
 <h3 id="ColorProfileElement">The <span class="element-name">'color-profile'</span> element</h3>
 
+<p class="issue">The <a>'color-profile element'</a> element is going to be removed, as it is
+redundant with the <strong>@color-profile</strong> rule.</p>
+
 <edit:with element='color-profile'>
 
 <edit:elementsummary name='color-profile'/>
@@ -162,33 +466,41 @@
     <div class="adef-list">
       <p><em>Attribute definitions:</em></p>
       <dl>
-        <dt id="ColorProfileElementHrefAttribute"><span class="adef">xlink:href</span> = "<span
+        <dt id="ColorProfileElementHrefAttribute"><span class="adef">href</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeIRI">&lt;iri&gt;</a></span>"</dt>
         <dd>The location of an ICC profile resource.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
-        <dt id="ColorProfileElementLocalAttribute"><span class="adef">local</span> = "<span
+
+        <dt id="ColorProfileElementLocalAttribute"><span class="adef">local</span> =  sRGB | "<span
         class="attr-value">&lt;string&gt;</span>"</dt>
         <dd>The unique ID for a locally stored color profile.
         &lt;string&gt; is the profile's unique ID as specified by
         <a href="http://www.color.org/">International Color
-        Consortium</a>. If both the <a>'xlink:href'</a> and the <a>'local'</a>
-        attributes are specified,
-        then the user agent shall search the local system for the
-        locally stored color profile first, and, if not available
-        locally, then attempt to use the resource identified by the
-        <a>'xlink:href'</a> attribute. (Note:
-        Profile description fields do <em>not</em> represent a
-        profile's unique ID. With current ICC proposals, the
-        profile's unique ID is an MD5-encoded value within the
-        profile header.)<br />
+        Consortium</a>.
+          <div class="requirement" id="assert_sRGBCaseInsensitive">         
+            When used in a style sheet,
+            for consistency with <a href="http://www.w3.org/TR/CSS2/grammar.html">CSS lexical
+              scanning and parsing rules</a>, the keyword "sRGB" MUST be case-insensitive. However,
+            it is recommended that the mixed capitalization "sRGB" SHOULD be used for consistency
+            with common industry practice.</div>
+          <div class="requirement" id="assert_localColorProfilesFirst">
+            If both the <a href="#ColorProfileElementHrefAttribute"><span class="attr-name">href</span></a>
+            and the <span class="attr-name">local</span> attributes are specified, then the
+            user agent MUST search the local system for the locally stored color profile first,
+            and, if not available locally, then attempt to use the resource identified by the
+            <a href="#ColorProfileElementHrefAttribute"><span class="attr-name">href</span></a>
+            attribute.</div>
+          (Note: Profile description fields do <em>not</em> represent a profile's unique ID.
+          With current ICC proposals, the profile's unique ID is an MD5-encoded value within
+          the profile header.).<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
         <dt id="ColorProfileElementNameAttribute"><span class="adef">name</span> = "<span
-        class="attr-value">&lt;author-ident&gt;</span>"</dt>
+        class="attr-value">&lt;identifier&gt;</span>"</dt>
         <dd>The name which is used as the first parameter for <span
         class="prop-value">icc-color</span> specifications within
         <a>'fill'</a>, <a>'stroke'</a>, <a>'stop-color'</a>,
@@ -197,16 +509,7 @@
         color specification and the name which can be the value of
         the <a>'color-profile element'</a> property. Note
         that if 'name' is not provided, it will be impossible
-        to reference the given color profile description. The name
-        "sRGB" is predefined; any color profile descriptions with
-        <span class="attr-value">&lt;author-ident&gt;</span> set to "sRGB"
-        will be ignored. For consistency with <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS
-        lexical scanning and parsing rules</a>
-        ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB"
-        is case-insensitive; however, it is recommended that the
-        mixed capitalization "sRGB" be used for consistency with
-        common industry practice.<br />
+        to reference the given color profile description. 
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
@@ -226,34 +529,88 @@
             <dt><span class='prop-value'>auto</span></dt>
             <dd>This is the default behavior. The user agent
             determines the best intent based on the content type.
-            For image content containing an embedded profile, it
-            shall be assumed that the intent specified within the
-            profile is the desired intent. Otherwise, the user
-            agent shall use the current profile and force the
-            intent, overriding any intent that might be stored in
-            the profile itself.</dd>
+              <div class="requirement" id="assert_renderingIntentAuto">
+                For image content containing an embedded profile, the User Agent MUST use the intent
+                specified within the profile. Otherwise, the user agent MUST use the current profile
+                and force the intent, overriding any intent that might be stored in the profile
+                itself.
+              </div></dd>
             <dt><span class='prop-value'>perceptual</span></dt>
-            <dd>This method, often the preferred choice for images,
-            preserves the relationship between colors. It attempts
-            to maintain relative color values among the pixels as
-            they are mapped to the target device gamut. Sometimes
-            pixel values that were originally within the target
-            device gamut are changed in order to avoid hue shifts
-            and discontinuities and to preserve as much as possible
-            the overall appearance of the scene.</dd>
+            <dd>            <p>This method is often the preferred choice for images, especially when
+              there are substantial differences between the source and destination
+              (such as a CRT display image reproduced on a reflection print). It takes
+              the colors of the source image and re-optimizes the appearance for the
+              destination medium using proprietary methods. This re-optimization may
+              result in colors within both the source and destination gamuts being
+              changed, although perceptual transforms are supposed to maintain the
+              basic artistic intent of the original in the reproduction. They will not
+              attempt to correct errors in the source image.
+            </p>
+              <p class="note">With v2 ICC profiles there is no specified perceptual reference
+                medium, which can cause interoperability problems. When v2 ICC profiles
+                are used it may be safer to use the media-relative colorimetric
+                rendering intent with black point compensation, instead of the perceptual
+                rendering intent, unless the specific source and destination profiles to
+                be used have been checked to ensure the combination produces the desired
+                result.
+              </p>
+              <div class="requirement" id="assert_renderingIntentPerceptual">
+                This method SHOULD maintain relative color values among the pixels as they are mapped
+                to the target device gamut. This method MAY change pixel values that were originally
+                within the target device gamut, in order to avoid hue shifts and discontinuities
+                and to preserve as much as possible the overall appearance of the scene.
+              </div>
+            </dd>
             <dt><span class='prop-value'>saturation</span></dt>
-            <dd>Preserves the relative saturation (chroma) values
-            of the original pixels. Out of gamut colors are
-            converted to colors that have the same saturation but
-            fall just inside the gamut.</dd>
+            <dd>            <p>This option was created to preserve the relative saturation (chroma) of
+              the original, and to keep solid colors pure. However, it experienced
+              interoperability problems like the perceptual intent, and as solid color
+              preservation is not amenable to a reference medium solution using v4
+              profiles does not solve the problem. Use of this rendering intent is <em>not
+                recommended</em> unless the specific source and destination profiles to be
+              used have been checked to ensure the combination produces the desired
+              result.
+            </p>
+              <div class="requirement" id="assert_renderingIntentSaturation">
+                This option SHOULD preserve the relative saturation (chroma) values of the original
+                pixels. Out of gamut colors SHOULD be converted to colors that have the same saturation
+                but fall just inside the gamut.
+              </div></dd>
             <dt><span class='prop-value'>relative-colorimetric</span></dt>
-            <dd>Leaves colors that fall inside the gamut unchanged.
-            This method usually converts out of gamut colors to
-            colors that have the same lightness but fall just
-            inside the gamut.</dd>
+            <dd>            <p>Media-relative colorimetric 
+              is required to leave source colors that fall inside the destination
+              medium gamut unchanged relative to the respective media white points.
+              Source colors that are out of the destination medium gamut are mapped to
+              colors on the gamut boundary using a variety of different methods.</p>
+              
+              <p class="note">Note: the media-relative colorimetric rendering intent is often used with
+                black point compensation, where the source medium black point is mapped
+                to the destination medium black point as well.</p>
+              
+              <div class="requirement" id="assert_renderingIntentRelativeColorimetric">
+                This method MUST map the source white point to the desination white point.
+                If black point compensation is in use, the source black point MUST also be mapped to the destination black point.
+                Adaptation algorithms SHOULD be used to adjust for the change in white point. Relative relationships of colors inside
+                both source and destination gamuts SHOULD be preserved. 
+                Relative relationships of colors outside the destination gamut MAY be changed.
+              </div></dd>
             <dt><span class='prop-value'>absolute-colorimetric</span></dt>
-            <dd>Disables white point matching when converting
-            colors. This option is generally not recommended.</dd>
+            <dd><p>ICC-absolute colorimetric  is
+              required to leave source colors that fall inside the destination medium
+              gamut unchanged relative to the adopted white (a perfect reflecting
+              diffuser). Source colors that are out of the destination medium gamut
+              are mapped to colors on the gamut boundary using a variety of different
+              methods. This method produces the most accurate color matching of
+              in-gamut colors, but will result in highlight clipping if the
+              destination medium white point is lower than the source medium white
+              point. For this reason it is recommended for use <em>only</em> in applications
+              that need exact color matching and where highlight clipping is not a
+              concern.
+            </p>
+              <div class="requirement" id="assert_renderingIntentAbsoluteColorimetric">
+                This method MUST disable white point matching and black point matching when converting colors.
+              </div>
+              In general, this option is not recommended.</dd>
           </dl>
           <br />
            <span class="anim-target"><a
@@ -261,12 +618,12 @@
         </dd>
       </dl>
     </div>
-
+  <p class="issue">Fallback behaviour needs to be specified, for when the requested rendering intent does not have a corresponding table in the profile; or when all rendering-intents are provided using the same table.</p>
 </edit:with>
 
 <h3 id="ColorProfileAtRule">The CSS <strong>@color-profile</strong> rule</h3>
 
-<p>When the document is styled using CSS, the
+<p>When the document is styled using CSS, the CSS
 <strong>@color-profile</strong> rule can be used to specify a color
 profile description. The general form is:</p>
 
@@ -299,8 +656,7 @@
         <dt id="ColorProfileSrcProperty"><span class="descdef-title property">'src'</span></dt>
         <dd>
           <table
-          summary="src descriptor definition for @color-profile"
-          class="propinfo" cellspacing="0" cellpadding="0">
+          class="propinfo" >
             <tr>
               <td><em>Values:</em></td>
               <td>sRGB | &lt;local-profile&gt; | <a
@@ -308,7 +664,7 @@
               (&lt;local-profile&gt; <a
               href="types.html#DataTypeIRI">&lt;iri&gt;</a>) | <a
               class="noxref"
-              href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit">
+              href="http://www.w3.org/TR/2011/REC-CSS2-20110607/cascade.html#value-def-inherit">
               <span
               class="value-inst-inherit noxref">inherit</span></a></td>
             </tr>
@@ -329,8 +685,8 @@
   <dt><span class='prop-value'>sRGB</span></dt>
   <dd>The source profile is the sRGB color space. For
   consistency with
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/grammar.html#scanner">CSS lexical scanning and parsing rules</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section G.2), the keyword "sRGB" is
   case-insensitive; however, it is recommended that the mixed
   capitalization "sRGB" be used for consistency with common
   industry practice.</dd>
@@ -369,11 +725,10 @@
         <dt id="ColorProfileNameProperty"><span class="descdef-title property">'name'</span></dt>
         <dd>
           <table
-          summary="name descriptor definition for @color-profile"
-          class="propinfo" cellspacing="0" cellpadding="0">
+          class="propinfo" >
             <tr>
               <td><em>Values:</em></td>
-              <td><a>&lt;author-ident&gt;</a></td>
+              <td><a>&lt;identifier&gt;</a></td>
             </tr>
             <tr>
               <td><em>Initial:</em></td>
@@ -389,7 +744,7 @@
     </div>
 
 <dl>
-  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
+  <dt><span class='prop-value'><a>&lt;identifier&gt;</a></span></dt>
   <dd>See the description for the <a>'color-profile/name'</a> attribute on the
   <a>'color-profile element'</a> element. Note that if 'name' is not
   provided, it will be impossible to reference the given @color-profile
@@ -401,8 +756,7 @@
         <dt id="RenderingIntentProperty"><span class="descdef-title property">'rendering-intent'</span></dt>
         <dd>
           <table
-          summary="rendering-intent descriptor definition for @color-profile"
-           class="propinfo" cellspacing="0" cellpadding="0">
+           class="propinfo" >
             <tr>
               <td><em>Values:</em></td>
               <td>auto | perceptual | relative-colorimetric |<br />
@@ -416,7 +770,7 @@
               <td><em>Media:</em></td>
               <td>visual</td>
             </tr>
-            <tr valign="baseline">
+            <tr>
               <td><em><a
               href="animate.html#Animatable">Animatable</a>:</em>&nbsp;&nbsp;</td>
               <td>no</td>
@@ -428,87 +782,164 @@
 
 <p>See the description for the <a>'color-profile/rendering-intent'</a> attribute on the
 <a>'color-profile element'</a> element.</p>
-
-<h3 id="ColorProfileProperty">The <span class="property">'color-profile'</span> property</h3>
+  
+  
+<div class="ready-for-wider-review">
+<h2 id="syntax">Color syntax</h2>
 
-<table class="propdef">
-  <tr>
-    <th>Name:</th>
-    <td><dfn id="ColorProfileProperty">color-profile</dfn></td>
-  </tr>
-  <tr>
-    <th>Value:</th>
-    <td>auto | sRGB | <a>&lt;author-ident&gt;</a> | <a>&lt;funciri&gt;</a></td>
-  </tr>
-  <tr>
-    <th>Initial:</th>
-    <td>none</td>
-  </tr>
-  <tr>
-    <th>Applies to:</th>
-    <td><a>'image'</a> elements that refer to raster images</td>
-  </tr>
-  <tr>
-    <th>Inherited:</th>
-    <td>yes</td>
-  </tr>
-  <tr>
-    <th>Percentages:</th>
-    <td>N/A</td>
-  </tr>
-  <tr>
-    <th>Media:</th>
-    <td>visual</td>
-  </tr>
-  <tr>
-    <th>Computed&#160;value:</th>
-    <td>as specified, but with <a>&lt;funciri&gt;</a> values made absolute</td>
-  </tr>
-  <tr>
-    <th><a>Animatable</a>:</th>
-    <td>yes</td>
-  </tr>
-</table>
+<p>The EBNF grammar syntax is as described in <a href="types.html#syntax">Syntax</a>.</p>
 
-<dl>
-  <dt><span class='prop-value'>auto</span></dt>
-  <dd>This is the default behavior. All colors are presumed to
-  be defined in the sRGB color space unless a more precise
-  embedded profile is specified within content data. For images
-  that do have a profile built into their data, that profile is
-  used. For images that do not have a profile, the sRGB profile
-  is used.</dd>
-
-  <dt><span class='prop-value'>sRGB</span></dt>
-  <dd>
-    <p>The source profile is assumed to be sRGB. This differs
-    from auto in that it overrides an embedded profile inside an
-    image.</p>
+<pre>
+<span id="icccolor">icccolor</span> ::= 
+  ~"icc-color(" <a href="#name">name</a> (<a href="#comma-wsp">comma-wsp</a> <a href="#number">number</a>)+ ")" 
+  
+<span id="iccnamedcolor">iccnamedcolor</span> ::= 
+  ~"icc-named-color(" <a href="#name">name</a> <a href="#comma-wsp">comma-wsp</a> <a href="#namedColor">namedColor</a> ")" 
+  
+<span id="cielabcolor">cielabcolor</span> ::=
+  ~"cielab(" <a href="#lightness">lightness</a> <a href="#comma-wsp">comma-wsp</a> <a href="#a-value">a-value</a> <a href="#comma-wsp">comma-wsp</a> <a href="#b-value">b-value</a> ")" 
+  
+<span id="cielchabcolor">cielchabcolor</span> ::=
+  ~"cielchab(" <a href="#lightness">lightness</a> <a href="#comma-wsp">comma-wsp</a> <a href="#chroma">chroma</a> <a href="#comma-wsp">comma-wsp</a> <a href="#hue">hue</a> ")" 
+  
+<span id="devicecolor">devicecolor</span> ::=
+  <a href="#devicegray">device-gray</a> | <a href="#devicergb">devicergb</a> | <a href="#devicecmyk">devicecmyk</a> | <a href="#devicenchannel">devicenchannel</a>
+  
+<span id="devicegray">devicegray</span> ::=
+  ~"device-gray(" <a href="#gray">gray</a> ")"
+  
+<span id="devicergb">devicergb</span> ::=
+  ~"device-rgb(" <a href="#red">red</a> <a href="#green">green</a> <a href="#blue">blue</a> ")"
+  
+<span id="devicecmyk">devicecmyk</span> ::=
+  ~"device-cmyk(" <a href="#cyan">cyan</a> <a href="#magenta">magenta</a> <a href="#yellow">yellow</a> <a href="#black">black</a> ")"
+  
+<span id="devicenchannel">devicenchannel</span> ::=
+  ~"device-nchannel(" <a href="#number">number</a>+ ")"
+  
+<span id="name">name</span> ::=
+  <a href="#namestartchar">namestartchar</a> (<a href="#namechar">namechar</a>)*
+  
+<span id="lightness">lightness</span> ::=
+  <a href="#number">number</a>
+  
+<span id="a-value">a-value</span> ::=
+  <a href="#number">number</a>
+  
+<span id="b-value">b-value</span> ::=
+  <a href="#number">number</a>
+  
+<span id="chroma">chroma</span> ::=
+  <a href="#number">number</a>
+  
+<span id="hue">hue</span> ::=
+  <a href="#number">number</a>
+  
+  
+<span id="gray">gray</span> ::=
+  <a href="#number">number</a>
+  
+<span id="red">red</span> ::=
+  <a href="#number">number</a>
+  
+<span id="green">green</span> ::=
+  <a href="#number">number</a>
+  
+<span id="blue">blue</span> ::=
+  <a href="#number">number</a>
+  
+<span id="cyan">cyan</span> ::=
+  <a href="#number">number</a>
+  
+<span id="magenta">magenta</span> ::=
+  <a href="#number">number</a>
+  
+<span id="yellow">yellow</span> ::=
+  <a href="#number">number</a>
+  
+<span id="black">black</span> ::=
+  <a href="#number">number</a>
+  
+<span id="namedColor">namedColor</span> ::=
+  <a href="#name">name</a>
+  
+<span id="fallback">fallback</span> ::=
+  <a href="#color">color</a>
+  
+<span id="color">color</span>  ::= 
+  "#" <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> (<a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a> <a href="#hexdigit">hexdigit</a>)?
+  | ~"rgb(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
+  | ~"rgb(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a href="#comma">comma</a> <a href="#integer">integer</a> "%" <a href="#wsp">wsp</a>* ")"
+  | ~"hsl(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
+  | ~"hsla(" <a href="#wsp">wsp</a>* <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#comma">comma</a> <a href="#integer">integer</a> <a href="#wsp">wsp</a>* ")"
+  | <a href="#color-keyword">color-keyword</a>
+  
+<span id="hexdigit">hexdigit</span> ::= 
+  [0-9A-Fa-f]
+  
+<span id="number">number</span> ::= 
+  <a href="#sign">sign</a>? <a href="#digit-sequence">digit-sequence</a>? "." <a href="#digit-sequence">digit-sequence</a>
+  
+<span id="sign">sign</span>::=
+  "+" | "-"
+  
+<span id="integer">integer</span> ::=
+  <a href="#digit-sequence">digit-sequence</a>
+  
+<span id="digit-sequence">digit-sequence</span> ::=
+  [0-9]+
+  
+<span id="namestartchar">namestartchar</span> ::=
+  ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [
+  #xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] |
+  [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] |
+  [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
+   
+<span id="namechar">namechar</span> ::=
+  <a href="#namestartchar">namestartchar</a> | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] |
+  [#x203F-#x2040]
 
-    <p>For consistency with <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/grammar.html#q2">CSS lexical scanning and parsing rules</a>
-    ([<a href="refs.html#ref-CSS2">CSS2</a>], section D.2), the keyword "sRGB" is
-    case-insensitive; however, it is recommended that the mixed
-    capitalization "sRGB" be used for consistency with common
-    industry practice.</p>
-  </dd>
+  
+<span id="comma-wsp">comma-wsp</span> ::=
+  (<a href="#wsp">wsp</a>+ <a href="#comma">comma</a>? <a href="#wsp">wsp</a>*) | (<a href="#comma">comma</a> <a href="#wsp">wsp</a>*)
+  
+<span id="comma">comma</span> ::=
+  ","
+  
+<span id="wsp">wsp</span> ::=
+  (#x20 | #x9 | #xD | #xA)
+  
+<span id="color-keyword">color-keyword</span> ::=
+  ~"aliceblue" | ~"antiquewhite" | ~"aqua" | ~"aquamarine" | ~"azure" | ~"beige" | 
+  ~"bisque" | ~"black" | ~"blanchedalmond" | ~"blue" | ~"blueviolet" | ~"brown" | 
+  ~"burlywood" |~"cadetblue" | ~"chartreuse" | ~"chocolate" | ~"coral" | ~"cornflowerblue" |
+  ~"cornsilk" | ~"crimson" | ~"cyan" | ~"darkblue" | ~"darkcyan" | ~"darkgoldenrod" | 
+  ~"darkgray" | ~"darkgreen" | ~"darkgrey" | ~"darkkhaki" | ~"darkmagenta" | ~"darkolivegreen" | 
+  ~"darkorange" | ~"darkorchid" | ~"darkred" | ~"darksalmon" | ~"darkseagreen" | ~"darkslateblue" | 
+  ~"darkslategray" | ~"darkslategrey" | ~"darkturquoise" | ~"darkviolet" | ~"deeppink" | ~"deepskyblue" | 
+  ~"dimgray" | ~"dimgrey" | ~"dodgerblue" | ~"firebrick" | ~"floralwhite" | ~"forestgreen" | 
+  ~"fuchsia" | ~"gainsboro" | ~"ghostwhite" | ~"gold" | ~"goldenrod" | ~"gray" | 
+  ~"grey" | ~"green" | ~"greenyellow" | ~"honeydew" | ~"hotpink" | ~"indianred" | 
+  ~"indigo" | ~"ivory" | ~"khaki" | ~"lavender" | ~"lavenderblush" | ~"lawngreen" | 
+  ~"lemonchiffon" | ~"lightblue" | ~"lightcoral" | ~"lightcyan" | ~"lightgoldenrodyellow" | ~"lightgray" | 
+  ~"lightgreen" | ~"lightgrey" | ~"lightpink" | ~"lightsalmon" | ~"lightseagreen" | ~"lightskyblue" | 
+  ~"lightslategray" | ~"lightslategrey" | ~"lightsteelblue" | ~"lightyellow" | ~"lime" | 
+  ~"limegreen" | ~"linen" | ~"magenta" | ~"maroon" | ~"mediumaquamarine" | ~"mediumblue" | 
+  ~"mediumorchid" | ~"mediumpurple" | ~"mediumseagreen" | ~"mediumslateblue" | ~"mediumspringgreen" |
+  ~"mediumturquoise" | ~"mediumvioletred" | ~"midnightblue" | ~"mintcream" | ~"mistyrose" |
+  ~"moccasin" | ~"navajowhite" | ~"navy" | ~"oldlace" | ~"olive" | ~"olivedrab" | ~"orange" | ~"orangered" | 
+  ~"orchid" | ~"palegoldenrod" | ~"palegreen" | ~"paleturquoise" | ~"palevioletred" | ~"papayawhip" | 
+  ~"peachpuff" | ~"peru" | ~"pink" | ~"plum" | ~"powderblue" | ~"purple" | 
+  ~"red" | ~"rosybrown" | ~"royalblue" | ~"saddlebrown" | ~"salmon" | ~"sandybrown" | 
+  ~"seagreen" | ~"seashell" | ~"sienna" | ~"silver" | ~"skyblue" | ~"slateblue" | 
+  ~"slategray" | ~"slategrey" | ~"snow" | ~"springgreen" | ~"steelblue" | ~"tan" | 
+  ~"teal" | ~"thistle" | ~"tomato" | ~"turquoise" | ~"violet" | ~"wheat" | 
+  ~"white" | ~"whitesmoke" | ~"yellow" | ~"yellowgreen" 
+</pre>
 
-  <dt><span class='prop-value'><a>&lt;author-ident&gt;</a></span></dt>
-  <dd>A name corresponding to a defined color profile that is
-  in the user agent's color profile description database. The
-  user agent searches the color profile description database
-  for a <a href="color.html#ColorProfileDescriptions">color
-  profile description</a> entry whose name descriptor matches
-  &lt;author-ident&gt; and uses the last matching entry that is found.
-  If a match is found, the corresponding profile overrides an
-  embedded profile inside an image. If no match is found, then
-  the embedded profile inside the image is used.</dd>
 
-  <dt><span class='prop-value'><a
-  href="types.html#DataTypeIRI">&lt;iri&gt;</a></span></dt>
-  <dd>An <a>IRI reference</a> to the source color profile. The referenced
-  color profile overrides an embedded profile inside the
-  image.</dd>
-</dl>
+</div>
+ 
 
 <h2 id="DOMInterfaces">DOM interfaces</h2>
 
@@ -519,13 +950,16 @@
 
 The <a>SVGColorProfileElement</a> interface corresponds to the
 <a>'color-profile element'</a> element.
-<pre class="idl">interface <b>SVGColorProfileElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                                   <a class="idlinterface" href="types.html#InterfaceSVGURIReference">SVGURIReference</a>,
-                                   <a class="idlinterface" href="types.html#InterfaceSVGRenderingIntent">SVGRenderingIntent</a> {
+<pre class="idl">interface <b>SVGColorProfileElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
   attribute DOMString <a href="color.html#__svg__SVGColorProfileElement__local">local</a>;
   attribute DOMString <a href="color.html#__svg__SVGColorProfileElement__name">name</a>;
   attribute unsigned short <a href="color.html#__svg__SVGColorProfileElement__renderingIntent">renderingIntent</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGColorProfileElement</a> implements <a>SVGRenderingIntent</a>;
+<a>SVGColorProfileElement</a> implements <a>SVGURIReference</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -579,92 +1013,43 @@
 <p>Support for the <a>SVGColorProfileRule</a> interface is only required
 in user agents that support <a href="styling.html#StylingWithCSS">styling with CSS</a>.
 </p>
-<pre class="idl">interface <b>SVGColorProfileRule</b> : <a class="idlinterface" href="types.html#InterfaceSVGCSSRule">SVGCSSRule</a>,
-                                <a class="idlinterface" href="types.html#InterfaceSVGRenderingIntent">SVGRenderingIntent</a> {
-  attribute DOMString <a href="color.html#__svg__SVGColorProfileRule__src">src</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute DOMString <a href="color.html#__svg__SVGColorProfileRule__name">name</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute unsigned short <a href="color.html#__svg__SVGColorProfileRule__renderingIntent">renderingIntent</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
-<dt class="attributes-header">Attributes:</dt>
-<dd>
-<dl class="attributes">
-
-<dt id="__svg__SVGColorProfileRule__src" class="attribute first-child"><b>src</b><span class="idl-type-parenthetical"> (DOMString)</span></dt>
-<dd class="attribute">
-<div>
-Corresponds to descriptor <span class="property">src</span> within an
-@color-profile rule.
-
-
-</div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGColorProfileRule__name" class="attribute"><b>name</b><span class="idl-type-parenthetical"> (DOMString)</span></dt>
-<dd class="attribute">
-<div>
-Corresponds to descriptor <span class="property">'name'</span> within an
-@color-profile rule.
+<pre class="idl">interface <b>SVGColorProfileRule</b> : <a class="idlinterface" href="types.html#InterfaceSVGCSSRule">SVGCSSRule</a> {
+  attribute DOMString <a href="color.html#__svg__SVGColorProfileRule__src">src</a>;
+  attribute DOMString <a href="color.html#__svg__SVGColorProfileRule__name">name</a>;
+  attribute unsigned short <a href="color.html#__svg__SVGColorProfileRule__renderingIntent">renderingIntent</a>;
+};
 
-
-</div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
+<a>SVGColorProfileRule</a> implements <a>SVGRenderingIntent</a>;</pre>
 
-<dt id="__svg__SVGColorProfileRule__renderingIntent" class="attribute"><b>renderingIntent</b><span class="idl-type-parenthetical"> (unsigned short)</span></dt>
-<dd class="attribute">
-<div>
-The type of rendering intent, identified by one of the
-<a>SVGRenderingIntent</a> constants.
-
+<dl class="interface">
+  <dt class="attributes-header">Attributes:</dt>
+  <dd>
+    <dl class="attributes">
+      <dt id="__svg__SVGColorProfileRule__src" class="attribute first-child"><b>src</b><span class="idl-type-parenthetical"> (DOMString)</span></dt>
+      <dd class="attribute">
+        <div>
+          Corresponds to descriptor <span class="property">src</span> within an
+          @color-profile rule.
+        </div>
+      </dd>
 
-</div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
+      <dt id="__svg__SVGColorProfileRule__name" class="attribute"><b>name</b><span class="idl-type-parenthetical"> (DOMString)</span></dt>
+      <dd class="attribute">
+        <div>
+          Corresponds to descriptor <span class="property">'name'</span> within an
+          @color-profile rule.
+        </div>
+      </dd>
 
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
+      <dt id="__svg__SVGColorProfileRule__renderingIntent" class="attribute"><b>renderingIntent</b><span class="idl-type-parenthetical"> (unsigned short)</span></dt>
+      <dd class="attribute">
+        <div>
+          The type of rendering intent, identified by one of the
+          <a>SVGRenderingIntent</a> constants.
+        </div>
+      </dd>
+    </dl>
+  </dd>
 </dl>
 
 </body>
--- a/master/concepts.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/concepts.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -198,7 +200,7 @@
 <dl>
   <dt>A stand-alone SVG Web page</dt>
   <dd>In this case, an SVG document (i.e., a Web resource whose
-  MIME type is "<tt>image/svg+xml</tt>") is loaded directly
+  MIME type is "<code>image/svg+xml</code>") is loaded directly
   into a user agent such as a Web browser. The SVG document is
   the Web page that is presented to the user.</dd>
 
@@ -257,7 +259,7 @@
   formats.</dd>
 
   <dt>Referenced from a CSS or XSL property</dt>
-  <dd>When a user agent supports CSS-styled XML content [<a href="refs.html#ref-CSS2">CSS2</a>]
+  <dd>When a user agent supports CSS-styled XML content [<a href="refs.html#ref-CSS21">CSS21</a>]
   or XSL [<a href="refs.html#ref-XSL">XSL</a>] and the user agent is a <a
   href="conform.html#ConformingSVGViewers">Conforming SVG
   Viewer</a>, then that user agent must support the ability to
@@ -266,11 +268,11 @@
   to tile SVG graphics wherever necessary and the ability to
   composite the SVG into the background if it has transparent
   portions. Examples include the <a
-  href="http://www.w3.org/TR/2008/REC-CSS2-20080411/colors.html#propdef-background-image">
+  href="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">
   <span class="property">'background-image'</span></a> and <a
-  href="http://www.w3.org/TR/2008/REC-CSS2-20080411/generate.html#propdef-list-style-image">
+  href="http://www.w3.org/TR/2011/REC-CSS2-20110607/generate.html#propdef-list-style-image">
   <span class="property">'list-style-image'</span></a>
-  properties ([<a href="refs.html#ref-CSS2">CSS2</a>], sections 14.2.1 and 12.6.2)
+  properties ([<a href="refs.html#ref-CSS21">CSS21</a>], sections 14.2.1 and 12.5.1)
   that are included in both CSS and XSL.</dd>
 </dl>
 
--- a/master/conform.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/conform.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -41,8 +43,8 @@
   specification [<a href="refs.html#ref-XML-NS">XML-NS</a>],</li>
 
   <li>any CSS stylesheets conform to the core grammar of
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/"><cite>Cascading Style Sheets, level 2</cite></a>
-  [<a href="refs.html#ref-CSS2">CSS2</a>],</li>
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style Sheets, level 2 revision 1</cite></a>
+  [<a href="refs.html#ref-CSS21">CSS21</a>],</li>
 
   <li>and any <code>&lt;?xml-stylesheet?&gt;</code> processing instruction conforms to
   <a href="http://www.w3.org/1999/06/REC-xml-stylesheet-19990629/"><cite>Associating stylesheets with XML documents</cite></a>
@@ -352,9 +354,10 @@
   the ability to select and copy text from SVG content to the
   system clipboard.</li>
 
-  <li>The viewer must have complete support for an
-  ECMAScript binding of the <a href="svgdom.html">SVG Document Object Model</a>
-  [<a href="refs.html#ref-ECMA-262">ECMA-262</a>].</li>
+  <li>The viewer must be a
+  <a href="http://www.w3.org/TR/2012/CR-WebIDL-20120419/#dfn-conforming-ecmascript-implementation">conforming ECMAScript implementation</a>
+  of all the IDL fragments in this specification.
+  [<a href="refs.html#ref-WEBIDL">WEBIDL</a>]</li>
 </ul>
 
 <p>The <a href="http://www.w3.org/WAI/">Web Accessibility Initiative</a>
@@ -416,18 +419,18 @@
 <p>A <em>Conforming SVG Viewer</em> must be able to apply
 styling properties to SVG content using <a>presentation attributes</a>.</p>
 
-<p>If the user agent supports <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/"><cite>Cascading Style Sheets, level 2</cite></a>
-[<a href="refs.html#ref-CSS2">CSS2</a>], a
+<p>If the user agent supports <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style Sheets, level 2 revision 1</cite></a>
+[<a href="refs.html#ref-CSS21">CSS21</a>], a
 <em>Conforming SVG Viewer</em> must support CSS styling of SVG
 content and must support all features from
-CSS2 that are described in this specification as applying to SVG (see
+CSS 2.1 that are described in this specification as applying to SVG (see
 <a href="styling.html#PropertiesFromCSS2">properties shared with CSS and XSL</a>,
 <a href="styling.html#StylingWithCSS">Styling with CSS</a> and
 <a href="styling.html#SVGUseOfCSS">Facilities from CSS and XSL used by SVG</a>).
-The supported features from CSS2 must be implemented in accordance with
-the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/conform.html#conformance">conformance
-definitions from the CSS2 specification</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 3.2).</p>
+The supported features from CSS 2.1 must be implemented in accordance with
+the <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/conform.html#conformance">conformance
+definitions from the CSS 2.1 specification</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 3.2).</p>
 
 <p>If the user agent includes an HTML or XHTML viewing
 capability or can apply CSS/XSL styling properties to XML
--- a/master/coords.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/coords.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,31 +6,25 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
-<div class="annotation">
-	<p>SVG2 Requirement: Support the object sizing properties from css3-images.</p>
-	<p>Resolution: SVG 2 will require object-fit and object-position.</p>
-	<p><a href="http://www.w3.org/2011/03/03-svg-minutes.html#item01">Auckland F2F Minutes 2012 Day 3</a>.</p>
-	<p>Purpose: To provide more usable object fitting functionality and to align with CSS.</p>
-	<p>Owner: Cameron.</p>
-</div>
-
 <h1>Coordinate Systems, Transformations and Units</h1>
 
 <h2 id="Introduction">Introduction</h2>
 
-<p>For all media, the <a>SVG canvas</a>
+<p>For all media, the <dfn id="SVGCanvas">SVG canvas</dfn>
 describes "the space where the SVG content is rendered." The
 canvas is infinite for each dimension of the space, but
 rendering occurs relative to a finite rectangular region of the
-canvas. This finite rectangular region is called the <a>SVG viewport</a>.
-For <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group'>visual media</a>
-([<a href='refs.html#ref-CSS2'>CSS2</a>], section 7.3.1)
+canvas. This finite rectangular region is called the <dfn>SVG viewport</dfn>.
+For <a href='http://www.w3.org/TR/2011/REC-CSS2-20110607/media.html#visual-media-group'>visual media</a>
+([<a href='refs.html#ref-CSS21'>CSS21</a>], section 7.3.1)
 the SVG viewport is the viewing area where the user sees the SVG content.</p>
 
 <p>The size of the SVG viewport (i.e., its width and height) is
@@ -50,8 +44,8 @@
   <li>(highly desirable but not required) a real number value
   that indicates the size in real world units, such as
   millimeters, of a "pixel" (i.e., a <em>px</em> unit
-  <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#length-units'>as defined in CSS2</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.2)</li>
+  <a href='http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#length-units'>as defined in CSS 2.1</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.3.2)</li>
 </ul>
 
 <p id="SVGInitialUserCoordinateSystem">Using the above information, the SVG user agent determines
@@ -102,7 +96,7 @@
 
 <h2 id="ViewportSpace">The initial viewport</h2>
 
-<p>The SVG user agent negotiates with its parent user agent to
+<p id="SVGViewport">The SVG user agent negotiates with its parent user agent to
 determine the viewport into which the SVG user agent can render
 the document. In some circumstances, SVG content will be
 embedded (<a href="concepts.html#UsageOptions">by reference or
@@ -130,11 +124,11 @@
   content is embedded inline within a containing document;</li>
 
   <li>and the referencing element or containing document is
-  styled using CSS [<a href="refs.html#ref-CSS2">CSS2</a>] or
+  styled using CSS [<a href="refs.html#ref-CSS21">CSS21</a>] or
   XSL [<a href="refs.html#ref-XSL">XSL</a>];</li>
 
-  <li>and there are <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#positioning-scheme">CSS-compatible positioning properties</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 9.3)
+  <li>and there are <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html#positioning-scheme">CSS-compatible positioning properties</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 9.3)
    specified on the referencing element (e.g.,
   the <span class="element-name">'object'</span> element) or on
   the containing document's <a>outermost svg element</a> that are sufficient
@@ -145,7 +139,7 @@
 the viewport's width.</p>
 
 <p>Similarly, if there are
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#positioning-scheme">positioning properties</a>
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html#positioning-scheme">positioning properties</a>
 specified on the referencing element or on the
 <a>outermost svg element</a> that are
 sufficient to establish the height of the viewport, then these
@@ -198,13 +192,13 @@
 two coordinates systems are identical. The origin of both
 coordinate systems is at the origin of the viewport, and one
 unit in the initial coordinate system equals one "pixel" (i.e.,
-a <em>px</em> unit <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#length-units">as defined in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.2)
+a <em>px</em> unit <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#length-units">as defined in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.3.2)
 in the viewport. In most cases, such as
 stand-alone SVG documents or SVG document fragments embedded
 (<a href="concepts.html#UsageOptions">by reference or
 inline</a>) within XML parent documents where the parent's
-layout is determined by CSS [<a href="refs.html#ref-CSS2">CSS2</a>] or
+layout is determined by CSS [<a href="refs.html#ref-CSS21">CSS21</a>] or
 XSL [<a href="refs.html#ref-XSL">XSL</a>], the initial viewport
 coordinate system (and therefore the initial user coordinate
 system) has its origin at the top/left of the viewport, with
@@ -217,7 +211,7 @@
 to the right.</p>
 
 <p>If the SVG implementation is part of a user agent which
-supports styling XML documents using CSS2 compatible
+supports styling XML documents using CSS 2.1 compatible
 <em>px</em> units, then the SVG user agent should get its
 initial value for the size of a <em>px</em> unit in real world
 units to match the value used for other XML styling operations;
@@ -225,8 +219,8 @@
 <em>px</em> unit from its environment, it should use that
 value; otherwise, it should choose an appropriate size for one
 <em>px</em> unit. In all cases, the size of a <em>px</em> must
-be in conformance with <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#length-units">the rules described in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.2).</p>
+be in conformance with <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#length-units">the rules described in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.3.2).</p>
 
 <p id="ExampleInitialCoords"><span class="example-ref">Example InitialCoords</span> below
 shows that the initial coordinate system has the origin at the
@@ -248,18 +242,24 @@
 <a>'marker element'</a>,
 <a>'pattern'</a> and the
 <a>'view'</a> element.
-The <a>'transform'</a> and <a>'viewBox'</a> attributes transform user
+The <a>'transform'</a> property and <a>'viewBox'</a> attribute transform user
 space coordinates and lengths on sibling attributes on the
-given element (see <a
-href="coords.html#TransformAttributeEffectOnSiblingAttributes">effect
-of the <span class="attr-name">'transform'</span> attribute on
-sibling attributes</a> and <a
-href="coords.html#ViewBoxAttributeEffectOnSiblingAttributes">effect
+given element (see
+<!--
+<a href="coords.html#TransformAttributeEffectOnSiblingAttributes">effect of the <span class="attr-name">'transform'</span> attribute on sibling attributes</a>
+-->
+<i>effect of the <span class="property">'transform'</span> attribute on sibling attributes</i>
+and <a href="coords.html#ViewBoxAttributeEffectOnSiblingAttributes">effect
 of the <span class="attr-name">'viewBox'</span> attribute on
 sibling attributes</a>) and all of its descendants.
 Transformations can be nested, in which case the effect of the
 transformations are cumulative.</p>
 
+<p class="issue">The section "effect of the transform attribute on sibling attributes"
+has been removed since we now reference the <a>'transform'</a> property, but we probably
+should still include a similar section on how the property affects attributes on the
+element.</p>
+
 <p id="ExampleOrigCoordSys"><span class="example-ref">Example OrigCoordSys</span> below
 shows a document without transformations. The text string is
 specified in the <a
@@ -345,7 +345,7 @@
 <table class="propdef">
   <tr>
     <th>Name:</th>
-    <td><dfn id="TransformProperty">transform</dfn></td>
+    <td><dfn>transform</dfn></td>
   </tr>
   <tr>
     <th><a>Animatable</a>:</th>
@@ -420,8 +420,8 @@
 &lt;/svg&gt;
 </pre>
 
-<table summary="Example ViewBox">
-  <caption align="bottom">
+<table >
+  <caption>
     Example ViewBox
   </caption>
   <tr>
@@ -499,10 +499,12 @@
 class="attr-value">&lt;min-y&gt;</span>.)</p>
 
 <p id="ViewBoxAttributeEffectOnSiblingAttributes">Unlike the
-<a>'transform'</a> attribute (see <a
-href="coords.html#TransformAttributeEffectOnSiblingAttributes">effect
-of the <span class="attr-name">'transform'</span> on sibling
-attributes</a>), the automatic transformation that is created
+<a>'transform'</a> property (see
+<!--
+<a href="coords.html#TransformAttributeEffectOnSiblingAttributes">effect of the <span class="attr-name">'transform'</span> on sibling attributes</a>),
+-->
+<i>effect of the <span class="attr-name">'transform'</span> attribute on sibling attributes</i>),
+the automatic transformation that is created
 due to a <a>'viewBox'</a> does not affect
 the <span class="attr-name">'x'</span>, <span
 class="attr-name">'y'</span>, <span
@@ -518,12 +520,14 @@
 the <a>'svg/width'</a> and <a>'svg/height'</a> attributes
 represent values in the coordinate system that exists <em>before</em> the
 <a>'viewBox'</a> transformation is applied. On
-the other hand, like the <a>'transform'</a> attribute, it does
+the other hand, like the <a>'transform'</a> property, it does
 establish a new coordinate system for all other attributes and
 for descendant elements.</p>
 
-<p>For the <a>'viewBox'</a>
-attribute:</p>
+<p class="issue">Link to the "effect of the 'transform' attribute on sibling attributes"
+in the above paragraph needs to be update.</p>
+
+<p>For the <a>'viewBox'</a> attribute:</p>
 
 <p>&nbsp;&nbsp;&nbsp;&nbsp;<span class="anim-target"><a
 href="animate.html#Animatable">Animatable</a>:
@@ -999,7 +1003,7 @@
 by setting a specified attribute to <span class="attr-value">'objectBoundingBox'</span>
 on the given element:</p>
 
-<table class='vert' summary="Object bounding box units rules">
+<table class='vert'>
   <tr>
     <th>Element</th>
     <th>Attribute</th>
@@ -1072,7 +1076,7 @@
       <td><a>'filter element'</a></td>
       <td><a>'filterUnits'</a></td>
       <td>Indicates that the attributes which define the
-      <a href="filters.html#FilterEffectsRegion">filter effects region</a>
+      <a>filter effects region</a>
       (<a>'x'</a>, <a>'y'</a>, <a>'width'</a>, <a>'height'</a>) represent
       fractions or percentages of the bounding box of the element to which
       the filter is applied.</td>
@@ -1297,10 +1301,10 @@
 <p>The main purpose of such metadata is to indicate to the user agent
 that two or more SVG documents can be overlayed or merged into a single
 document. Obviously, if two maps reference the same Coordinate Reference
-System definition and have the same SVG <a>'transform'</a> attribute
+System definition and have the same SVG <a>'transform'</a> property
 value then they can be overlayed without reprojecting the data. If
 the maps reference different Coordinate Reference Systems and/or have
-different SVG <a>'transform'</a> attribute values, then a specialized
+different SVG <a>'transform'</a> property values, then a specialized
 cartographic user agent may choose to transform the coordinate data to
 overlay the data. However, typical SVG user agents are not required
 to perform these types of transformations, or even recognize the
@@ -1316,11 +1320,11 @@
     <dt id="SVGGlobalTransformAttributeDefinition"><span class="adef">svg:transform</span> = <span class="attr-value">"<a href="#TransformProperty">&lt;transform&gt;</a>" | "none"</span></dt>
     <dd>
       <dl>
-        <dt><span class="attr-value"><a href="#TransformAttribute">&lt;transform&gt;</a></span></dt>
+        <dt><span class="attr-value"><a href="#TransformProperty">&lt;transform&gt;</a></span></dt>
         <dd>
           <p>Specifies the affine transformation that has been
           applied to the map data. The syntax is identical to
-          that described in <a href="#TransformProperty">The <span class="property">'transform'</span> attribute</a>
+          that described in <a href="#TransformProperty">The <span class="property">'transform'</span> property</a>
           section.</p>
         </dd>
 
@@ -1343,7 +1347,7 @@
 transformation that may have been applied during this
 mapping. This attribute may be added to the OpenGIS
 <span class="element-name">'CoordinateReferenceSystem'</span> element. Note
-that, unlike the <a>'transform'</a> attribute, it does not indicate that
+that, unlike the <a>'transform'</a> property, it does not indicate that
 a transformation is to <em>be applied</em> to the data within the file.
 Instead, it simply describes the transformation that <em>was already
 applied</em> to the data when being encoded in SVG.</p>
@@ -1422,109 +1426,78 @@
 
 <p>If an <a>SVGPoint</a> object is designated as <em>read only</em>,
 then attempting to assign to one of its attributes will result in
-an exception being thrown.
-</p>
+an exception being thrown.</p>
+
 <pre class="idl">interface <b>SVGPoint</b> {
 
-  attribute float <a href="coords.html#__svg__SVGPoint__x">x</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGPoint__y">y</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPoint__matrixTransform">matrixTransform</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix);
-};</pre><dl class="interface">
-<dt class="attributes-header">Attributes:</dt>
-<dd>
-<dl class="attributes">
-
-<dt id="__svg__SVGPoint__x" class="attribute first-child"><b>x</b><span class="idl-type-parenthetical"> (float)</span></dt>
-<dd class="attribute">
-<div>
-The x coordinate.
-
-
-</div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised if the 
-<a>SVGPoint</a> object is read only, or corresponds to a DOM 
-attribute that is read only.
-
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGPoint__y" class="attribute"><b>y</b><span class="idl-type-parenthetical"> (float)</span></dt>
-<dd class="attribute">
-<div>
-The y coordinate.
-
-
-</div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised if the 
-<a>SVGPoint</a> object is read only, or corresponds to a DOM 
-attribute that is read only.
-
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-<dt class="operations-header">Operations:</dt>
-<dd>
-<dl class="attributes">
-
-<dt id="__svg__SVGPoint__matrixTransform" class="operation first-child"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>matrixTransform</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)
-</dt>
-<dd class="operation">
-<div>
-
-<p>Applies a 2x3 matrix transformation on this <a>SVGPoint</a> object and
-returns a new, transformed <a>SVGPoint</a> object:
-</p>
-
-<pre>newpoint = matrix * thispoint</pre>
-
-</div>
-<dl class="operation">
-<dt class="parameters-header">Parameters</dt>
-<dd>
-<ol class="parameters">
-<li class="parameter first-child">
-<div><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var></div> 
-<div> The matrix which is to be applied to this <a>SVGPoint</a>
-object.
-
-</div>
-</li>
-</ol>
-</dd>
-<dt class="returns-header">Returns</dt>
-<dd>
-<div> A new <a>SVGPoint</a> object.
-
-</div>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
+  attribute float <a href="coords.html#__svg__SVGPoint__x">x</a>;
+  attribute float <a href="coords.html#__svg__SVGPoint__y">y</a>;
+
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPoint__matrixTransform">matrixTransform</a>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix);
+};</pre>
+
+<dl class="interface">
+  <dt class="attributes-header">Attributes:</dt>
+  <dd>
+    <dl class="attributes">
+      <dt id="__svg__SVGPoint__x" class="attribute first-child"><b>x</b><span class="idl-type-parenthetical"> (float)</span></dt>
+      <dd class="attribute">
+        <div>The x coordinate.</div>
+        <dl class="attribute">
+          <dt class="exceptions-header">Exceptions on setting</dt>
+          <dd>
+            <dl class="exceptions">
+              <dt class="exception"><a class="idlinterface" href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR</dt>
+              <dd class="exception">Raised if the <a>SVGPoint</a> object is read only.</dd>
+            </dl>
+          </dd>
+        </dl>
+      </dd>
+
+      <dt id="__svg__SVGPoint__y" class="attribute"><b>y</b><span class="idl-type-parenthetical"> (float)</span></dt>
+      <dd class="attribute">
+        <div>The y coordinate.</div>
+        <dl class="attribute">
+          <dt class="exceptions-header">Exceptions on setting</dt>
+          <dd>
+            <dl class="exceptions">
+              <dt class="exception"><a class="idlinterface" href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR</dt>
+              <dd class="exception">Raised if the <a>SVGPoint</a> object is read only.</dd>
+            </dl>
+          </dd>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
+
+  <dt class="operations-header">Operations:</dt>
+  <dd>
+    <dl class="attributes">
+      <dt id="__svg__SVGPoint__matrixTransform" class="operation first-child"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>matrixTransform</b>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)</dt>
+      <dd class="operation">
+        <div>
+          <p>Applies a 2x3 matrix transformation on this <a>SVGPoint</a> object and
+          returns a new, transformed <a>SVGPoint</a> object:</p>
+          <pre>newpoint = matrix * thispoint</pre>
+        </div>
+        <dl class="operation">
+          <dt class="parameters-header">Parameters</dt>
+          <dd>
+            <ol class="parameters">
+              <li class="parameter first-child">
+                <div><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var></div> 
+                <div>The matrix which is to be applied to this <a>SVGPoint</a> object.</div>
+              </li>
+            </ol>
+          </dd>
+          <dt class="returns-header">Returns</dt>
+          <dd>
+            <div>A new <a>SVGPoint</a> object.</div>
+          </dd>
+        </dl>
+      </dd>
+    </dl>
+  </dd>
 </dl>
 
 
@@ -1537,27 +1510,22 @@
 
 <p><a>SVGPointList</a> has the same attributes and methods as other
 SVGxxxList interfaces. Implementers may consider using a single base class
-to implement the various SVGxxxList interfaces.
-</p>
+to implement the various SVGxxxList interfaces.</p>
+
 <pre class="idl">interface <b>SVGPointList</b> {
 
   readonly attribute unsigned long <a href="coords.html#__svg__SVGPointList__numberOfItems">numberOfItems</a>;
 
-  void <a href="coords.html#__svg__SVGPointList__clear">clear</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__initialize">initialize</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__getItem">getItem</a>(in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__insertItemBefore">insertItemBefore</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem, in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__replaceItem">replaceItem</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem, in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__removeItem">removeItem</a>(in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__appendItem">appendItem</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  void <a href="coords.html#__svg__SVGPointList__clear">clear</a>();
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__initialize">initialize</a>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem);
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__getItem">getItem</a>(unsigned long index):
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__insertItemBefore">insertItemBefore</a>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem, unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__replaceItem">replaceItem</a>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem, unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__removeItem">removeItem</a>(unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <a href="coords.html#__svg__SVGPointList__appendItem">appendItem</a>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> newItem);
+};</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -1600,7 +1568,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__initialize" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>initialize</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>)
+<dt id="__svg__SVGPointList__initialize" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>initialize</b>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1645,7 +1613,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__getItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>getItem</b>(in unsigned long <var>index</var>)
+<dt id="__svg__SVGPointList__getItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>getItem</b>(unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1689,7 +1657,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__insertItemBefore" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>insertItemBefore</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>, in unsigned long <var>index</var>)
+<dt id="__svg__SVGPointList__insertItemBefore" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>insertItemBefore</b>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>, unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1745,7 +1713,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__replaceItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>replaceItem</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>, in unsigned long <var>index</var>)
+<dt id="__svg__SVGPointList__replaceItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>replaceItem</b>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>, unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1805,7 +1773,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__removeItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>removeItem</b>(in unsigned long <var>index</var>)
+<dt id="__svg__SVGPointList__removeItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>removeItem</b>(unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1854,7 +1822,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGPointList__appendItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>appendItem</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>)
+<dt id="__svg__SVGPointList__appendItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <b>appendItem</b>(<a class="idlinterface" href="coords.html#InterfaceSVGPoint">SVGPoint</a> <var>newItem</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -1923,31 +1891,27 @@
 [0 0 1]</pre>
 <pre class="idl">interface <b>SVGMatrix</b> {
 
-  attribute float <a href="coords.html#__svg__SVGMatrix__a">a</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGMatrix__b">b</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGMatrix__c">c</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGMatrix__d">d</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGMatrix__e">e</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="coords.html#__svg__SVGMatrix__f">f</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__multiply">multiply</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> secondMatrix);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__inverse">inverse</a>() raises(<a class="idlinterface" href="svgdom.html#ExceptionSVGException">SVGException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__translate">translate</a>(in float x, in float y);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__scale">scale</a>(in float scaleFactor);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__scaleNonUniform">scaleNonUniform</a>(in float scaleFactorX, in float scaleFactorY);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__rotate">rotate</a>(in float angle);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__rotateFromVector">rotateFromVector</a>(in float x, in float y) raises(<a class="idlinterface" href="svgdom.html#ExceptionSVGException">SVGException</a>);
+  attribute float <a href="coords.html#__svg__SVGMatrix__a">a</a>;
+  attribute float <a href="coords.html#__svg__SVGMatrix__b">b</a>;
+  attribute float <a href="coords.html#__svg__SVGMatrix__c">c</a>;
+  attribute float <a href="coords.html#__svg__SVGMatrix__d">d</a>;
+  attribute float <a href="coords.html#__svg__SVGMatrix__e">e</a>;
+  attribute float <a href="coords.html#__svg__SVGMatrix__f">f</a>;
+
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__multiply">multiply</a>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> secondMatrix);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__inverse">inverse</a>();
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__translate">translate</a>(float x, float y);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__scale">scale</a>(float scaleFactor);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__scaleNonUniform">scaleNonUniform</a>(float scaleFactorX, float scaleFactorY);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__rotate">rotate</a>(float angle);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__rotateFromVector">rotateFromVector</a>(float x, float y);
   <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__flipX">flipX</a>();
   <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__flipY">flipY</a>();
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__skewX">skewX</a>(in float angle);
-  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__skewY">skewY</a>(in float angle);
-};</pre><dl class="interface">
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__skewX">skewX</a>(float angle);
+  <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGMatrix__skewY">skewY</a>(float angle);
+};</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -1959,20 +1923,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGMatrix__b" class="attribute"><b>b</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -1982,20 +1932,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGMatrix__c" class="attribute"><b>c</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -2005,20 +1941,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGMatrix__d" class="attribute"><b>d</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -2028,20 +1950,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGMatrix__e" class="attribute"><b>e</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -2051,20 +1959,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGMatrix__f" class="attribute"><b>f</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -2074,20 +1968,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 </dl>
 </dd>
@@ -2095,7 +1975,7 @@
 <dd>
 <dl class="attributes">
 
-<dt id="__svg__SVGMatrix__multiply" class="operation first-child"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>multiply</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>secondMatrix</var>)
+<dt id="__svg__SVGMatrix__multiply" class="operation first-child"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>multiply</b>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>secondMatrix</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2143,10 +2023,10 @@
 <dt class="exceptions-header">Exceptions</dt>
 <dd>
 <dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface" href="svgdom.html#ExceptionSVGException">SVGException</a>, code SVG_MATRIX_NOT_INVERTABLE
+<dt class="exception first-child"><a>InvalidStateError</a>
 </dt>
 <dd class="exception"> Raised if this matrix is
-not invertable.
+not invertible.
 
 </dd>
 </dl>
@@ -2154,7 +2034,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__translate" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>translate</b>(in float <var>x</var>, in float <var>y</var>)
+<dt id="__svg__SVGMatrix__translate" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>translate</b>(float <var>x</var>, float <var>y</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2190,7 +2070,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__scale" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>scale</b>(in float <var>scaleFactor</var>)
+<dt id="__svg__SVGMatrix__scale" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>scale</b>(float <var>scaleFactor</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2220,7 +2100,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__scaleNonUniform" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>scaleNonUniform</b>(in float <var>scaleFactorX</var>, in float <var>scaleFactorY</var>)
+<dt id="__svg__SVGMatrix__scaleNonUniform" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>scaleNonUniform</b>(float <var>scaleFactorX</var>, float <var>scaleFactorY</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2256,7 +2136,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__rotate" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>rotate</b>(in float <var>angle</var>)
+<dt id="__svg__SVGMatrix__rotate" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>rotate</b>(float <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2286,7 +2166,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__rotateFromVector" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>rotateFromVector</b>(in float <var>x</var>, in float <var>y</var>)
+<dt id="__svg__SVGMatrix__rotateFromVector" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>rotateFromVector</b>(float <var>x</var>, float <var>y</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2324,7 +2204,7 @@
 <dt class="exceptions-header">Exceptions</dt>
 <dd>
 <dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface" href="svgdom.html#ExceptionSVGException">SVGException</a>, code SVG_INVALID_VALUE_ERR
+<dt class="exception first-child"><a>InvalidAccessError</a>
 </dt>
 <dd class="exception"> Raised if one of the
 parameters has an invalid value.
@@ -2373,7 +2253,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__skewX" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>skewX</b>(in float <var>angle</var>)
+<dt id="__svg__SVGMatrix__skewX" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>skewX</b>(float <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2403,7 +2283,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGMatrix__skewY" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>skewY</b>(in float <var>angle</var>)
+<dt id="__svg__SVGMatrix__skewY" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <b>skewY</b>(float <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2439,13 +2319,13 @@
 
 <h3 id="InterfaceSVGTransform">Interface SVGTransform</h3>
 
-
-<a>SVGTransform</a> is the interface for one of the component
+<p><a>SVGTransform</a> is the interface for one of the component
 transformations within an <a>SVGTransformList</a>; thus, an
 <a>SVGTransform</a> object corresponds to a single component (e.g.,
 <span class="attr-value">'scale(…)'</span> or
 <span class="attr-value">'matrix(…)'</span>) within a <a>'transform'</a>
-attribute specification.
+attribute specification.</p>
+
 <pre class="idl">interface <b>SVGTransform</b> {
 
   // Transform Types
@@ -2461,19 +2341,15 @@
   readonly attribute <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <a href="coords.html#__svg__SVGTransform__matrix">matrix</a>;
   readonly attribute float <a href="coords.html#__svg__SVGTransform__angle">angle</a>;
 
-  void <a href="coords.html#__svg__SVGTransform__setMatrix">setMatrix</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="coords.html#__svg__SVGTransform__setTranslate">setTranslate</a>(in float tx, in float ty) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="coords.html#__svg__SVGTransform__setScale">setScale</a>(in float sx, in float sy) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="coords.html#__svg__SVGTransform__setRotate">setRotate</a>(in float angle, in float cx, in float cy) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="coords.html#__svg__SVGTransform__setSkewX">setSkewX</a>(in float angle) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="coords.html#__svg__SVGTransform__setSkewY">setSkewY</a>(in float angle) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  void <a href="coords.html#__svg__SVGTransform__setMatrix">setMatrix</a>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix);
+  void <a href="coords.html#__svg__SVGTransform__setTranslate">setTranslate</a>(float tx, float ty);
+  void <a href="coords.html#__svg__SVGTransform__setScale">setScale</a>(float sx, float sy);
+  void <a href="coords.html#__svg__SVGTransform__setRotate">setRotate</a>(float angle, float cx, float cy);
+  void <a href="coords.html#__svg__SVGTransform__setSkewX">setSkewX</a>(float angle);
+  void <a href="coords.html#__svg__SVGTransform__setSkewY">setSkewY</a>(float angle);
+};</pre>
+
+<dl class="interface">
 <dt class="constants-header">Constants in group “Transform Types”:</dt>
 <dd>
 <dl class="constants">
@@ -2627,7 +2503,7 @@
 <dd>
 <dl class="attributes">
 
-<dt id="__svg__SVGTransform__setMatrix" class="operation first-child">void <b>setMatrix</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)
+<dt id="__svg__SVGTransform__setMatrix" class="operation first-child">void <b>setMatrix</b>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2654,22 +2530,10 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
 </dl>
 </dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGTransform__setTranslate" class="operation">void <b>setTranslate</b>(in float <var>tx</var>, in float <var>ty</var>)
+
+<dt id="__svg__SVGTransform__setTranslate" class="operation">void <b>setTranslate</b>(float <var>tx</var>, float <var>ty</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2696,22 +2560,10 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
 </dl>
 </dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGTransform__setScale" class="operation">void <b>setScale</b>(in float <var>sx</var>, in float <var>sy</var>)
+
+<dt id="__svg__SVGTransform__setScale" class="operation">void <b>setScale</b>(float <var>sx</var>, float <var>sy</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2738,22 +2590,10 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
 </dl>
 </dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGTransform__setRotate" class="operation">void <b>setRotate</b>(in float <var>angle</var>, in float <var>cx</var>, in float <var>cy</var>)
+
+<dt id="__svg__SVGTransform__setRotate" class="operation">void <b>setRotate</b>(float <var>angle</var>, float <var>cx</var>, float <var>cy</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2787,22 +2627,10 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
 </dl>
 </dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGTransform__setSkewX" class="operation">void <b>setSkewX</b>(in float <var>angle</var>)
+
+<dt id="__svg__SVGTransform__setSkewX" class="operation">void <b>setSkewX</b>(float <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2823,22 +2651,10 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
 </dl>
 </dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGTransform__setSkewY" class="operation">void <b>setSkewY</b>(in float <var>angle</var>)
+
+<dt id="__svg__SVGTransform__setSkewY" class="operation">void <b>setSkewY</b>(float <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -2859,18 +2675,6 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
 </dl>
 </dd>
 </dl>
@@ -2887,7 +2691,7 @@
 
 <p>The <a>SVGTransformList</a> and <a>SVGTransform</a> interfaces correspond
 to the various attributes which specify a set of transformations, such as
-the <a>'transform'</a> attribute which is available for many of SVG's elements.
+the <a>'transform'</a> property which is available for many of SVG's elements.
 </p>
 
 
@@ -2905,24 +2709,18 @@
 
   readonly attribute unsigned long <a href="coords.html#__svg__SVGTransformList__numberOfItems">numberOfItems</a>;
 
-  void <a href="coords.html#__svg__SVGTransformList__clear">clear</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__initialize">initialize</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__getItem">getItem</a>(in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__insertItemBefore">insertItemBefore</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem, in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__replaceItem">replaceItem</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem, in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__removeItem">removeItem</a>(in unsigned long index) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__appendItem">appendItem</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__createSVGTransformFromMatrix">createSVGTransformFromMatrix</a>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix);
-  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__consolidate">consolidate</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  void <a href="coords.html#__svg__SVGTransformList__clear">clear</a>();
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__initialize">initialize</a>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__getItem">getItem</a>(unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__insertItemBefore">insertItemBefore</a>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem, unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__replaceItem">replaceItem</a>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem, unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__removeItem">removeItem</a>(unsigned long index);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__appendItem">appendItem</a>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> newItem);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__createSVGTransformFromMatrix">createSVGTransformFromMatrix</a>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> matrix);
+  <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <a href="coords.html#__svg__SVGTransformList__consolidate">consolidate</a>();
+};</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -2956,8 +2754,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -2966,7 +2763,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__initialize" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>initialize</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>)
+<dt id="__svg__SVGTransformList__initialize" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>initialize</b>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3002,8 +2799,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3012,7 +2808,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__getItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>getItem</b>(in unsigned long <var>index</var>)
+<dt id="__svg__SVGTransformList__getItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>getItem</b>(unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3056,7 +2852,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__insertItemBefore" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>insertItemBefore</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>, in unsigned long <var>index</var>)
+<dt id="__svg__SVGTransformList__insertItemBefore" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>insertItemBefore</b>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>, unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3103,8 +2899,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3113,7 +2908,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__replaceItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>replaceItem</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>, in unsigned long <var>index</var>)
+<dt id="__svg__SVGTransformList__replaceItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>replaceItem</b>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>, unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3157,8 +2952,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3174,7 +2968,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__removeItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>removeItem</b>(in unsigned long <var>index</var>)
+<dt id="__svg__SVGTransformList__removeItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>removeItem</b>(unsigned long <var>index</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3207,8 +3001,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3224,7 +3017,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__appendItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>appendItem</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>)
+<dt id="__svg__SVGTransformList__appendItem" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>appendItem</b>(<a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <var>newItem</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3260,8 +3053,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3270,7 +3062,7 @@
 </dl>
 </dd>
 
-<dt id="__svg__SVGTransformList__createSVGTransformFromMatrix" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>createSVGTransformFromMatrix</b>(in <a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)
+<dt id="__svg__SVGTransformList__createSVGTransformFromMatrix" class="operation"><a class="idlinterface" href="coords.html#InterfaceSVGTransform">SVGTransform</a> <b>createSVGTransformFromMatrix</b>(<a class="idlinterface" href="coords.html#InterfaceSVGMatrix">SVGMatrix</a> <var>matrix</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3336,8 +3128,7 @@
 <dt class="exception first-child"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the list
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the list is
 <a href="#ReadOnlyTransformList">read only</a>.
 
 </dd>
@@ -3354,7 +3145,7 @@
 
 
 Used for the various attributes which specify a set of transformations,
-such as the <a>'transform'</a> attribute which is available for many of
+such as the <a>'transform'</a> property which is available for many of
 SVG's elements, and which can be animated.
 <pre class="idl">interface <b>SVGAnimatedTransformList</b> {
   readonly attribute <a class="idlinterface" href="coords.html#InterfaceSVGTransformList">SVGTransformList</a> <a href="coords.html#__svg__SVGAnimatedTransformList__baseVal">baseVal</a>;
@@ -3421,11 +3212,11 @@
   const unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__SVG_MEETORSLICE_MEET">SVG_MEETORSLICE_MEET</a> = 1;
   const unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__SVG_MEETORSLICE_SLICE">SVG_MEETORSLICE_SLICE</a> = 2;
 
-  attribute unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__align">align</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__meetOrSlice">meetOrSlice</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  attribute unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__align">align</a>;
+  attribute unsigned short <a href="coords.html#__svg__SVGPreserveAspectRatio__meetOrSlice">meetOrSlice</a>;
+};</pre>
+
+<dl class="interface">
 <dt class="constants-header">Constants in group “Alignment Types”:</dt>
 <dd>
 <dl class="constants">
@@ -3609,9 +3400,7 @@
 <dt class="exception"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the object
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
-<a href="#ReadOnlyPreserveAspectRatio">read only</a>.
+<dd class="exception"> Raised when the object is <a href="#ReadOnlyPreserveAspectRatio">read only</a>.
 
 
 </dd>
@@ -3635,8 +3424,7 @@
 <dt class="exception"><a class="idlinterface"
    href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
 </dt>
-<dd class="exception"> Raised when the object
-corresponds to a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a> or when the object itself is
+<dd class="exception"> Raised when the object is
 <a href="#ReadOnlyPreserveAspectRatio">read only</a>.
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/master/definitions-filters.xml	Fri Sep 07 16:16:40 2012 +1000
@@ -0,0 +1,440 @@
+<!-- Definitions for Filter Effects 1.0. -->
+
+<definitions xmlns='http://mcc.id.au/ns/local' xmlns:x='http://mcc.id.au/ns/local'>
+
+  <!-- === defined in this specification ================================== -->
+
+  <!-- ... elements and element-specific attributes ....................... -->
+
+  <element
+      name='feBlend'
+      href='#feBlendElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEBlendElement'>
+    <attribute name='in2' href='#feBlendIn2Attribute' animatable='yes'/>
+    <attribute name='mode' href='#feBlendModeAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feCustom'
+      href='#feCustomElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      interfaces='SVGFECustomElement'>
+    <attribute name='vertexShader' href='#feCustomVertexShaderAttribute' animatable='yes'/>
+    <attribute name='fragmentShader' href='#feCustomFragmentShaderAttribute' animatable='yes'/>
+    <attribute name='vertexMesh' href='#feCustomVertexMeshAttribute' animatable='yes'/>
+    <attribute name='params' href='#feCustomParamsAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feColorMatrix'
+      href='#feColorMatrixElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEColorMatrixElement'>
+    <attribute name='type' href='#feColorMatrixTypeAttribute' animatable='yes'/>
+    <attribute name='values' href='#feColorMatrixValuesAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feComponentTransfer'
+    href='#feComponentTransferElement'
+    contentmodel='anyof'
+    elements='feFuncR, feFuncG, feFuncB, feFuncA'
+    attributecategories='core, style, presentation, filter primitive'
+    attributes='in'
+    interfaces='SVGFEComponentTransferElement'/>
+
+  <element
+      name='feComposite'
+      href='#feCompositeElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFECompositeElement'>
+    <attribute name='in2' href='#feCompositeIn2Attribute' animatable='yes'/>
+    <attribute name='operator' href='#feCompositeOperatorAttribute' animatable='yes'/>
+    <attribute name='k1' href='#feCompositeK1Attribute' animatable='yes'/>
+    <attribute name='k2' href='#feCompositeK2Attribute' animatable='yes'/>
+    <attribute name='k3' href='#feCompositeK3Attribute' animatable='yes'/>
+    <attribute name='k4' href='#feCompositeK4Attribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feConvolveMatrix'
+      href='#feConvolveMatrixElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEConvolveMatrixElement'>
+    <attribute name='order' href='#feConvolveMatrixElementOrderAttribute' animatable='yes'/>
+    <attribute name='kernelMatrix' href='#feConvolveMatrixElementKernelMatrixAttribute' animatable='yes'/>
+    <attribute name='divisor' href='#feConvolveMatrixElementDivisorAttribute' animatable='yes'/>
+    <attribute name='bias' href='#feConvolveMatrixElementBiasAttribute' animatable='yes'/>
+    <attribute name='targetX' href='#feConvolveMatrixElementTargetXAttribute' animatable='yes'/>
+    <attribute name='targetY' href='#feConvolveMatrixElementTargetYAttribute' animatable='yes'/>
+    <attribute name='edgeMode' href='#feConvolveMatrixElementEdgeModeAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feConvolveMatrixElementKernelUnitLengthAttribute' animatable='yes'/>
+    <attribute name='preserveAlpha' href='#feConvolveMatrixElementPreserveAlphaAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDiffuseLighting'
+      href='#feDiffuseLightingElement'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDiffuseLightingElement'>
+    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
+    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
+    <attribute name='surfaceScale' href='#feDiffuseLightingSurfaceScaleAttribute' animatable='yes'/>
+    <attribute name='diffuseConstant' href='#feDiffuseLightingDiffuseConstantAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feDiffuseLightingKernelUnitLengthAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDisplacementMap'
+      href='#feDisplacementMapElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDisplacementMapElement'>
+    <attribute name='in2' href='#feDisplacementMapIn2Attribute' animatable='yes'/>
+    <attribute name='scale' href='#feDisplacementMapScaleAttribute' animatable='yes'/>
+    <attribute name='xChannelSelector' href='#feDisplacementMapXChannelSelectorAttribute' animatable='yes'/>
+    <attribute name='yChannelSelector' href='#feDisplacementMapYChannelSelectorAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDistantLight'
+      href='#feDistantLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFEDistantLightElement'>
+    <attribute name='azimuth' href='#feDistantLightAzimuthAttribute' animatable='yes'/>
+    <attribute name='elevation' href='#feDistantLightElevationAttribute' animatable='yes'/>
+  </element>
+
+    <element
+      name='feDropShadow'
+      href='#feDropShadowElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDropShadowElement'>
+    <attribute name='stdDeviation' href='#feDropShadowStdDeviationAttribute' animatable='yes'/>
+    <attribute name='dx' href='#feDropShadowDxAttribute' animatable='yes'/>
+    <attribute name='dy' href='#feDropShadowDyAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feFlood'
+    href='#feFloodElement'
+    contentmodel='anyof'
+    elements='animate, set, animateColor'
+    attributecategories='core, style, presentation, filter primitive'
+    interfaces='SVGFEFloodElement'/>
+
+  <element
+    name='feFuncR'
+    href='#feFuncRElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncRElement'/>
+
+  <element
+    name='feFuncG'
+    href='#feFuncGElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncGElement'/>
+
+  <element
+    name='feFuncB'
+    href='#feFuncBElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncBElement'/>
+
+  <element
+    name='feFuncA'
+    href='#feFuncAElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncAElement'/>
+
+  <element
+      name='feGaussianBlur'
+      href='#feGaussianBlurElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEGaussianBlurElement'>
+    <attribute name='stdDeviation' href='#feGaussianBlurStdDeviationAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feImage'
+      href='#feImageElement'
+      contentmodel='anyof'
+      elements='animate, set, animateTransform'
+      attributecategories='core, style, presentation, filter primitive, xlink'
+      attributes='externalResourcesRequired, preserveAspectRatio'
+      interfaces='SVGFEImageElement'>
+    <attribute name='xlink:href' href='#feImageElementHrefAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feMerge'
+    href='#feMergeElement'
+    contentmodel='anyof'
+    elements='feMergeNode'
+    attributecategories='core, style, presentation, filter primitive'
+    interfaces='SVGFEMergeElement'/>
+
+  <element
+      name='feMergeNode'
+      href='#feMergeNodeElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      attributes='in'
+      interfaces='SVGFEMergeNodeElement'/>
+
+  <element
+      name='feMorphology'
+      href='#feMorphologyElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEMorphologyElement'>
+    <attribute name='operator' href='#feMorphologyOperatorAttribute' animatable='yes'/>
+    <attribute name='radius' href='#feMorphologyRadiusAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feOffset'
+      href='#feOffsetElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEOffsetElement'>
+    <attribute name='dx' href='#feOffsetDxAttribute' animatable='yes'/>
+    <attribute name='dy' href='#feOffsetDyAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='fePointLight'
+      href='#fePointLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFEPointLightElement'>
+    <attribute name='x' href='#fePointLightXAttribute' animatable='yes'/>
+    <attribute name='y' href='#fePointLightYAttribute' animatable='yes'/>
+    <attribute name='z' href='#fePointLightZAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feSpecularLighting'
+      href='#feSpecularLightingElement'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFESpecularLightingElement'>
+    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
+    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
+    <attribute name='surfaceScale' href='#feSpecularLightingSurfaceScaleAttribute' animatable='yes'/>
+    <attribute name='specularConstant' href='#feSpecularLightingSpecularConstantAttribute' animatable='yes'/>
+    <attribute name='specularExponent' href='#feSpecularLightingSpecularExponentAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feSpecularLightingKernelUnitLengthAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feSpotLight'
+      href='#feSpotLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFESpotLightElement'>
+    <attribute name='x' href='#feSpotLightXAttribute' animatable='yes'/>
+    <attribute name='y' href='#feSpotLightYAttribute' animatable='yes'/>
+    <attribute name='z' href='#feSpotLightZAttribute' animatable='yes'/>
+    <attribute name='pointsAtX' href='#feSpotLightPointsAtXAttribute' animatable='yes'/>
+    <attribute name='pointsAtY' href='#feSpotLightPointsAtYAttribute' animatable='yes'/>
+    <attribute name='pointsAtZ' href='#feSpotLightPointsAtZAttribute' animatable='yes'/>
+    <attribute name='specularExponent' href='#feSpotLightSpecularExponentAttribute' animatable='yes'/>
+    <attribute name='limitingConeAngle' href='#feSpotLightLimitingConeAngleAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feTile'
+    href='#feTileElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, style, presentation, filter primitive'
+    attributes='in'
+    interfaces='SVGFETileElement'/>
+
+  <element
+      name='feTurbulence'
+      href='#feTurbulenceElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      interfaces='SVGFETurbulenceElement'>
+    <attribute name='baseFrequency' href='#feTurbulenceBaseFrequencyAttribute' animatable='yes'/>
+    <attribute name='numOctaves' href='#feTurbulenceNumOctavesAttribute' animatable='yes'/>
+    <attribute name='seed' href='#feTurbulenceSeedAttribute' animatable='yes'/>
+    <attribute name='stitchTiles' href='#feTurbulenceStitchTilesAttribute' animatable='yes'/>
+    <attribute name='type' href='#feTurbulenceTypeAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feUnsharpMask'
+      href='#feUnsharpMaskElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      interfaces='SVGFETurbulenceElement'>
+    <attribute name='amount' href='#feUnsharpMaskAmountAttribute' animatable='yes'/>
+    <attribute name='threshold' href='#feUnsharpMaskThresholdAttribute' animatable='yes'/>
+    <attribute name='stdDeviation' href='#feUnsharpMaskStdDeviationAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='filter'
+      href='#FilterElement'
+      contentmodel='anyof'
+      elementcategories='descriptive, filter primitive'
+      elements='animate, set'
+      attributecategories='core, style, presentation, xlink'
+      attributes='externalResourcesRequired'
+      interfaces='SVGFilterElement'>
+    <attribute name='x' href='#FilterElementXAttribute' animatable='yes'/>
+    <attribute name='y' href='#FilterElementYAttribute' animatable='yes'/>
+    <attribute name='width' href='#FilterElementWidthAttribute' animatable='yes'/>
+    <attribute name='height' href='#FilterElementHeightAttribute' animatable='yes'/>
+    <attribute name='filterRes' href='#FilterElementFilterResAttribute' animatable='yes'/>
+    <attribute name='filterUnits' href='#FilterElementFilterUnitsAttribute' animatable='yes'/>
+    <attribute name='primitiveUnits' href='#FilterElementPrimitiveUnitsAttribute' animatable='yes'/>
+    <attribute name='xlink:href' href='#FilterElementHrefAttribute' animatable='yes'/>
+  </element>
+
+  <!-- ... element categories ............................................ -->
+
+  <elementcategory name='filter primitive' href='#TermFilterPrimitiveElement' elements='feBlend, feFlood, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDiffuseLighting, feDisplacementMap, feDropShadow, feGaussianBlur, feImage, feMerge, feMorphology, feOffset, feSpecularLighting, feTile, feTurbulence, feUnsharpMask'/>
+  <elementcategory name='light source' href='#TermLightSourceElement' elements='feDistantLight, fePointLight, feSpotLight'/>
+  <elementcategory name='transfer function' href='#TermTransferFunctionElement' elements='feFuncR, feFuncG, feFuncB, feFuncA'/>
+
+  <!-- ... attributes common to multiple elements ........................ -->
+
+  <!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence) -->
+  <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDropShadow, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMorphology, feOffset, feSpecularLighting, feTile, feUnsharpMask' href='#FilterPrimitiveInAttribute' animatable='yes'/>
+
+  <!-- ... attribute categories .......................................... -->
+
+  <attributecategory
+      name='filter primitive'
+      href='#TermFilterPrimitiveAttributes'>
+    <attribute name='x' href='#FilterPrimitiveXAttribute' animatable='yes'/>
+    <attribute name='y' href='#FilterPrimitiveYAttribute' animatable='yes'/>
+    <attribute name='width' href='#FilterPrimitiveWidthAttribute' animatable='yes'/>
+    <attribute name='height' href='#FilterPrimitiveHeightAttribute' animatable='yes'/>
+    <attribute name='result' href='#FilterPrimitiveResultAttribute' animatable='yes'/>
+  </attributecategory>
+
+  <attributecategory
+      name='transfer function element'
+      href='#TransferFunctionElementAttributes'>
+    <attribute name='type' href='#feComponentTransferTypeAttribute' animatable='yes'/>
+    <attribute name='tableValues' href='#feComponentTransferTableValuesAttribute' animatable='yes'/>
+    <attribute name='slope' href='#feComponentTransferSlopeAttribute' animatable='yes'/>
+    <attribute name='intercept' href='#feComponentTransferInterceptAttribute' animatable='yes'/>
+    <attribute name='amplitude' href='#feComponentTransferAmplitudeAttribute' animatable='yes'/>
+    <attribute name='exponent' href='#feComponentTransferExponentAttribute' animatable='yes'/>
+    <attribute name='offset' href='#feComponentTransferOffsetAttribute' animatable='yes'/>
+  </attributecategory>
+
+  <!-- ... properties ..................................................... -->
+
+  <property name='color-interpolation-filters' href='#ColorInterpolationFiltersProperty'/>
+  <property name='enable-background' href='#EnableBackgroundProperty'/>
+  <property name='filter' href='#FilterProperty'/>
+  <property name='flood-color' href='#FloodColorProperty'/>
+  <property name='flood-opacity' href='#FloodOpacityProperty'/>
+  <property name='lighting-color' href='#LightingColorProperty'/>
+
+  <!-- ... interfaces ..................................................... -->
+
+  <interface name='SVGFilterElement' href='#InterfaceSVGFilterElement'/>
+  <interface name='SVGFilterPrimitiveStandardAttributes' href='#InterfaceSVGFilterPrimitiveStandardAttributes'/>
+  <interface name='SVGFEBlendElement' href='#InterfaceSVGFEBlendElement'/>
+  <interface name='SVGFECustomElement' href='#InterfaceSVGFECustomElement'/>
+  <interface name='SVGFEColorMatrixElement' href='#InterfaceSVGFEColorMatrixElement'/>
+  <interface name='SVGFEComponentTransferElement' href='#InterfaceSVGFEComponentTransferElement'/>
+  <interface name='SVGComponentTransferFunctionElement' href='#InterfaceSVGComponentTransferFunctionElement'/>
+  <interface name='SVGFEFuncRElement' href='#InterfaceSVGFEFuncRElement'/>
+  <interface name='SVGFEFuncGElement' href='#InterfaceSVGFEFuncGElement'/>
+  <interface name='SVGFEFuncBElement' href='#InterfaceSVGFEFuncBElement'/>
+  <interface name='SVGFEFuncAElement' href='#InterfaceSVGFEFuncAElement'/>
+  <interface name='SVGFECompositeElement' href='#InterfaceSVGFECompositeElement'/>
+  <interface name='SVGFEConvolveMatrixElement' href='#InterfaceSVGFEConvolveMatrixElement'/>
+  <interface name='SVGFEDiffuseLightingElement' href='#InterfaceSVGFEDiffuseLightingElement'/>
+  <interface name='SVGFEDistantLightElement' href='#InterfaceSVGFEDistantLightElement'/>
+  <interface name='SVGFEDropShadowElement' href='#InterfaceSVGFEDropShadowElement'/>
+  <interface name='SVGFEPointLightElement' href='#InterfaceSVGFEPointLightElement'/>
+  <interface name='SVGFESpotLightElement' href='#InterfaceSVGFESpotLightElement'/>
+  <interface name='SVGFEDisplacementMapElement' href='#InterfaceSVGFEDisplacementMapElement'/>
+  <interface name='SVGFEFloodElement' href='#InterfaceSVGFEFloodElement'/>
+  <interface name='SVGFEGaussianBlurElement' href='#InterfaceSVGFEGaussianBlurElement'/>
+  <interface name='SVGFEImageElement' href='#InterfaceSVGFEImageElement'/>
+  <interface name='SVGFEMergeElement' href='#InterfaceSVGFEMergeElement'/>
+  <interface name='SVGFEMergeNodeElement' href='#InterfaceSVGFEMergeNodeElement'/>
+  <interface name='SVGFEMorphologyElement' href='#InterfaceSVGFEMorphologyElement'/>
+  <interface name='SVGFEOffsetElement' href='#InterfaceSVGFEOffsetElement'/>
+  <interface name='SVGFESpecularLightingElement' href='#InterfaceSVGFESpecularLightingElement'/>
+  <interface name='SVGFETileElement' href='#InterfaceSVGFETileElement'/>
+  <interface name='SVGFETurbulenceElement' href='#InterfaceSVGFETurbulenceElement'/>
+  <interface name='SVGFEUnsharpMaskElement' href='#InterfaceSVGFEUnsharpMaskElement'/>
+
+  <!-- ... terms (these will be generated later) .......................... -->
+  <term name='filter primitive' href='#TermFilterPrimitiveElement'/>
+  <term name='filter primitives' href='#TermFilterPrimitiveElement'/>
+  <term name='filter primitive attribute' href='#TermFilterPrimitiveAttributes'/>
+  <term name='filter primitive attributes' href='#TermFilterPrimitiveAttributes'/>
+  <term name='filter region' href='#FilterEffectsRegion'/>
+  <term name='filter effects region' href='#FilterEffectsRegion'/>
+  <term name='filter primitive subregion' href='#FilterPrimitiveSubRegion'/>
+  <term name='user coordinate system' href='#TermUserCoordinateSystem'/>
+  <term name='SourceGraphic' href='#SourceGraphic'/>
+  <term name='SourceAlpha' href='#SourceAlpha'/>
+  <term name='BackgroundImage' href='#BackgroundImage'/>
+  <term name='BackgroundAlpha' href='#BackgroundAlpha'/>
+  <term name='FillPaint' href='#FillPaint'/>
+  <term name='StrokePaint' href='#StrokePaint'/>
+
+  <!-- === defined in other specifications ================================ -->
+
+  <term name='bounding box' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermBoundingBox'/>
+  <term name='lacuna value' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermLacunaValue'/>
+  <term name='unsupported' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermUnsupportedValue'/>
+  <term name='unsupported value' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermUnsupportedValue'/>
+</definitions>
--- a/master/definitions.xml	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/definitions.xml	Fri Sep 07 16:16:40 2012 +1000
@@ -195,299 +195,6 @@
   </element>
 
   <element
-      name='feBlend'
-      href='filters.html#feBlendElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEBlendElement'>
-    <attribute name='in2' href='filters.html#feBlendIn2Attribute' animatable='yes'/>
-    <attribute name='mode' href='filters.html#feBlendModeAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feColorMatrix'
-      href='filters.html#feColorMatrixElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEColorMatrixElement'>
-    <attribute name='type' href='filters.html#feColorMatrixTypeAttribute' animatable='yes'/>
-    <attribute name='values' href='filters.html#feColorMatrixValuesAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feComponentTransfer'
-    href='filters.html#feComponentTransferElement'
-    contentmodel='anyof'
-    elements='feFuncR, feFuncG, feFuncB, feFuncA'
-    attributecategories='core, style, presentation, filter primitive'
-    attributes='in'
-    interfaces='SVGFEComponentTransferElement'/>
-
-  <element
-      name='feComposite'
-      href='filters.html#feCompositeElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFECompositeElement'>
-    <attribute name='in2' href='filters.html#feCompositeIn2Attribute' animatable='yes'/>
-    <attribute name='operator' href='filters.html#feCompositeOperatorAttribute' animatable='yes'/>
-    <attribute name='k1' href='filters.html#feCompositeK1Attribute' animatable='yes'/>
-    <attribute name='k2' href='filters.html#feCompositeK2Attribute' animatable='yes'/>
-    <attribute name='k3' href='filters.html#feCompositeK3Attribute' animatable='yes'/>
-    <attribute name='k4' href='filters.html#feCompositeK4Attribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feConvolveMatrix'
-      href='filters.html#feConvolveMatrixElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEConvolveMatrixElement'>
-    <attribute name='order' href='filters.html#feConvolveMatrixElementOrderAttribute' animatable='yes'/>
-    <attribute name='kernelMatrix' href='filters.html#feConvolveMatrixElementKernelMatrixAttribute' animatable='yes'/>
-    <attribute name='divisor' href='filters.html#feConvolveMatrixElementDivisorAttribute' animatable='yes'/>
-    <attribute name='bias' href='filters.html#feConvolveMatrixElementBiasAttribute' animatable='yes'/>
-    <attribute name='targetX' href='filters.html#feConvolveMatrixElementTargetXAttribute' animatable='yes'/>
-    <attribute name='targetY' href='filters.html#feConvolveMatrixElementTargetYAttribute' animatable='yes'/>
-    <attribute name='edgeMode' href='filters.html#feConvolveMatrixElementEdgeModeAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feConvolveMatrixElementKernelUnitLengthAttribute' animatable='yes'/>
-    <attribute name='preserveAlpha' href='filters.html#feConvolveMatrixElementPreserveAlphaAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDiffuseLighting'
-      href='filters.html#feDiffuseLightingElement'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEDiffuseLightingElement'>
-    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
-    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
-    <attribute name='surfaceScale' href='filters.html#feDiffuseLightingSurfaceScaleAttribute' animatable='yes'/>
-    <attribute name='diffuseConstant' href='filters.html#feDiffuseLightingDiffuseConstantAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feDiffuseLightingKernelUnitLengthAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDisplacementMap'
-      href='filters.html#feDisplacementMapElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEDisplacementMapElement'>
-    <attribute name='in2' href='filters.html#feDisplacementMapIn2Attribute' animatable='yes'/>
-    <attribute name='scale' href='filters.html#feDisplacementMapScaleAttribute' animatable='yes'/>
-    <attribute name='xChannelSelector' href='filters.html#feDisplacementMapXChannelSelectorAttribute' animatable='yes'/>
-    <attribute name='yChannelSelector' href='filters.html#feDisplacementMapYChannelSelectorAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDistantLight'
-      href='filters.html#feDistantLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFEDistantLightElement'>
-    <attribute name='azimuth' href='filters.html#feDistantLightAzimuthAttribute' animatable='yes'/>
-    <attribute name='elevation' href='filters.html#feDistantLightElevationAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feFlood'
-    href='filters.html#feFloodElement'
-    contentmodel='anyof'
-    elements='animate, set, animateColor'
-    attributecategories='core, style, presentation, filter primitive'
-    interfaces='SVGFEFloodElement'/>
-
-  <element
-    name='feFuncA'
-    href='filters.html#feFuncAElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncAElement'/>
-
-  <element
-    name='feFuncB'
-    href='filters.html#feFuncBElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncBElement'/>
-
-  <element
-    name='feFuncG'
-    href='filters.html#feFuncGElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncGElement'/>
-
-  <element
-    name='feFuncR'
-    href='filters.html#feFuncRElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncRElement'/>
-
-  <element
-      name='feGaussianBlur'
-      href='filters.html#feGaussianBlurElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEGaussianBlurElement'>
-    <attribute name='stdDeviation' href='filters.html#feGaussianBlurStdDeviationAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feImage'
-      href='filters.html#feImageElement'
-      contentmodel='anyof'
-      elements='animate, set, animateTransform'
-      attributecategories='core, style, presentation, filter primitive, xlink'
-      attributes='preserveAspectRatio'
-      interfaces='SVGFEImageElement'>
-    <attribute name='xlink:href' href='filters.html#feImageElementHrefAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feMerge'
-    href='filters.html#feMergeElement'
-    contentmodel='anyof'
-    elements='feMergeNode'
-    attributecategories='core, style, presentation, filter primitive'
-    interfaces='SVGFEMergeElement'/>
-
-  <element
-      name='feMergeNode'
-      href='filters.html#feMergeNodeElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      attributes='in'
-      interfaces='SVGFEMergeNodeElement'/>
-
-  <element
-      name='feMorphology'
-      href='filters.html#feMorphologyElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEMorphologyElement'>
-    <attribute name='operator' href='filters.html#feMorphologyOperatorAttribute' animatable='yes'/>
-    <attribute name='radius' href='filters.html#feMorphologyRadiusAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feOffset'
-      href='filters.html#feOffsetElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEOffsetElement'>
-    <attribute name='dx' href='filters.html#feOffsetDxAttribute' animatable='yes'/>
-    <attribute name='dy' href='filters.html#feOffsetDyAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='fePointLight'
-      href='filters.html#fePointLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFEPointLightElement'>
-    <attribute name='x' href='filters.html#fePointLightXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#fePointLightYAttribute' animatable='yes'/>
-    <attribute name='z' href='filters.html#fePointLightZAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feSpecularLighting'
-      href='filters.html#feSpecularLightingElement'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFESpecularLightingElement'>
-    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
-    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
-    <attribute name='surfaceScale' href='filters.html#feSpecularLightingSurfaceScaleAttribute' animatable='yes'/>
-    <attribute name='specularConstant' href='filters.html#feSpecularLightingSpecularConstantAttribute' animatable='yes'/>
-    <attribute name='specularExponent' href='filters.html#feSpecularLightingSpecularExponentAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feSpecularLightingKernelUnitLengthAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feSpotLight'
-      href='filters.html#feSpotLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFESpotLightElement'>
-    <attribute name='x' href='filters.html#feSpotLightXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#feSpotLightYAttribute' animatable='yes'/>
-    <attribute name='z' href='filters.html#feSpotLightZAttribute' animatable='yes'/>
-    <attribute name='pointsAtX' href='filters.html#feSpotLightPointsAtXAttribute' animatable='yes'/>
-    <attribute name='pointsAtY' href='filters.html#feSpotLightPointsAtYAttribute' animatable='yes'/>
-    <attribute name='pointsAtZ' href='filters.html#feSpotLightPointsAtZAttribute' animatable='yes'/>
-    <attribute name='specularExponent' href='filters.html#feSpotLightSpecularExponentAttribute' animatable='yes'/>
-    <attribute name='limitingConeAngle' href='filters.html#feSpotLightLimitingConeAngleAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feTile'
-    href='filters.html#feTileElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, style, presentation, filter primitive'
-    attributes='in'
-    interfaces='SVGFETileElement'/>
-
-  <element
-      name='feTurbulence'
-      href='filters.html#feTurbulenceElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      interfaces='SVGFETurbulenceElement'>
-    <attribute name='baseFrequency' href='filters.html#feTurbulenceBaseFrequencyAttribute' animatable='yes'/>
-    <attribute name='numOctaves' href='filters.html#feTurbulenceNumOctavesAttribute' animatable='yes'/>
-    <attribute name='seed' href='filters.html#feTurbulenceSeedAttribute' animatable='yes'/>
-    <attribute name='stitchTiles' href='filters.html#feTurbulenceStitchTilesAttribute' animatable='yes'/>
-    <attribute name='type' href='filters.html#feTurbulenceTypeAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='filter'
-      href='filters.html#FilterElement'
-      contentmodel='anyof'
-      elementcategories='descriptive, filter primitive'
-      elements='animate, set'
-      attributecategories='core, style, presentation, xlink'
-      interfaces='SVGFilterElement'>
-    <attribute name='x' href='filters.html#FilterElementXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#FilterElementYAttribute' animatable='yes'/>
-    <attribute name='width' href='filters.html#FilterElementWidthAttribute' animatable='yes'/>
-    <attribute name='height' href='filters.html#FilterElementHeightAttribute' animatable='yes'/>
-    <attribute name='filterRes' href='filters.html#FilterElementFilterResAttribute' animatable='yes'/>
-    <attribute name='filterUnits' href='filters.html#FilterElementFilterUnitsAttribute' animatable='yes'/>
-    <attribute name='primitiveUnits' href='filters.html#FilterElementPrimitiveUnitsAttribute' animatable='yes'/>
-    <attribute name='xlink:href' href='filters.html#FilterElementHrefAttribute' animatable='yes'/>
-  </element>
-
-  <element
       name='font'
       href='fonts.html#FontElement'
       contentmodel='anyof'
@@ -728,8 +435,8 @@
       elements='animate, animateTransform, set, meshRow'
       attributecategories='core, presentation, style, xlink'
       interfaces='SVGMeshGradientElement'>
-    <attribute name='x' href='pservers.html#MeshGradientElementCXAttribute' animatable='yes'/>
-    <attribute name='y' href='pservers.html#MeshGradientElementCYAttribute' animatable='yes'/>
+    <attribute name='x' href='pservers.html#MeshGradientElementXAttribute' animatable='yes'/>
+    <attribute name='y' href='pservers.html#MeshGradientElementYAttribute' animatable='yes'/>
     <attribute name='gradientUnits' href='pservers.html#MeshGradientElementGradientUnitsAttribute' animatable='yes'/>
     <attribute name='gradientTransform' href='pservers.html#MeshGradientElementGradientTransformAttribute' animatable='yes'/>
     <attribute name='xlink:href' href='pservers.html#MeshGradientElementHrefAttribute' animatable='yes'/>
@@ -1058,10 +765,8 @@
   <!-- ... element categories ............................................ -->
 
   <elementcategory name='animation' href='intro.html#TermAnimationElement' elements='animate, animateColor, animateMotion, animateTransform, set'/>
-  <elementcategory name='basic shape' href='intro.html#TermBasicShapeElement' elements='circle, ellipse, line, polygon, polyline, rect'/>
   <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch, glyph, missing-glyph'/>
   <elementcategory name='descriptive' href='intro.html#TermDescriptiveElement' elements='desc, title, metadata'/>
-  <elementcategory name='filter primitive' href='intro.html#TermFilterPrimitiveElement' elements='feBlend, feFlood, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feImage, feMerge, feMorphology, feOffset, feSpecularLighting, feTile, feTurbulence'/>
   <elementcategory name='gradient' href='intro.html#TermGradientElement' elements='linearGradient, radialGradient, meshGradient'/>
   <elementcategory name='graphics' href='intro.html#TermGraphicsElement' elements='path, text, rect, circle, ellipse, line, polyline, polygon, image, use'/>
   <elementcategory name='graphics referencing' href='intro.html#TermGraphicsReferencingElement' elements='use, image'/>
@@ -1087,9 +792,6 @@
   <attribute name='vert-origin-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginYAttribute'/>
   <attribute name='vert-adv-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertAdvYAttribute'/>
 
-  <!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence -->
-  <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMergeNode, feMorphology, feOffset, feSpecularLighting, feTile' href='filters.html#FilterPrimitiveInAttribute' animatable='yes'/>
-
   <!-- attributes common to hkern and vkern -->
   <attribute name='u1' elements='hkern, vkern' href='fonts.html#HKernElementU1Attribute'/>
   <attribute name='g1' elements='hkern, vkern' href='fonts.html#HKernElementG1Attribute'/>
@@ -1133,7 +835,7 @@
 
   <attributecategory
       name='core'
-      href='intro.html#TermCoreAttributes'>
+      href='intro.html#TermCoreAttribute'>
     <attribute name='id' href='struct.html#IDAttribute'/>
     <attribute name='xml:base' href='struct.html#XMLBaseAttribute'/>
     <attribute name='xml:lang' href='struct.html#XMLLangAttribute'/>
@@ -1149,7 +851,7 @@
   <attributecategory
     name='presentation'
     href='intro.html#TermPresentationAttribute'
-    presentationattributes='alignment-baseline, baseline-shift, buffered-rendering, clip, clip-path, clip-rule, color, color-interpolation, color-interpolation-filters, color-profile, color-rendering, cursor, direction, display, dominant-baseline, enable-background, fill, fill-opacity, fill-rule, filter, flood-color, flood-opacity, font-family, font-size, font-size-adjust, font-stretch, font-style, font-variant, font-weight, glyph-orientation-horizontal, glyph-orientation-vertical, image-rendering, letter-spacing, lighting-color, marker-end, marker-mid, marker-pattern, marker-segment, marker-start, mask, opacity, overflow, paint-order, pointer-events, shape-rendering, solid-color, solid-opacity, stop-color, stop-opacity, stroke, stroke-dasharray, stroke-dashoffset, stroke-linecap, stroke-linejoin, stroke-miterlimit, stroke-opacity, stroke-width, text-anchor, text-decoration, text-overflow, text-rendering, transform, unicode-bidi, visibility, white-space, word-spacing, writing-mode'/>
+    presentationattributes='alignment-baseline, baseline-shift, buffered-rendering, clip, clip-path, clip-rule, color, color-interpolation, color-interpolation-filters, color-rendering, cursor, direction, display, dominant-baseline, enable-background, fill, fill-opacity, fill-rule, filter, flood-color, flood-opacity, font-family, font-size, font-size-adjust, font-stretch, font-style, font-variant, font-weight, glyph-orientation-horizontal, glyph-orientation-vertical, image-rendering, letter-spacing, lighting-color, marker-end, marker-mid, marker-pattern, marker-segment, marker-start, mask, opacity, overflow, paint-order, pointer-events, shape-rendering, solid-color, solid-opacity, stop-color, stop-opacity, stroke, stroke-dasharray, stroke-dashoffset, stroke-linecap, stroke-linejoin, stroke-miterlimit, stroke-opacity, stroke-width, text-anchor, text-decoration, text-overflow, text-rendering, transform, unicode-bidi, visibility, white-space, word-spacing, writing-mode'/>
 
   <attributecategory
       name='document event'
@@ -1197,16 +899,6 @@
   </attributecategory>
 
   <attributecategory
-      name='filter primitive'
-      href='intro.html#TermFilterPrimitiveAttributes'>
-    <attribute name='x' href='filters.html#FilterPrimitiveXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#FilterPrimitiveYAttribute' animatable='yes'/>
-    <attribute name='width' href='filters.html#FilterPrimitiveWidthAttribute' animatable='yes'/>
-    <attribute name='height' href='filters.html#FilterPrimitiveHeightAttribute' animatable='yes'/>
-    <attribute name='result' href='filters.html#FilterPrimitiveResultAttribute' animatable='yes'/>
-  </attributecategory>
-
-  <attributecategory
       name='animation attribute target'
       href='animate.html#TargetAttributes'>
     <attribute name='attributeType' href='animate.html#AttributeTypeAttribute'/>
@@ -1246,18 +938,6 @@
     <attribute name='accumulate' href='animate.html#AccumulateAttribute'/>
   </attributecategory>
 
-  <attributecategory
-      name='transfer function element'
-      href='filters.html#TransferFunctionElementAttributes'>
-    <attribute name='type' href='filters.html#feComponentTransferTypeAttribute' animatable='yes'/>
-    <attribute name='tableValues' href='filters.html#feComponentTransferTableValuesAttribute' animatable='yes'/>
-    <attribute name='slope' href='filters.html#feComponentTransferSlopeAttribute' animatable='yes'/>
-    <attribute name='intercept' href='filters.html#feComponentTransferInterceptAttribute' animatable='yes'/>
-    <attribute name='amplitude' href='filters.html#feComponentTransferAmplitudeAttribute' animatable='yes'/>
-    <attribute name='exponent' href='filters.html#feComponentTransferExponentAttribute' animatable='yes'/>
-    <attribute name='offset' href='filters.html#feComponentTransferOffsetAttribute' animatable='yes'/>
-  </attributecategory>
-
   <!-- ... properties ..................................................... -->
 
   <property name='alignment-baseline' href='text.html#AlignmentBaselineProperty'/>
@@ -1268,18 +948,13 @@
   <property name='clip-rule' href='masking.html#ClipRuleProperty'/>
   <property name='color' href='color.html#ColorProperty'/>
   <property name='color-interpolation' href='painting.html#ColorInterpolationProperty'/>
-  <property name='color-profile' href='color.html#ColorProfileProperty'/>
   <property name='color-rendering' href='painting.html#ColorRenderingProperty'/>
   <property name='cursor' href='interact.html#CursorProperty'/>
   <property name='direction' href='text.html#DirectionProperty'/>
   <property name='dominant-baseline' href='text.html#DominantBaselineProperty'/>
-  <property name='enable-background' href='filters.html#EnableBackgroundProperty'/>
   <property name='fill' href='painting.html#FillProperty'/>
   <property name='fill-opacity' href='painting.html#FillOpacityProperty'/>
   <property name='fill-rule' href='painting.html#FillRuleProperty'/>
-  <property name='filter' href='filters.html#FilterProperty'/>
-  <property name='flood-color' href='filters.html#FloodColorProperty'/>
-  <property name='flood-opacity' href='filters.html#FloodOpacityProperty'/>
   <property name='font' href='text.html#FontProperty'/>
   <property name='font-family' href='text.html#FontFamilyProperty'/>
   <property name='font-size' href='text.html#FontSizeProperty'/>
@@ -1292,17 +967,15 @@
   <property name='glyph-orientation-vertical' href='text.html#GlyphOrientationVerticalProperty'/>
   <property name='image-rendering' href='painting.html#ImageRenderingProperty'/>
   <property name='letter-spacing' href='text.html#LetterSpacingProperty'/>
-  <property name='lighting-color' href='filters.html#LightingColorProperty'/>
   <property name='marker' href='painting.html#MarkerProperty'/>
   <property name='marker-end' href='painting.html#MarkerEndProperty'/>
   <property name='marker-knockout-left' href='painting.html#MarkerKnockoutLeftProperty'/>
-  <property name='marker-knockout-right' href='painting.html#MarkerKnockoutirhgtProperty'/>
+  <property name='marker-knockout-right' href='painting.html#MarkerKnockoutRightProperty'/>
   <property name='marker-mid' href='painting.html#MarkerMidProperty'/>
   <property name='marker-pattern' href='painting.html#MarkerPatternProperty'/>
   <property name='marker-segment' href='painting.html#MarkerSegmentProperty'/>
   <property name='marker-start' href='painting.html#MarkerStartProperty'/>
   <property name='mask' href='masking.html#MaskProperty'/>
-  <property name='opacity' href='masking.html#OpacityProperty'/>
   <property name='overflow' href='masking.html#OverflowProperty'/>
   <property name='paint-order' href='painting.html#PaintOrderProperty'/>
   <property name='pointer-events' href='interact.html#PointerEventsProperty'/>
@@ -1330,8 +1003,9 @@
   <!-- ... properties defined elsewhere but described in this spec ........ -->
 
   <property name='display' href='painting.html#VisibilityControl'/>
+  <property name='opacity' href='masking.html#ObjectAndGroupOpacityProperties'/>
+  <property name='text-overflow' href='text.html#TextOverflowProcessing'/>
   <property name='visibility' href='painting.html#VisibilityControl'/>
-  <property name='text-overflow' href='text.html#TextOverflowProcessing'/>
   <property name='white-space' href='http://dev.w3.org/csswg/css3-text/#white-space'/>
 
   <!-- ... interfaces ..................................................... -->
@@ -1366,7 +1040,6 @@
   <interface name='SVGLength' href='types.html#InterfaceSVGLength'/>
   <interface name='SVGTransform' href='coords.html#InterfaceSVGTransform'/>
   <interface name='SVGStringList' href='types.html#InterfaceSVGStringList'/>
-  <interface name='SVGException' href='svgdom.html#ExceptionSVGException'/>
   <interface name='SVGPaint' href='painting.html#InterfaceSVGPaint'/>
   <interface name='SVGTransformList' href='coords.html#InterfaceSVGTransformList'/>
   <interface name='SVGAnimatedTransformList' href='coords.html#InterfaceSVGAnimatedTransformList'/>
@@ -1381,12 +1054,11 @@
   <interface name='SVGLengthList' href='types.html#InterfaceSVGLengthList'/>
   <interface name='SVGColor' href='types.html#InterfaceSVGColor'/>
   <interface name='SVGICCColor' href='types.html#InterfaceSVGICCColor'/>
-  <interface name='SVGStylable' href='types.html#InterfaceSVGStylable'/>
-  <interface name='SVGLocatable' href='types.html#InterfaceSVGLocatable'/>
-  <interface name='SVGTransformable' href='types.html#InterfaceSVGTransformable'/>
+  <interface name='SVGLocatableElement' href='types.html#InterfaceSVGLocatableElement'/>
+  <interface name='SVGTransformableElement' href='types.html#InterfaceSVGTransformableElement'/>
+  <interface name='SVGGraphicsElement' href='types.html#InterfaceSVGGraphicsElement'/>
+  <interface name='SVGDefinitionElement' href='types.html#InterfaceSVGDefinitionElement'/>
   <interface name='SVGTests' href='types.html#InterfaceSVGTests'/>
-  <interface name='SVGLangSpace' href='types.html#InterfaceSVGLangSpace'/>
-  <interface name='SVGExternalResourcesRequired' href='types.html#InterfaceSVGExternalResourcesRequired'/>
   <interface name='SVGURIReference' href='types.html#InterfaceSVGURIReference'/>
   <interface name='SVGCSSRule' href='types.html#InterfaceSVGCSSRule'/>
   <interface name='SVGRenderingIntent' href='types.html#InterfaceSVGRenderingIntent'/>
@@ -1457,7 +1129,6 @@
   <interface name='SVGMPathElement' href='animate.html#InterfaceSVGMPathElement'/>
   <interface name='SVGAnimateColorElement' href='animate.html#InterfaceSVGAnimateColorElement'/>
   <interface name='SVGAnimateTransformElement' href='animate.html#InterfaceSVGAnimateTransformElement'/>
-  <interface name='ElementTimeControl' href='animate.html#InterfaceElementTimeControl'/>
   <interface name='TimeEvent' href='animate.html#InterfaceTimeEvent'/>
   <interface name='SVGAnimationElement' href='animate.html#InterfaceSVGAnimationElement'/>
   <interface name='SVGFontElement' href='fonts.html#InterfaceSVGFontElement'/>
@@ -1472,45 +1143,18 @@
   <interface name='SVGFontFaceNameElement' href='fonts.html#InterfaceSVGFontFaceNameElement'/>
   <interface name='SVGMetadataElement' href='metadata.html#InterfaceSVGMetadataElement'/>
   <interface name='SVGForeignObjectElement' href='extend.html#InterfaceSVGForeignObjectElement'/>
-  <interface name='SVGFilterElement' href='filters.html#InterfaceSVGFilterElement'/>
-  <interface name='SVGFilterPrimitiveStandardAttributes' href='filters.html#InterfaceSVGFilterPrimitiveStandardAttributes'/>
-  <interface name='SVGFEBlendElement' href='filters.html#InterfaceSVGFEBlendElement'/>
-  <interface name='SVGFEColorMatrixElement' href='filters.html#InterfaceSVGFEColorMatrixElement'/>
-  <interface name='SVGFEComponentTransferElement' href='filters.html#InterfaceSVGFEComponentTransferElement'/>
-  <interface name='SVGComponentTransferFunctionElement' href='filters.html#InterfaceSVGComponentTransferFunctionElement'/>
-  <interface name='SVGFEFuncRElement' href='filters.html#InterfaceSVGFEFuncRElement'/>
-  <interface name='SVGFEFuncGElement' href='filters.html#InterfaceSVGFEFuncGElement'/>
-  <interface name='SVGFEFuncBElement' href='filters.html#InterfaceSVGFEFuncBElement'/>
-  <interface name='SVGFEFuncAElement' href='filters.html#InterfaceSVGFEFuncAElement'/>
-  <interface name='SVGFECompositeElement' href='filters.html#InterfaceSVGFECompositeElement'/>
-  <interface name='SVGFEConvolveMatrixElement' href='filters.html#InterfaceSVGFEConvolveMatrixElement'/>
-  <interface name='SVGFEDiffuseLightingElement' href='filters.html#InterfaceSVGFEDiffuseLightingElement'/>
-  <interface name='SVGFEDistantLightElement' href='filters.html#InterfaceSVGFEDistantLightElement'/>
-  <interface name='SVGFEPointLightElement' href='filters.html#InterfaceSVGFEPointLightElement'/>
-  <interface name='SVGFESpotLightElement' href='filters.html#InterfaceSVGFESpotLightElement'/>
-  <interface name='SVGFEDisplacementMapElement' href='filters.html#InterfaceSVGFEDisplacementMapElement'/>
-  <interface name='SVGFEFloodElement' href='filters.html#InterfaceSVGFEFloodElement'/>
-  <interface name='SVGFEGaussianBlurElement' href='filters.html#InterfaceSVGFEGaussianBlurElement'/>
-  <interface name='SVGFEImageElement' href='filters.html#InterfaceSVGFEImageElement'/>
-  <interface name='SVGFEMergeElement' href='filters.html#InterfaceSVGFEMergeElement'/>
-  <interface name='SVGFEMergeNodeElement' href='filters.html#InterfaceSVGFEMergeNodeElement'/>
-  <interface name='SVGFEMorphologyElement' href='filters.html#InterfaceSVGFEMorphologyElement'/>
-  <interface name='SVGFEOffsetElement' href='filters.html#InterfaceSVGFEOffsetElement'/>
-  <interface name='SVGFESpecularLightingElement' href='filters.html#InterfaceSVGFESpecularLightingElement'/>
-  <interface name='SVGFETileElement' href='filters.html#InterfaceSVGFETileElement'/>
-  <interface name='SVGFETurbulenceElement' href='filters.html#InterfaceSVGFETurbulenceElement'/>
   <interface name='SVGSolidColorElement' href='pservers.html#InterfaceSVGSolidColorElement'/>
 
   <!-- ... grammar symbols ................................................ -->
   <symbol name='angle' href='types.html#DataTypeAngle'/>
   <symbol name='anything' href='types.html#DataTypeAnything'/>
-  <symbol name='author-ident' href='http://dev.w3.org/csswg/css3-values/#identifiers'/>
   <symbol name='color' href='types.html#DataTypeColor'/>
-  <symbol name='compound-selector' href='types.html#DataTypeCompoundSelector'/>
+  <symbol name='child-selector' href='types.html#DataTypeChildSelector'/>
   <symbol name='coordinate' href='types.html#DataTypeCoordinate'/>
   <symbol name='dasharray' href='painting.html#DataTypeDasharray'/>
   <symbol name='frequency' href='types.html#DataTypeFrequency'/>
   <symbol name='icccolor' href='types.html#DataTypeICCColor'/>
+  <symbol name='image' href='types.html#DataTypeImage'/>
   <symbol name='integer' href='types.html#DataTypeInteger'/>
   <symbol name='knockout-offset' href="painting.html#DataTypeKnockoutOffset"/>
   <symbol name='knockout-shape' href="painting.html#DataTypeKnockoutShape"/>
@@ -1542,10 +1186,6 @@
   <term name='basic shape' href='intro.html#TermBasicShapeElement'/>
   <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
   <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
-  <term name='filter primitive' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitives' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitive elements' href='intro.html#TermFilterPrimitiveElement'/>
   <term name='fill' href='intro.html#TermFill'/>
   <term name='filled' href='intro.html#TermFill'/>
   <term name='gradient element' href='intro.html#TermGradientElement'/>
@@ -1560,8 +1200,8 @@
   <term name='outermost svg elements' href='intro.html#TermOutermostSVGElement'/>
   <term name='rootmost SVG element' href='intro.html#TermRootmostSVGElement'/>
   <term name="rootmost 'svg' element" href='intro.html#TermRootmostSVGElement'>rootmost <span xmlns='http://www.w3.org/1999/xhtml' class="element-name">‘svg’</span> element</term>
-  <term name='shape' href='intro.html#TermShape'/>
-  <term name='shapes' href='intro.html#TermShape'/>
+  <term name='shape' href='intro.html#TermShapeElement'/>
+  <term name='shapes' href='intro.html#TermShapeElement'/>
   <term name='stroke' href='intro.html#TermStroke'/>
   <term name='stroked' href='intro.html#TermStroke'/>
   <term name='structural elements' href='intro.html#TermStructuralElement'/>
@@ -1580,16 +1220,14 @@
   <term name='animation value attribute' href='intro.html#TermAnimationValueAttribute'/>
   <term name='conditional processing attribute' href='intro.html#TermConditionalProcessingAttribute'/>
   <term name='conditional processing attributes' href='intro.html#TermConditionalProcessingAttribute'/>
-  <term name='core attribute' href='intro.html#TermCoreAttributes'/>
-  <term name='core attributes' href='intro.html#TermCoreAttributes'/>
+  <term name='core attribute' href='intro.html#TermCoreAttribute'/>
+  <term name='core attributes' href='intro.html#TermCoreAttribute'/>
   <term name='document event attribute' href='intro.html#TermDocumentEventAttribute'/>
   <term name='document event attributes' href='intro.html#TermDocumentEventAttribute'/>
   <term name='event attribute' href='intro.html#TermEventAttribute'/>
   <term name='event attributes' href='intro.html#TermEventAttribute'/>
   <term name='graphical event attribute' href='intro.html#TermGraphicalEventAttribute'/>
   <term name='graphical event attributes' href='intro.html#TermGraphicalEventAttribute'/>
-  <term name='filter primitive attribute' href='intro.html#TermFilterPrimitiveAttributes'/>
-  <term name='filter primitive attributes' href='intro.html#TermFilterPrimitiveAttributes'/>
   <term name='presentation attribute' href='intro.html#TermPresentationAttribute'/>
   <term name='presentation attributes' href='intro.html#TermPresentationAttribute'/>
   <term name='XLink attribute' href='intro.html#TermXLinkAttributes'/>
@@ -1638,7 +1276,7 @@
   <term name='transformation' href='intro.html#TermTransformation'/>
   <term name='transformations' href='intro.html#TermTransformation'/>
   <term name='transformation matrix' href='intro.html#TermTransformationMatrix'/>
-  <term name='transformation matrices' href='intro.html#TermTransformationMatrices'/>
+  <term name='transformation matrices' href='intro.html#TermTransformationMatrix'/>
   <term name='user agent' href='intro.html#TermUserAgent'/>
   <term name='user agents' href='intro.html#TermUserAgent'/>
   <term name='user coordinate system' href='intro.html#TermUserCoordinateSystem'/>
@@ -1652,8 +1290,6 @@
   <term name='cap shape' href='painting.html#TermCapShape'/>
   <term name='dash positions' href='painting.html#TermDashPositions'/>
   <term name='equivalent path' href='paths.html#TermEquivalentPath'/> 
-  <term name='filter region' href='filters.html#FilterEffectsRegion'/>
-  <term name='filter primitive subregion' href='filters.html#FilterPrimitiveSubRegion'/>
   <term name='initial coordinate system' href='coords.html#InitialCoordinateSystem'/>
   <term name='inherit' href='http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit'/>
   <term name='object bounding box units' href='coords.html#ObjectBoundingBoxUnits'/>
@@ -1674,25 +1310,20 @@
   
   <!-- === defined in other specifications ================================ -->
 
-  <!-- ... properties ..................................................... -->
-
-  <property name='color-interpolation-filters' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#ColorInterpolationFiltersProperty'/>
-
   <!-- ... interfaces ..................................................... -->
 
   <interface name='DocumentCSS' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-DocumentCSS'/>
-  <interface name='DocumentEvent' href='http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-DocumentEvent'/>
-  <interface name='EventListener' href='http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventListener'/>
-  <interface name='EventTarget' href='http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget'/>
-  <interface name='Event' href='http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-Event'/>
-  <interface name='Document' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#i-Document'/>
-  <interface name='CharacterData' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-FF21A306'/>
-  <interface name='Comment' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1728279322'/>
-  <interface name='Element' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614'/>
-  <interface name='Node' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1950641247'/>
-  <interface name='NodeList' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-536297177'/>
-  <interface name='DOMImplementation' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-102161490'/>
-  <interface name='DOMException' href='http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187'/>
+  <interface name='EventListener' href='http://www.w3.org/TR/2012/WD-dom-20120405/#eventlistener'/>
+  <interface name='EventTarget' href='http://www.w3.org/TR/2012/WD-dom-20120405/#eventtarget'/>
+  <interface name='Event' href='http://www.w3.org/TR/2012/WD-dom-20120405/#event'/>
+  <interface name='Document' href='http://www.w3.org/TR/2012/WD-dom-20120405/#interface-document'/>
+  <interface name='CharacterData' href='http://www.w3.org/TR/2012/WD-dom-20120405/#interface-characterdata'/>
+  <interface name='Comment' href='http://www.w3.org/TR/2012/WD-dom-20120405/#comment'/>
+  <interface name='Element' href='http://www.w3.org/TR/2012/WD-dom-20120405/#element'/>
+  <interface name='Node' href='http://www.w3.org/TR/2012/WD-dom-20120405/#node'/>
+  <interface name='NodeList' href='http://www.w3.org/TR/2012/WD-dom-20120405/#nodelist'/>
+  <interface name='DOMImplementation' href='http://www.w3.org/TR/2012/WD-dom-20120405/#domimplementation'/>
+  <interface name='DOMException' href='http://www.w3.org/TR/2012/WD-dom-20120405/#exception-domexception'/>
   <interface name='CSSStyleDeclaration' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-CSSStyleDeclaration'/>
   <interface name='CSSPrimitiveValue' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-CSSPrimitiveValue'/>
   <interface name='CSSValueList' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-CSSValueList'/>
@@ -1704,5 +1335,16 @@
   <interface name='EmbeddingElement' href='http://www.w3.org/TR/Window/#embeddingelt'/>
 
   <!-- ... terms .......................................................... -->
+  <term name='compound selector' href='http://dev.w3.org/csswg/selectors4/#compound'/>
+  <term name='compound selectors' href='http://dev.w3.org/csswg/selectors4/#compound'/>
+  <term name='filter primitive element' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#TermFilterPrimitiveElement'/>
+  <term name='filter primitive elements' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#TermFilterPrimitiveElement'/>
+  <term name='tree order' href='http://www.w3.org/TR/2012/WD-dom-20120405/#concept-tree-order'/>
+  <term name='InvalidAccessError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#invalidaccesserror'/>
+  <term name='InvalidStateError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#invalidstateerror'/>
+  <term name='SyntaxError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#syntaxerror'/>
+
+  <!-- ... grammar symbols ................................................ -->
+  <symbol name='identifier' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#identifier'/>
 
 </definitions>
--- a/master/eltindex.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/eltindex.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -18,6 +20,10 @@
 
 <p>The following are the elements in the SVG language:</p>
 
+<p class="issue">This includes elements from other specifications, such as all
+the filter primitives defined in Filter Effects.  Should we just list the elements
+defined in this document?  Or perhaps identify which are defined here versus elsewhere?</p>
+
 <edit:elementindex/>
 
 </body>
--- a/master/escript.html	Fri Sep 07 15:54:44 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional+edit//EN" "xhtml1-transitional+edit.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:edit="http://xmlns.grorg.org/SVGT12NG/">
-<head>
-  <title>ECMAScript Language Binding</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
-  <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
-  <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
-  <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
-  <!-- W3C style sheet will be added here during processing. -->
-</head>
-<body>
-
-<h1>ECMAScript Language Binding</h1>
-
-<p class="normativity"><strong>This appendix is normative.</strong></p>
-
-<p>This appendix describes how to expose the SVG DOM to an ECMAScript language
-environment [<a href="refs.html#ref-ECMA-262">ECMA-262</a>].</p>
-
-<p>For descriptions of how interfaces and exceptions defined in other
-specifications are to be exposed to an ECMAScript language environment,
-consult the relevant specification:</p>
-
-<ul>
-  <li>For DOM Level 2 Core interfaces and exceptions, see
-  <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/ecma-script-binding.html">the DOM Level 2 Core ECMAScript Language Binding appendix</a>
-  ([<a href="refs.html#ref-DOM2">DOM2</a>], appendix E).</li>
-  <li>For DOM Level 2 Events interfaces, see
-  <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/ecma-script-binding.html">the DOM Level 2 Events ECMAScript Language Binding appendix</a>
-  ([<a href="refs.html#ref-DOM2EVENTS">DOM2EVENTS</a>], appendix C).</li>
-  <li>For DOM Level 2 Views interfaces, see
-  <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113/ecma-script-binding.html">the DOM Level 2 Views ECMAScript Language Binding appendix</a>
-  ([<a href="refs.html#ref-DOM2VIEWS">DOM2VIEWS</a>], appendix C).</li>
-  <li>For DOM Level 2 Style interfaces, see
-  <a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/ecma-script-binding.html">the DOM Level 2 Style ECMAScript Language Binding appendix</a>
-  ([<a href="refs.html#ref-DOM2STYLE">DOM2STYLE</a>], appendix C).</li>
-</ul>
-
-<h2 id="Exceptions">Exceptions</h2>
-
-<p>The SVG DOM defines a single exception, <a>SVGException</a>, which is
-exposed to an ECMAScript language environment as follows.</p>
-
-<p>The ECMAScript global object has a property named <code>"SVGException"</code>
-whose value is an object with the following properties:</p>
-
-<ul>
-  <li>A read only property named <code>"SVG_WRONG_TYPE_ERR"</code>, whose value is the <span class='dom-attr-type'>Number</span> value 1.</li>
-  <li>A read only property named <code>"SVG_INVALID_VALUE_ERR"</code>, whose value is the <span class='dom-attr-type'>Number</span> value 2.</li>
-  <li>A read only property named <code>"SVG_MATRIX_NOT_INVERTABLE"</code>, whose value is the <span class='dom-attr-type'>Number</span> value 3.</li>
-</ul>
-
-<p>A host object that is an <a>SVGException</a> also has these three
-properties on itself, or somewhere in its prototype chain.  Every such host
-object also has a read only property named <code>"code"</code> whose value is a
-<span class='dom-attr-type'>Number</span>, corresponding to the
-<a>SVGException::code</a> exception member on <a>SVGException</a>.</p>
-
-<h2 id="Constants">Constants</h2>
-
-<p>For every interface defined in the SVG DOM that has one or more constants
-defined on it, there exists a property on the ECMAScript global object whose
-name is the name of the interface, and whose value is an object with a read
-only property for each of the constants.  The name of each of these read only
-properties is the name of the corresponding constant, and the value is
-a <span class='dom-attr-type'>Number</span> with the same value as that of
-the constant.</p>
-
-<p>A host object that implements an interface with constants defined on it
-has, on itself or somewhere in its prototype chain, these properties that
-correspond to the constants.</p>
-
-<h2 id="Types">Types</h2>
-
-<p>The following table gives the corresponding ECMAScript type for the IDL
-primitive types used in the SVG DOM.</p>
-
-<table class='vert' summary='Map of IDL types to ECMAScript types'>
-  <tr>
-    <th>IDL type</th>
-    <th>ECMAScript type</th>
-  </tr>
-  <tr>
-    <td>boolean</td>
-    <td><span class='dom-attr-type'>Boolean</span></td>
-  </tr>
-  <tr>
-    <td>float</td>
-    <td><span class='dom-attr-type'>Number</span></td>
-  </tr>
-  <tr>
-    <td>long</td>
-    <td><span class='dom-attr-type'>Number</span></td>
-  </tr>
-  <tr>
-    <td>unsigned short</td>
-    <td><span class='dom-attr-type'>Number</span></td>
-  </tr>
-  <tr>
-    <td>unsigned long</td>
-    <td><span class='dom-attr-type'>Number</span></td>
-  </tr>
-  <tr>
-    <td>DOMString</td>
-    <td><span class='dom-attr-type'>String</span></td>
-  </tr>
-</table>
-
-<p>When an ECMAScript <span class='dom-attr-type'>Number</span> is assigned to
-a property that corresponds to an attribute of an IDL integer type (long,
-unsigned short or unsigned long), or it is passed as an argument passed to an
-operation for which the argument type is an IDL integer type, then behavior is
-undefined if the <span class='dom-attr-type'>Number</span> value is not an
-integer within the range of that type.</p>
-
-<p>For an interface type, a host object that implements the given interface is
-used.</p>
-
-<h2 id="Objects">Objects</h2>
-
-<p>A host object that implements a given interface has properties on itself,
-or in its prototype chain, that correspond to the operations and attributes
-defined on that interface and all its superinterfaces.</p>
-
-<p>A property that corresponds to an attribute is read only if the attribute
-is read only, and has a name that is the same as the name of the attribute.
-When getting the property, a value of a type according to the <a href="#Types">Types</a>
-section above is returned.  When setting the property, if it is not read only,
-then behavior is defined only if a value of a type according to the
-<a href="#Types">Types</a> section is assigned to it.</p>
-
-<p>For example, if <var>a</var> is a host object that implements the
-<a>SVGLength</a> interface, then evaluating the statement:</p>
-
-<pre>a.valueAsString = "10";</pre>
-
-<p>has defined behavior, but evaluating the statement:</p>
-
-<pre>a.valueAsString = 10;</pre>
-
-<p>does not.</p>
-
-<p>A property that corresponds to an operation has a name that is the same
-as the name of the operation, and has a value that is a
-<span class='dom-attr-type'>Function</span> object.  The value returned
-from the <span class='dom-attr-type'>Function</span> is of a type according
-to the table in the <a href="#Types">Types</a> section above.  When calling
-the <span class='dom-attr-type'>Function</span>, behavior is only defined
-if the correct number of arguments is passed, and the type of each argument
-is the type according to the <a href="#Types">Types</a> table.  Also,
-behavior is only defined for invoking the <span class='dom-attr-type'>Function</span>
-with a <span class='dom-attr-type'>this</span> value that is equal to
-the object from which the <span class='dom-attr-type'>Function</span>
-was obtained.</p>
-
-<p>For example, if <var>L1</var> and <var>L2</var> are two distinct host objects that
-implement the <a>SVGPointList</a> interface and <var>p</var> is a host object
-that implements the <a>SVGPoint</a> interface, then evaluating the following
-statement has defined behavior:</p>
-
-<pre>L1.insertItemBefore(p, 0);</pre>
-
-<p>Evaluating any of the following statements, however, does not:</p>
-
-<pre>L1.insertItemBefore(p, '0');
-L1.insertItemBefore(p, -1);
-L1.insertItemBefore(p, 0.5);
-L1.insertItemBefore(p);
-L1.insertItemBefore(p, 0, 0);
-L1.insertItemBefore({ x: 10, y: 20 }, 0);
-L1.insertItemBefore.call([], p, 0);
-L1.insertItemBefore.call(L2, p, 0);</pre>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/master/examples/discard01.svg	Fri Sep 07 16:16:40 2012 +1000
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="352" height="240" playbackOrder="forwardOnly">
+    
+  <ellipse cx="98.5" cy="17.5" rx="20.5" ry="17.5" fill="blue" stroke="black" 
+           transform="translate(9 252) translate(3 -296)">
+    <animateTransform attributeName="transform" begin="0s" dur="2s" fill="remove"
+                      calcMode="linear" type="translate" additive="sum"
+                      from="0 0" to="-18 305"/>
+    <discard begin="2s"/>
+  </ellipse>
+  
+  <rect x="182" y="-39" width="39" height="30" fill="red" stroke="black"
+        transform="translate(30 301)">
+    <animateTransform attributeName="transform" begin="1s" dur="2s" fill="remove"
+                      calcMode="linear" type="translate" additive="sum"
+                      from="0 0" to="-26 -304"/>
+    <discard begin="3s"/>
+  </rect>
+  
+  <polygon points="-66,83.5814 -43,123.419 -89,123.419" fill="green" stroke="black" 
+           transform="matrix(1 0 0 1.1798 0 -18.6096)">
+    <animateTransform attributeName="transform" begin="2s" dur="2s"
+                      fill="remove" calcMode="linear" type="translate" additive="sum"
+                      from="0 0" to="460 63.5699"/>
+    <discard begin="4s"/>
+  </polygon>
+</svg>
--- a/master/extend.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/extend.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -230,11 +232,7 @@
 
 The <a>SVGForeignObjectElement</a> interface corresponds to the
 <a>'foreignObject'</a> element.
-<pre class="idl">interface <b>SVGForeignObjectElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                                    <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
-                                    <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                                    <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a>,
-                                    <a class="idlinterface" href="types.html#InterfaceSVGTransformable">SVGTransformable</a> {
+<pre class="idl">interface <b>SVGForeignObjectElement</b> : <a>SVGGraphicsElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="extend.html#__svg__SVGForeignObjectElement__x">x</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="extend.html#__svg__SVGForeignObjectElement__y">y</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="extend.html#__svg__SVGForeignObjectElement__width">width</a>;
--- a/master/feature.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/feature.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -23,8 +25,8 @@
 <span class='dom-method-name'>hasFeature</span> method call that is part
 of the <a href="svgdom.html">SVG DOM</a>'s support for the
 <a>DOMImplementation</a> interface defined in
-<a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/">DOM Level 2 Core</a>
-[<a href="refs.html#ref-DOM2">DOM2</a>] (see
+<a href="http://www.w3.org/TR/dom/">DOM4</a>
+[<a href="refs.html#ref-DOM4">DOM4</a>] (see
 <a href="svgdom.html#FeatureStrings">Feature strings for the <strong>hasFeature</strong> method call</a>).
 In some cases the feature strings map directly to a set of attributes,
 properties or elements, in others they represent some functionality of the
@@ -36,10 +38,10 @@
 should support all listed feature strings for compatibility reasons. However,
 the SVG 1.0 feature strings can be considered deprecated.</p>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="SVG2FeatureStrings">SVG 2 feature strings</h2>
 
-<dl id="GraphicsAttribute">
+<dl id="SVG2GraphicsAttribute">
   <dt>Feature String:</dt>
   <dd>http://www.w3.org/TR/SVG2/feature#GraphicsAttribute</dd>
   <dt>User Agent Supports:</dt>
--- a/master/filters.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/filters.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
--- a/master/fonts.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/fonts.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,59 +6,83 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
 <h1>Fonts</h1>
 
-<div class="annotation">
-
-<p>SVG 2 Requirement: Explicit support for Web Open Font Format (WOFF).</p>
-
-<p>Resolution: We will mandate WOFF support in SVG 2.</p>
-
-<p><a href="http://www.w3.org/2011/03/01-svg-minutes.html#item03">Resolved at Auckland f2f</a>.
-</p>
-
-<p>Purpose: Allow access to full OpenType features for internationalisation and advanced typography</p>
-
-<p>Owner: Chris.</p>
-
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Include explicit support for Web Open Font Format (WOFF).</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/03/01-svg-minutes.html#item03">We will mandate WOFF support in SVG 2.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow access to full OpenType features for internationalisation and advanced typography.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris (no action)</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-
-<p>SVG 2 Requirement: Mandate support for SVG Tiny fonts.</p>
-
-<p>Resolution: SVG 2 will mandate support for SVG Tiny fonts support, and SVG Full fonts will be specified in a separate module.</p>
-
-<p>(The 'separate module' is now being worked on in the SVG Glyphs for OpenType community group)</p>
-
-<p><a href="http://www.w3.org/2011/03/01-svg-minutes.html#item04">01 Mar 2011 telcon</a>.
-</p>
-
-<p>Purpose: Backwards compatibility for deployed content</p>
-
-<p>Owner: Erik ACTION-3126, Chris ✓ ACTION-3127</p>
-
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Mandate support for SVG Tiny fonts.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/03/01-svg-minutes.html#item04">SVG 2 will mandate support for SVG Tiny fonts support, and SVG Full fonts will be specified in a separate module.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Backwards compatibility for deployed content.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Erik (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3126">ACTION-3126</a>),
+          Chris (✓ <a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3127">ACTION-3127</a>)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>The "separate module" is now being worked on in the SVG Glyphs for OpenType community group.</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-
-<p>SVG 2 Requirement: <a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#CSS_Spec_dependencies">SVG 2 will depend on CSS3 Fonts</a>.</p>
-
-<p>Resolution: SVG 2 will depend on CSS3 Fonts</p>
-
-<p><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item08">29 Jul 2011 telcon</a>.
-</p>
-
-<p>Purpose: Alignment with CSS 2.1 and CSS3</p>
-
-<p>Owner: Chris ACTION-3123</p>
-
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Reference CSS3 Fonts.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item08">SVG 2 will depend on CSS3 Fonts.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Alignment with CSS 2.1 and CSS3 for Web font functionality, and to provide
+      access to advanced typographic features of fonts.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3123">ACTION-3123</a>)</td>
+    </tr>
+  </table>
 </div>
 
 <h2 id="Introduction">Introduction</h2>
@@ -76,7 +100,7 @@
 <p>SVG utilizes the
 <a href="http://dev.w3.org/csswg/css3-fonts/">WebFonts</a>
 facility defined in
-([<a href="refs.html#ref-CSS3Fonts">CSS3 Fonts</a>]) as a key
+([<a href="refs.html#ref-CSS3FONTS">CSS3 Fonts</a>]) as a key
 mechanism for reliable delivery of font data to end users. In a
 common scenario, SVG authoring applications generate
 compressed, subsetted WebFonts
@@ -123,8 +147,9 @@
 detail of a font description can vary from just the name of the
 font up to a list of glyph widths.</p>
 
-<p>For more about font descriptions, refer to the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html">Fonts chapter</a>
-in the CSS2 specification ([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 15).</p>
+<p>For more about font descriptions, refer to
+<a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/">CSS Fonts Module Level 3</a>.
+[<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>]</p>
 
 <h3 id="FontDescriptionsAlternatives">Alternative ways for providing a font description</h3>
 
@@ -134,8 +159,8 @@
 <ul>
   <li>a <a>'font-face'</a> element</li>
 
-  <li id="AtFontFace">an <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">@font-face rule</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.1) within a CSS
+  <li id="AtFontFace">an <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">@font-face rule</a>
+  ([<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>], section 4.1) within a CSS
   style sheet (only applicable for user agents which support using CSS to
   style the SVG content)</li>
 </ul>
@@ -145,8 +170,8 @@
 <edit:with element='font-face'>
 
 <p>The <a>'font-face'</a> element
-corresponds directly to the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">@font-face facility</a>
-in CSS2 ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.1). It can be used to describe the
+corresponds directly to the <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">@font-face facility</a>
+in CSS3 Fonts ([<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>], section 4.1). It can be used to describe the
 characteristics of any font, SVG font or otherwise.</p>
 
 <p>When used to describe the characteristics of an SVG font
@@ -169,11 +194,10 @@
         class="adef">font-family</span> = "<span
         class="attr-value">&lt;string&gt;</span>"</dt>
         <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-family">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-family-desc">
         <span class="property">'font-family'</span></a> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
-        @font-face rule</a>.<br />
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">@font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
         no.</span></dd>
@@ -182,10 +206,9 @@
         class="attr-value">all | [ normal | italic | oblique] [,
         [normal | italic | oblique]]*</span>"</dt>
         <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-style">
-        <span class="property">'font-style'</span></a> descriptor
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-prop-desc"><span class="property">'font-style'</span></a> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The style of a font. Takes on the same
         values as the <a>'font-style property'</a>
         property, except that a comma-separated list is
@@ -200,10 +223,10 @@
         class="attr-value">[normal | small-caps] [,[normal |
         small-caps]]*</span>"</dt>
         <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-variant">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-rend-desc">
         <span class="property">'font-variant'</span></a>
         descriptor within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. Indication of whether this face is the
         small-caps variant of a font. Takes on the same values as
         the <a>'font-variant property'</a>
@@ -222,10 +245,10 @@
         900]]*</span>"</dt>
         <dd>
           Same syntax and semantics as the <a
-          href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-weight">
+          href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-prop-desc">
           <span class="property">'font-weight'</span></a>
           descriptor within an <a
-          href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+          href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
           @font-face rule</a>.<br />
            The weight of a face relative to others in the same font
           family. Takes on the same values as the <a>'font-weight property'</a>
@@ -255,10 +278,10 @@
         extra-expanded | ultra-expanded] ]*</span>"</dt>
         <dd>
           Same syntax and semantics as the <a
-          href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-stretch">
+          href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-prop-desc">
           <span class="property">'font-stretch'</span></a>
           descriptor within an <a
-          href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+          href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
           @font-face rule</a>. Indication of the condensed or
           expanded nature of the face relative to others in the
           same font family. Takes on the same values as the <a>'font-stretch property'</a>
@@ -277,29 +300,30 @@
         <dt id="FontFaceElementFontSizeAttribute"><span
         class="adef">font-size</span> = "<span
         class="attr-value">&lt;string&gt;</span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-font-size">
-        <span class="property">'font-size'</span></a> descriptor
+        <dd>Same syntax and semantics as the 
+        <span class="property">'font-size'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a font-size descriptor.</p>
+	</dd>
         <dt id="FontFaceElementUnicodeRangeAttribute"><span
         class="adef">unicode-range</span> = "<span
         class="attr-value">&lt;urange&gt; [,
         &lt;urange&gt;]*</span>"</dt>
         <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-unicode-range">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#descdef-unicode-range">
         <span class="property">'unicode-range'</span></a>
         descriptor within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The range of ISO 10646 characters [<a href="refs.html#ref-UNICODE">UNICODE</a>]
         possibly covered by the glyphs in the font. Except for any
         additional information provided in this specification, the
-        <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#dataqual">normative definition of the attribute</a>
-        is in CSS2 ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.3).<br />
+        <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#descdef-unicode-range">normative definition of the attribute</a>
+        is in CSS 2.1 ([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.5).<br />
          If the attribute is not specified, the effect is as if a
         value of <span class='attr-value'>'U+0-10FFFF'</span> were specified.<br />
          <span class="anim-target"><a
@@ -309,11 +333,10 @@
         class="adef">units-per-em</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-units-per-em">
-        <span class="property">'units-per-em'</span></a>
+        <dd>Same syntax and semantics as the
+        <span class="property">'units-per-em'</span>
         descriptor within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The number of coordinate units on the
         em square, the size of the design grid on which glyphs are
         laid out.<br />
@@ -324,93 +347,101 @@
         value of <span class='attr-value'>'1000'</span> were specified.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a units-per-em descriptor.</p>
+	</dd>
         <dt id="FontFaceElementPanose1Attribute"><span
         class="adef">panose-1</span> = "<span
         class="attr-value">[&lt;integer&gt;]{10}</span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-panose-1">
-        <span class="property">'panose-1'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'panose-1'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The Panose-1 number, consisting of ten
         decimal integers, separated by whitespace. Except for any
         additional information provided in this specification, the
-        <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#matching">normative definition of the attribute</a>
-        is in CSS2 ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.6).<br />
+        normative definition of the attribute
+        is in CSS2.<br />
          If the attribute is not specified, the effect is as if a
         value of <span class='attr-value'>'0 0 0 0 0 0 0 0 0 0'</span> were specified.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a panose-1 descriptor.</p>
+	</dd>
         <dt id="FontFaceElementStemvAttribute"><span
         class="adef">stemv</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-stemv">
-        <span class="property">'stemv'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'stemv'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a stemv descriptor.</p>
+	</dd>
         <dt id="FontFaceElementStemhAttribute"><span
         class="adef">stemh</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-stemh">
-        <span class="property">'stemh'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'stemh'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a stemh descriptor.</p>
+	</dd>
         <dt id="FontFaceElementSlopeAttribute"><span
         class="adef">slope</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-slope">
-        <span class="property">'slope'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'slope'</span> descriptor
         within an <a
         href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
         @font-face rule</a>. The vertical stroke angle of the font.
         Except for any additional information provided in this
-        specification, the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#matching">normative definition of the attribute</a>
-        is in CSS2 ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.6).<br />
+        specification, the normative definition of the attribute
+        is in CSS2.<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>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a slope descriptor.</p>
+	</dd>
         <dt id="FontFaceElementCapHeightAttribute"><span
         class="adef">cap-height</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-cap-height">
-        <span class="property">'cap-height'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'cap-height'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The height of uppercase glyphs in the
         font within the font coordinate system.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a cap-height descriptor.</p>
+	</dd>
         <dt id="FontFaceElementXHeightAttribute"><span
         class="adef">x-height</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-x-height">
-        <span class="property">'x-height'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'x-height'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The height of lowercase glyphs in the
         font within the font coordinate system.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have an x-height descriptor.</p>
+	</dd>
         <dt id="FontFaceElementAccentHeightAttribute"><span
         class="adef">accent-height</span> = "<span
         class="attr-value"><a
@@ -426,11 +457,10 @@
         <dt id="FontFaceElementAscentAttribute"><span
         class="adef">ascent</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-ascent">
-        <span class="property">'ascent'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'ascent'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The maximum unaccented height of the
         font within the font coordinate system.<br />
          If the attribute is not specified, the effect is as if the
@@ -439,15 +469,16 @@
         corresponding font.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have an ascent descriptor.</p>
+	</dd>
         <dt id="FontFaceElementDescentAttribute"><span
         class="adef">descent</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-descent">
-        <span class="property">'descent'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'descent'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. The maximum unaccented depth of the
         font within the font coordinate system.<br />
          If the attribute is not specified, the effect is as if the
@@ -455,31 +486,35 @@
         corresponding font.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a descent descriptor.</p>
+	</dd>
         <dt id="FontFaceElementWidthsAttribute"><span
         class="adef">widths</span> = "<span
         class="attr-value">&lt;string&gt;</span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-widths">
-        <span class="property">'widths'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'widths'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a widths descriptor.</p>
+	</dd>
         <dt id="FontFaceElementBboxAttribute"><span
         class="adef">bbox</span> = "<span
         class="attr-value">&lt;string&gt;</span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-bbox">
-        <span class="property">'bbox'</span></a> descriptor within
+        <dd>Same syntax and semantics as the
+        <span class="property">'bbox'</span> descriptor within
         an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a bbox descriptor.</p>
+	</dd>
         <dt id="FontFaceElementIdeographicAttribute"><span
         class="adef">ideographic</span> = "<span
         class="attr-value"><a
@@ -495,34 +530,36 @@
         class="adef">alphabetic</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-baseline">
-        <span class="property">'baseline'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'baseline'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. For horizontally oriented glyph
         layouts, indicates the alignment coordinate for glyphs to
         achieve alphabetic baseline alignment. The value is an
         offset in the font coordinate system.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a baseline descriptor.</p>
+	</dd>
         <dt id="FontFaceElementMathematicalAttribute"><span
         class="adef">mathematical</span> = "<span
         class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
-        <dd>Same syntax and semantics as the <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-mathline">
-        <span class="property">'mathline'</span></a> descriptor
+        <dd>Same syntax and semantics as the
+        <span class="property">'mathline'</span> descriptor
         within an <a
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">
+        href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">
         @font-face rule</a>. For horizontally oriented glyph
         layouts, indicates the alignment coordinate for glyphs to
         achieve mathematical baseline alignment. The value is an
         offset in the font coordinate system.<br />
          <span class="anim-target"><a
         href="animate.html#Animatable">Animatable</a>:
-        no.</span></dd>
+        no.</span>
+	<p class="issue">CSS3 Fonts does not have a mathline descriptor.</p>
+	</dd>
         <dt id="FontFaceElementHangingAttribute"><span
         class="adef">hanging</span> = "<span class="attr-value"><a
         href="types.html#DataTypeNumber">&lt;number&gt;</a></span>"</dt>
@@ -635,11 +672,11 @@
 
 <p>The following elements and attributes correspond to the
 <span class="property">'src'</span> descriptor within an
-@font-face rule. (Refer to the descriptions of the
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">@font-face rule</a> and
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-src">'src' descriptor</a>
-in the CSS2 specification ([<a href="refs.html#ref-CSS2">CSS2</a>],
-sections 15.3.1 and 15.3.5.)</p>
+@font-face rule. Refer to the descriptions of the
+<a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">@font-face rule</a> and
+<a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#src-desc">'src' descriptor</a>
+in the CSS 2.1 specification ([<a href="refs.html#ref-CSS21">CSS21</a>],
+sections 4.1 and 4.3.)</p>
 
 <h3 id="FontFaceSrcElement">The <span class="element-name">'font-face-src'</span> element</h3>
 
@@ -649,10 +686,10 @@
 <a>'font-face-uri'</a> and <a>'font-face-format'</a> elements described in the
 following sections, correspond to the <span class='property'>'src'</span>
 descriptor within an @font-face rule.  (Refer to the descriptions of the
-<a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions'>@font-face rule</a>
-and <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#descdef-src'>'src' descriptor</a>
-in the CSS2 specification ([<a href='refs.html#ref-CSS2'>CSS2</a>], sections
-15.3.1 and 15.3.5).</p>
+<a href='http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#src-desc'>@font-face rule</a>
+and <a href='http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#src-desc'>'src' descriptor</a>
+in the CSS3 Fonts specification ([<a href='refs.html#ref-CSS3FONTS'>CSS3FONTS</a>], sections
+4.1 and 4.3.)</p>
 
 <p>A <a>'font-face-src'</a> element contains <a>'font-face-uri'</a> and
 <a>'font-face-name'</a> elements, which are used for referencing external
@@ -715,12 +752,12 @@
       The <a>'string'</a> attribute is a hint to the user agent, and specifies
       a list of formats that the font referenced by the parent <a>'font-face-uri'</a>
       element supports.  The syntax of the attribute value is a format string
-      <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing">as defined in CSS2</a>,
+      as defined in CSS2,
       such as <span class='attr-value'>'truetype'</span>.  Refer to the description of the
-      <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing'>'src' descriptor</a>
-      in CSS2 for details on how the format hint is interpreted
-      ([<a href='refs.html#ref-CSS2'>CSS2</a>], section 15.3.5).<br/>
+      'src' descriptor
+      in CSS2 for details on how the format hint is interpreted.<br/>
       <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span>
+      <p class="issue">CSS3 Fonts does not have format strings.</p>
     </dd>
   </dl>
 </div>
@@ -747,9 +784,9 @@
       the syntax allowed between the parentheses of the <span class='prop-value'>local(…)</span>
       clause in an @font-face rule <span class='property'>'src'</span> descriptor,
       the font name specified in this attribute is not surrounded in single or
-      double quotes.  Refer to the description of the <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing'>'src' descriptor</a>
-      in CSS2 for details on how the font name is interpreted
-      ([<a href='refs.html#ref-CSS2'>CSS2</a>], section 15.3.5).<br/>
+      double quotes.  Refer to the description of the <a href='http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#src-desc'>'src' descriptor</a>
+      in CSS3 Fonts for details on how the font name is interpreted
+      ([<a href='refs.html#ref-CSS3FONTS'>CSS3FONTS</a>], section 4.3).<br/>
       <span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: no.</span>
     </dd>
   </dl>
@@ -799,9 +836,8 @@
 
 <p>The characteristics and attributes of SVG fonts correspond
 closely to the font characteristics and parameters described in
-the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html">Fonts chapter</a>
-of the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/"><cite>Cascading Style Sheets (CSS) level 2</cite></a>
-specification ([<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>], chapter 15). In this model,
+the <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/">CSS Fonts Modules Level 3 specification</a>
+[<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>]. In this model,
 various font metrics, such as advance values and baseline
 locations, and the glyph outlines themselves, are expressed in
 units that are relative to an abstract square whose height is
@@ -865,8 +901,8 @@
 ]]></pre>
 
 <p>Here is an example of how you might use the
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions">CSS @font-face facility</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.1) to reference an SVG font which is saved
+<a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#font-face-rule">CSS @font-face facility</a>
+([<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>], section 4.1) to reference an SVG font which is saved
 in an external file. First referenced SVG font file:</p>
 
 <pre><![CDATA[
@@ -1209,13 +1245,13 @@
 href="styling.html#StylingWithCSS">Styling with CSS</a>, the
 conceptual deep cloning of the referenced <a>'glyph'</a> element into a non-exposed
 DOM tree also copies any property values resulting from
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html">the CSS cascade</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 6)
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/cascade.html">the CSS cascade</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], chapter 6)
 on the referenced <a>'glyph'</a> and
 its contents, and also applies any property values on the
-<a>'font element'</a> element. CSS2 selectors
+<a>'font element'</a> element. CSS 2.1 selectors
 can be applied to the original (i.e., referenced) elements
-because they are part of the formal document structure. CSS2
+because they are part of the formal document structure. CSS 2.1
 selectors cannot be applied to the (conceptually) cloned DOM
 tree because its contents are not part of the formal document
 structure.</p>
@@ -1365,8 +1401,8 @@
         attribute to the <a>'glyph'</a> element for a
         description of how to express individual Unicode
         characters) and/or ranges of Unicode characters (see
-        <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#dataqual">description of ranges of Unicode characters in CSS2</a>;
-        [<a href="refs.html#ref-CSS2">CSS2</a>], section 15.3.3) which
+        <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#unicode-range-desc">description of ranges of Unicode characters in CSS2</a>;
+        [<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>], section 4.5) which
         identify a set of possible first glyphs in the kerning
         pair. If a given Unicode character within the set has
         multiple corresponding <a>'glyph'</a> elements (i.e.,
@@ -1449,8 +1485,7 @@
 <p>Object-oriented access to the attributes of the <a>'font element'</a> element
 via the SVG DOM is not available.
 </p>
-<pre class="idl">interface <b>SVGFontElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a> {
+<pre class="idl">interface <b>SVGFontElement</b> : <a>SVGDefinitionElement</a> {
 };</pre>
 
 </edit:with>
@@ -1468,8 +1503,7 @@
 <p>Object-oriented access to the attributes of the <a>'glyph'</a> element
 via the SVG DOM is not available.
 </p>
-<pre class="idl">interface <b>SVGGlyphElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                            <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a> {
+<pre class="idl">interface <b>SVGGlyphElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
 };</pre>
 
 </edit:with>
@@ -1487,8 +1521,7 @@
 <p>Object-oriented access to the attributes of the <a>'missing-glyph'</a> element
 via the SVG DOM is not available.
 </p>
-<pre class="idl">interface <b>SVGMissingGlyphElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                                   <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a> {
+<pre class="idl">interface <b>SVGMissingGlyphElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
 };</pre>
 
 </edit:with>
--- a/master/i18n.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/i18n.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -63,7 +65,7 @@
   the <a>'direction'</a> and <a>'unicode-bidi'</a> properties)</li>
 </ul>
 
-<p><a href="fonts.html#SVGFonts">SVG fonts</a>
+<p><a href="fonts.html#SVGFontsOverview">SVG fonts</a>
 support contextual glyph selection for
 <a href="fonts.html#GlyphElementArabicFormAttribute">Arabic</a> and
 <a href="fonts.html#GlyphElementLangAttribute">Han</a> text.</p>
--- a/master/idl.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/idl.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -16,18 +18,19 @@
 
 <p class="normativity"><strong>This appendix is normative.</strong></p>
 
-<p>This appendix contains the complete OMG IDL for the SVG Document Object
+<p>This appendix contains the complete Web IDL for the SVG Document Object
 Model definitions. The IDL is also available at:</p>
 
+<!--
 <pre><edit:locallink href="svg.idl"/></pre>
+-->
 
-<p>The SVG IDL defines the model for the SVG DOM. Note that the SVG IDL is
-defined such that some interfaces have more than one base class. The different
-standard language bindings for the SVG DOM are responsible for defining how
-to map all aspects of the SVG DOM into the given language, including how the
-language should implement interfaces with more than one base class.</p>
+<p class="issue">The file containing the entire IDL is not yet generated.</p>
 
 <edit:completeidl modules='::smil, ::svg'/>
 
+<p class="issue">All the IDL fragments from the spec will be gathered and
+included here too.</p>
+
 </body>
 </html>
--- a/master/idl2java.xsl	Fri Sep 07 15:54:44 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:idl='http://mcc.id.au/ns/idl'
-                xmlns:x='http://mcc.id.au/ns/local'
-                version='2.0'>
-
-  <xsl:output method='text'/>
-
-  <xsl:template match="/">
-    <xsl:for-each select="//(idl:interface | idl:exception)">
-      <xsl:variable name='interface' select='.'/>
-      <xsl:variable name='module' select='ancestor::idl:module[1]/@scopedname'/>
-      <xsl:variable name='module-part' select='replace(substring-after($module, "::"), "::", ".")'/>
-      <xsl:variable name='package' select='concat("org.w3c.", if ($module-part = "dom") then "" else "dom.", $module-part)'/>
-      <xsl:if test='$module-part = ("svg", "smil")'>
-        <xsl:result-document href='org/w3c/dom/{$module-part}/{@name}.java'>
-          <xsl:text>/*
- * Copyright (c) 2010 World Wide Web Consortium,
- *
- * (Massachusetts Institute of Technology, European Research Consortium for
- * Informatics and Mathematics, Keio University). All Rights Reserved. This
- * work is distributed under the W3C(r) Software License [1] in the hope that
- * it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- */
-
-</xsl:text>
-          <xsl:text>package </xsl:text><xsl:value-of select='$package'/><xsl:text>;&#10;&#10;</xsl:text>
-          <xsl:variable name='importrefs' select='distinct-values(.//@ref/string())[id(x:deref(., $interface), $interface)/ancestor::idl:module[1]/@scopedname != $module]'/>
-          <xsl:if test='count($importrefs)'>
-            <xsl:for-each select='$importrefs'>
-              <xsl:sort select='id(x:deref(., $interface), $interface)/@scopedname' case-order='upper-first'/>
-              <xsl:text>import </xsl:text><xsl:value-of select='x:name(id(x:deref(., $interface), $interface), $package)'/><xsl:text>;&#10;</xsl:text>
-            </xsl:for-each>
-            <xsl:text>&#10;</xsl:text>
-          </xsl:if>
-          <xsl:choose>
-            <xsl:when test="self::idl:interface">public interface <xsl:value-of select='@name'/></xsl:when>
-            <xsl:when test="self::idl:exception">public class <xsl:value-of select='@name'/> extends RuntimeException</xsl:when>
-          </xsl:choose>
-          <xsl:if test='idl:extends'>
-            <xsl:text> extends </xsl:text>
-            <xsl:for-each select='idl:extends'>
-              <xsl:if test='position() != 1'>, </xsl:if>
-              <xsl:value-of select='id(x:deref(@ref, .))/@name'/>
-            </xsl:for-each>
-          </xsl:if>
-          <xsl:text> {&#10;</xsl:text>
-          <xsl:if test='self::idl:exception'>
-            <xsl:value-of select='concat("&#10;    public ", @name, "(")'/>
-            <xsl:for-each select='idl:member'>
-              <xsl:value-of select='concat(x:type(.), " ", @name, ", ")'/>
-            </xsl:for-each>
-            <xsl:text>String message) {&#10;        super(message);&#10;</xsl:text>
-            <xsl:for-each select='idl:member'>
-              <xsl:value-of select='concat("        this.", @name, " = ", @name, ";&#10;")'/>
-            </xsl:for-each>
-            <xsl:text>    }&#10;</xsl:text>
-          </xsl:if>
-          <xsl:for-each select='idl:member'>
-            <xsl:value-of select='concat("    public ", x:type(.), " ", @name, ";&#10;")'/>
-          </xsl:for-each>
-          <xsl:for-each select='idl:attribute'>
-            <xsl:variable name="fixedname" select="replace(@name, 'xml', 'XML')"/>
-            <xsl:value-of select='concat("    ", x:type(.), " get", upper-case(substring($fixedname, 1, 1)), substring($fixedname, 2), "();&#10;")'/>
-	 	  	    <xsl:if test='not(@readonly="true")'>
-	            <xsl:value-of select='concat("    void set", upper-case(substring($fixedname, 1, 1)), substring($fixedname, 2), "(", x:type(.), " ", $fixedname, ");&#10;")'/>
-	          </xsl:if>
-          </xsl:for-each>
-          <xsl:for-each select='idl:operation'>
-            <xsl:value-of select='concat("    ", x:type(.), " ", @name, "(")'/>
-            <xsl:for-each select='idl:argument'>
-              <xsl:if test='position() != 1'>, </xsl:if>
-              <xsl:value-of select='concat(x:type(.), " ", @name)'/>
-            </xsl:for-each>
-            <xsl:text>);&#10;</xsl:text>
-          </xsl:for-each>
-          <xsl:if test='self::idl:exception'>
-            <xsl:for-each select='//idl:const[@associatedexception=current()/@scopedname]'>
-              <xsl:value-of select='concat("    public static final ", x:type(.), " ", @name, " = ", @value, ";&#10;")'/>
-            </xsl:for-each>
-          </xsl:if>
-          <xsl:for-each select='idl:const'>
-            <xsl:value-of select='concat("    final ", x:type(.), " ", @name, " = ", @value, ";&#10;")'/>
-          </xsl:for-each>
-          <xsl:text>}&#10;</xsl:text>
-        </xsl:result-document>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:function name='x:name'>
-    <xsl:param name='type'/>
-    <xsl:param name='thispackage'/>
-    <xsl:variable name='module-part' select='replace(substring-after($type/ancestor::idl:module[1]/@scopedname, "::"), "::", ".")'/>
-    <xsl:variable name='package' select='concat("org.w3c.", if ($module-part = "dom") then "" else "dom.", $module-part)'/>
-    <xsl:value-of select='if ($thispackage = $package) then $type/@name else concat($package, ".", $type/@name)'/>
-  </xsl:function>
-
-  <xsl:function name='x:type'>
-    <xsl:param name='n'/>
-    <xsl:choose>
-      <xsl:when test='$n/idl:type/idl:scopedname'>
-        <xsl:variable name='s' select='$n/idl:type/idl:scopedname/@name'/>
-        <xsl:value-of select='reverse(tokenize($s, "::"))[1]'/>
-      </xsl:when>
-      <xsl:when test='$n/@type = "DOMString"'>String</xsl:when>
-      <xsl:when test='$n/@type = "unsigned long"'>long</xsl:when>
-      <xsl:when test='$n/@type = "unsigned short"'>short</xsl:when>
-      <xsl:when test='$n/@type = "octet"'>byte</xsl:when>
-      <xsl:otherwise><xsl:value-of select='$n/@type'/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-
-  <xsl:function name='x:deref'>
-    <xsl:param name='s'/>
-    <xsl:param name='ctx' as='node()'/>
-    <xsl:variable name='n' select='id($s, $ctx)'/>
-    <xsl:choose>
-      <xsl:when test='$n/self::idl:typedef/idl:type/idl:scopedname'>
-        <xsl:copy-of select='x:deref($n/idl:type/idl:scopedname/@ref, $ctx)'/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select='$s'/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-</xsl:stylesheet>
-
--- a/master/implnote.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/implnote.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -347,10 +349,10 @@
 <p>An arbitrary point (<var>x</var>,&nbsp;<var>y</var>) on the elliptical
 arc can be described by the 2-dimensional matrix equation:</p>
 
-<table summary="equation F.6.3.1" width="90%" border="0"
-cellspacing="0" cellpadding="0">
+<table  style="width: 90%"
+>
   <tr>
-    <td valign="top">
+    <td>
       <math xmlns="http://www.w3.org/1998/Math/MathML">
         <mrow>
           <mo>(</mo>
@@ -393,7 +395,7 @@
         </mrow>
       </math>
     </td>
-    <td align="right">(F.6.3.1)</td>
+    <td style="text-align: right">(F.6.3.1)</td>
   </tr>
 </table>
 
@@ -461,31 +463,30 @@
 
 <p>This can be achieved using the following formulas:</p>
 
-<table summary="elliptical arc formulas" width="90%" border="0"
-cellspacing="8" cellpadding="0">
+<table style="width: 90%">
   <tr>
-    <td valign="top"><img
+    <td><img
     alt="Equation F.6.4.1"
     src="images/implnote/arcs/image004.png" /></td>
-    <td align="right">(F.6.4.1)</td>
+    <td style="text-align: right">(F.6.4.1)</td>
   </tr>
   <tr>
-    <td valign="top"><img
+    <td><img
     alt="Equation F.6.4.2"
     src="images/implnote/arcs/image006.png" /></td>
-    <td align="right">(F.6.4.2)</td>
+    <td style="text-align: right">(F.6.4.2)</td>
   </tr>
   <tr>
-    <td valign="top"><img
+    <td><img
     alt="Equation F.6.4.3"
     src="images/implnote/arcs/image008.png" /></td>
-    <td align="right">(F.6.4.3)</td>
+    <td style="text-align: right">(F.6.4.3)</td>
   </tr>
   <tr>
-    <td valign="top"><img
+    <td><img
     alt="Equation F.6.4.4"
     src="images/implnote/arcs/image010.png" /></td>
-    <td align="right">(F.6.4.4)</td>
+    <td style="text-align: right">(F.6.4.4)</td>
   </tr>
 </table>
 
@@ -527,26 +528,26 @@
 <ul>
   <li>
     <p><em>Step 1: Compute</em> (<var>x</var><sub>1</sub>′,&nbsp;<var>y</var><sub>1</sub>′)</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.1"
         src="images/implnote/arcs/image012.png" /></td>
-        <td align="right">(F.6.5.1)</td>
+        <td style="text-align: right">(F.6.5.1)</td>
       </tr>
     </table>
   </li>
 
   <li>
     <p><em>Step 2: Compute</em> (<var>c<sub>x</sub></var>′,&nbsp;<var>c<sub>y</sub></var>′)</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.2"
         src="images/implnote/arcs/image014.png" /></td>
-        <td align="right">(F.6.5.2)</td>
+        <td style="text-align: right">(F.6.5.2)</td>
       </tr>
     </table>
     <p>where the + sign is chosen if <var>f<sub>A</sub></var>&nbsp;≠&nbsp;<var>f<sub>S</sub></var>, and
@@ -556,13 +557,13 @@
   <li>
     <p><em>Step 3: Compute</em> (<var>c<sub>x</sub></var>,&nbsp;<var>c<sub>y</sub></var>)
     <em>from</em> (<var>c<sub>x</sub></var>′,&nbsp;<var>c<sub>y</sub></var>′)</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.3"
         src="images/implnote/arcs/image016.png" /></td>
-        <td align="right">(F.6.5.3)</td>
+        <td style="text-align: right">(F.6.5.3)</td>
       </tr>
     </table>
   </li>
@@ -572,13 +573,13 @@
     <p>In general, the angle between two vectors
     (<var>u<sub>x</sub></var>,&nbsp;<var>u<sub>y</sub></var>)
     and (<var>v<sub>x</sub></var>,&nbsp;<var>v<sub>y</sub></var>) can be computed as</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.4"
         src="images/implnote/arcs/image018.png" /></td>
-        <td align="right">(F.6.5.4)</td>
+        <td style="text-align: right">(F.6.5.4)</td>
       </tr>
     </table>
 
@@ -588,19 +589,19 @@
     <p>This angle function can be used to express <var>θ</var><sub>1</sub> and
     Δ<var>θ</var> as follows:</p>
 
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.5"
         src="images/implnote/arcs/image020.png" /></td>
-        <td align="right">(F.6.5.5)</td>
+        <td style="text-align: right">(F.6.5.5)</td>
       </tr>
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.5.6"
         src="images/implnote/arcs/image022.png" /></td>
-        <td align="right">(F.6.5.6)</td>
+        <td style="text-align: right">(F.6.5.6)</td>
       </tr>
     </table>
      
@@ -638,13 +639,13 @@
     <p><em>Step 2: Ensure radii are positive</em></p>
     <p>Take the absolute value of <var>r<sub>x</sub></var> and
     <var>r<sub>y</sub></var>:</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.6.1"
         src="images/implnote/arcs/image024.png" /></td>
-        <td align="right">(F.6.6.1)</td>
+        <td style="text-align: right">(F.6.6.1)</td>
       </tr>
     </table>
   </li>
@@ -653,13 +654,13 @@
     <p><em>Step 3: Ensure radii are large enough</em></p>
     <p>Using the primed coordinate values of equation (F.6.5.1),
     compute</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.6.2"
         src="images/implnote/arcs/image026.png" /></td>
-        <td align="right">(F.6.6.2)</td>
+        <td style="text-align: right">(F.6.6.2)</td>
       </tr>
     </table>
     <p>If the result of the above equation is less than or equal to
@@ -667,13 +668,13 @@
     and <var>r<sub>y</sub></var>. If
     the result of the above equation is greater than 1, then make
     the replacements</p>
-    <table summary="elliptical arc formulas" width="90%" border="0"
-    cellspacing="0" cellpadding="0">
+    <table  style="width: 90%"
+    >
       <tr>
-        <td valign="top"><img
+        <td><img
         alt="Equation F.6.6.3"
         src="images/implnote/arcs/image028.png" /></td>
-        <td align="right">(F.6.6.3)</td>
+        <td style="text-align: right">(F.6.6.3)</td>
       </tr>
     </table>
   </li>
--- a/master/index.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/index.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -22,17 +24,21 @@
     <dt>Latest version:</dt>
     <dd><edit:latestversion/></dd>
     <edit:includelatesteditorsdraft/>
+    <!--
     <dt>Previous version:</dt>
     <dd><edit:previousversion/></dd>
+    -->
     <dt>Single page version:</dt>
     <dd><edit:thisversion single-page="true"/></dd>
     <dt>Public comments:</dt>
     <dd><a href="mailto:www-svg@w3.org" class='url'>www-svg@w3.org</a> (<a href="http://lists.w3.org/Archives/Public/www-svg/">archive</a>)</dd>
     <dt class="top-editors">Editors:</dt>
+    <dd>Nikos Andronikos, Canon, Inc. &lt;<a href="mailto:nikos.andronikos@cisra.canon.com.au" class='url'>nikos.andronikos@cisra.canon.com.au</a>&gt;</dd>
     <dd>Tavmjong Bah, Invited Expert &lt;<a href="mailto:tavmjong@free.fr" class='url'>tavmjong@free.fr</a>&gt;</dd>
-    <dd>Brian Birtles, Mozilla Japan &lt;<a href="mailto:birtles@mozilla-japan.org" class='url'>birtles@mozilla-japan.org</a>&gt;</dd>
+    <dd>Brian Birtles, Mozilla Japan &lt;<a href="mailto:bbirtles@mozilla.com" class='url'>bbirtles@mozilla.com</a>&gt;</dd>
     <dd>Cyril Concolato, Telecom ParisTech &lt;<a href="mailto:cyril.concolato@telecom-paristech.fr" class='url'>cyril.concolato@telecom-paristech.fr</a>&gt;</dd>
     <dd>Erik Dahlström, Opera Software &lt;<a href="mailto:ed@opera.com" class='url'>ed@opera.com</a>&gt;</dd>
+    <dd>Chris Lilley, W3C &lt;<a href="mailto:chris@w3.org" class='url'>chris@w3.org</a>&gt;</dd>
     <dd>Cameron McCormack, Mozilla Corporation &lt;<a href="mailto:cam@mcc.id.au" class='url'>cam@mcc.id.au</a>&gt;</dd>
     <dd>Dirk Schulze, Adobe Systems &lt;<a href="mailto:dschulze@adobe.com" class='url'>dschulze@adobe.com</a>&gt;</dd>
     <dd>Jonathan Watt, Mozilla Corporation &lt;<a href="mailto:jwatt@jwatt.org" class='url'>jwatt@jwatt.org</a>&gt;</dd>
@@ -53,15 +59,15 @@
 an XML serialization is given, processing is defined in terms of a
 DOM.</p>
 
-<h2 id="status">Status of this document</h2>
+<h2 id="status">Status of This Document</h2>
 
 <p><em>This section describes the status of this document at the time of its
 publication. Other documents may supersede this document. A list of current W3C
 publications and the latest revision of this technical report can be found in
 the <a href="http://www.w3.org/TR/">W3C technical reports index</a> at http://www.w3.org/TR/</em>.</p>
 
-<p>This document is the <edit:date/> <strong><edit:maturity/></strong> of SVG 2.  This version of SVG
-builds upon <a href="http://www.w3.org/2011/08/REC-SVG11-20110816/">SVG 1.1 Second Edition</a>
+<p>This document is the <edit:date/> <strong><edit:longermaturity/></strong> of SVG 2.  This version of SVG
+builds upon <a href="http://www.w3.org/TR/2011/REC-SVG11-20110816/">SVG 1.1 Second Edition</a>
 by improving the usability of the language and by adding new features commonly
 requested by authors.  The <a href="changes.html">Changes</a> appendix lists all
 of the changes that have been made since SVG 1.1 Second Edition.</p>
@@ -77,6 +83,33 @@
 <a href="mailto:www-svg-request@w3.org" class='url'>www-svg-request@w3.org</a> with
 the word <code>subscribe</code> in the subject line.</p>
 
+<div class="note">
+  <p>The specification includes a number of annotations that the Working Group is
+  using to record links to meeting minutes and resolutions where specific decisions
+  about SVG features have been made. Different coloring is also used to mark the
+  maturity of different sections of the specification:</p>
+  <ul>
+    <li>a red background indicates a section that is either unchanged since SVG
+    1.1 (and which therefore still requires review and possible rewriting for
+    SVG 2), or a section that is new but still requires substantial work</li>
+
+    <li>a yellow background indicates a section from SVG 1.1 that has been reviewed
+    and rewritten if necessary, or a new section that is complete and ready
+    for the rest of the Working Group to review</li>
+
+    <li>a white background indicates a section, either from SVG 1.1 or new for
+    SVG 2, that has been reviewed by the Working Group and which is ready
+    for wider review</li>
+  </ul>
+  <!--
+  <p>In this <edit:maturity/>, by default, the background colors indicating
+  section maturity are hidden and only annotations that record specific
+  requirements for SVG 2 as part of our requirements gathering exercise are
+  visible.  To view the section maturity background colors and any additional
+  annotations, the "All annotations" alternate style sheet can be used.</p>
+  -->
+</div>
+
 <!--
 XXX At some point we will need to publish the new test suite in Mercurial and
 link to it from here.
@@ -101,7 +134,17 @@
 
 <p>This document was produced by a group operating under the
 <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 W3C Patent Policy</a>. 
-W3C maintains a <a rel="disclosure" href="http://www.w3.org/2004/01/pp-impl/19480/status">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the W3C Patent Policy</a>.</p>
+W3C maintains a <a rel="disclosure" href="http://www.w3.org/2004/01/pp-impl/19480/status">public list of any patent disclosures</a>
+made in connection with the deliverables of the group; that page also includes
+instructions for disclosing a patent. An individual who has actual knowledge of
+a patent which the individual believes contains
+<a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a>
+must disclose the information in accordance with
+<a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the W3C Patent Policy</a>.</p>
+
+<p>Publication as a Working Draft does not imply endorsement by the W3C Membership.
+This is a draft document and may be updated, replaced or obsoleted by other documents
+at any time. It is inappropriate to cite this document as other than work in progress.</p>
 
 <p>A list of current W3C Recommendations and other technical documents can be found at
 <a href="http://www.w3.org/TR/" class='url'>http://www.w3.org/TR/</a>. W3C publications
@@ -144,7 +187,6 @@
   <li>Anthony Grasso, Canon Inc. &lt;<a href="mailto:anthony.grasso@cisra.canon.com.au" class='url'>anthony.grasso@cisra.canon.com.au</a>&gt; <span class="authornote">(Version 1.1 Second Edition)</span></li>
   <li>Dean Jackson, ex W3C &lt;<a href="mailto:dean@w3.org" class='url'>dean@w3.org</a>&gt; <span class="authornote">(Version 1.1 First Edition; until February 2007)</span></li>
   <li>&#34276;&#27810; &#28147; (FUJISAWA Jun), Canon Inc. &lt;<a href="mailto:fujisawa.jun@canon.co.jp" class='url'>fujisawa.jun@canon.co.jp</a>&gt; <span class="authornote">(Version 1.1 First Edition)</span></li>
-  <li>Chris Lilley, W3C &lt;<a href="mailto:chris@w3.org" class='url'>chris@w3.org</a>&gt; <span class="authornote">(Versions 1.0, 1.1 First Edition and 1.1 Second Edition)</span></li>
   <li>Doug Schepers, W3C &lt;<a href="mailto:schepers@w3.org" class='url'>schepers@w3.org</a>&gt; <span class="authornote">(Version 1.1 Second Edition)</span></li>
 </ul>
 
--- a/master/interact.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/interact.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -68,36 +70,88 @@
 
 <h2 id="SVGEvents">Complete list of supported events</h2>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Anchor events</p>
-  <p>Resolution: SVG 2 will consider adding HTML document wide events (including hashchange) apply to SVG documents when they make sense</p>
-  <p><a href="http://www.w3.org/2011/12/22-svg-irc#T21-17-25">22 December 2011 SVG WG telcon</a>.</p>
-  <p>Purpose: Allow authors to use the same set of event listener attributes on a root SVG element that they can on an HTML body or root element</p>
-  <p>Owner: Cameron (ACTION-3278)</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support anchor change events.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/12/22-svg-irc#T21-23-17">SVG 2 will consider adding HTML document wide events (including hashchange) apply to SVG documents where they make sense.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow authors to use the same set of event listener attributes on a root SVG element that they can on an HTML body or root element.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3278">ACTION-3278</a>)</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Have event listener attributes on an appropriate interface</p>
-  <p>Resolution: SVG 2 will move all events listener attributes to Element, in accordance with the similar move in HTML</p>
-  <p><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item03">Seattle F2F 2011 Day 1</a>.</p>
-  <p>Purpose: Alignment with HTML</p>
-  <p>Owner: Cameron (ACTION-3283)</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Have event listener attributes on an appropriate interface.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item03">SVG 2 will move all events listener attributes to Element, in accordance with the similar move in HTML.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To align with HTML.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3283">ACTION-3283</a>)</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Introduce evt as an alias to event in event handlers</p>
-  <p>Resolution: We decide to resolve ISSUE-2176 by introducing evt as an alias to event in event handlers</p>
-  <p><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item15">Seattle F2F 2011 Day 1</a>.</p>
-  <p>Purpose: Alignment with HTML</p>
-  <p>Owner: Cameron (ACTION-3093)</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Introduce evt as an alias to event in event handlers.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item15">We decide to resolve ISSUE-2176 by introducing evt as an alias to event in event handlers.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To align with HTML.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3093">ACTION-3093</a>)</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Support drag &amp; drop functionality</p>
-  <p>Resolution: SVG 2 may require drag &amp; drop functionality, and we'll investigate html5's functionality for that</p>
-  <p><a href="http://www.w3.org/2011/12/22-svg-irc#T21-13-35">Telcon 2011-12-22</a>.</p>
-  <p>Purpose: Allow easier drag &amp; drop in svg, alignment with html5</p>
-  <p>Owner: Erik</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support drag &amp; drop functionality.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/12/22-svg-irc#T21-31-24">SVG 2 may require drag &amp; drop functionality, and we'll investigate HTML5's functionality for that.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow easier drag &amp; drop in SVG, and to align with HTML.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Erik (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3328">ACTION-3328</a>)</td>
+    </tr>
+  </table>
 </div>
 
 <p>The following aspects of SVG are affected by events:</p>
@@ -130,13 +184,12 @@
 <p>Requirements in the table on whether an event of a given type
 bubbles or is cancelable apply only to events that are created and
 dispatched by the user agent.  Events of those types created from script
-using the <a class='idlattr' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-DocumentEvent-createEvent'>createEvent</a>
-method on the <a>DocumentEvent</a> interface can be made to bubble
+using the <code>createEvent</code> method on the <a>Document</a> interface can be made to bubble
 or be cancelable with the
 <a class='idlattr' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-Event-initEvent'>initEvent</a>
 method.</p>
 
-    <table summary="Complete list of SVG events" class="vert event-table">
+    <table  class="vert event-table">
       <tr>
         <th>Event name and description</th>
         <th>DOM2 name</th>
@@ -351,11 +404,13 @@
           agent has fully parsed the element and its descendants and
           is ready to act appropriately upon that element, such as
           being ready to render the element to the target device.
-          <a href="struct.html#ExternalResourcesRequired">Referenced
-          external resources that are required</a> must be loaded,
+          Referenced external resources that are required must be loaded,
           parsed and ready to render before the event is triggered.
           Optional external resources are not required to be ready
           for the event to be triggered.</p>
+	  <p class="issue">Now that <span class="attr-name">'externalResourcesRequired'</span>
+	  has been removed, we need to have better wording for
+	  when SVGLoad is dispatched.</p>
           <p>SVGLoad events do not bubble and are not cancelable.</p>
         </td>
         <td>(same)</td>
@@ -614,10 +669,10 @@
   should be displayed, as appropriate to the type of pointer event;</li>
 
   <li>If the element matches any relevant
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/selector.html#q15">dynamic pseudo-class selectors</a>
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/selector.html#pseudo-class-selectors">dynamic pseudo-class selectors</a>
   appropriate to the type of pointer event, such as <code>:hover</code>,
   <code>:active</code>, or <code>:focus</code> as described in
-  [<a href="refs.html#ref-CSS2">CSS2</a>], section 5.11, then the relevant class
+  [<a href="refs.html#ref-CSS21">CSS21</a>], section 5.11, then the relevant class
   properties are applied;</li>
 
   <li>If the element and the event type are associated with the activation
@@ -646,7 +701,7 @@
   panning of an SVG document fragment.</li>
 </ol>
 
-<h2 id="PointerEventsProperty">The <span class="property">'pointer-events'</span> property</h2>
+<h2 id="PointerEventsProp">The <span class="property">'pointer-events'</span> property</h2>
 
 <p>In different circumstances, authors may want to control
 under what conditions particular graphic elements can become
@@ -693,8 +748,8 @@
 <ul>
   <li>user interface events such as mouse clicks</li>
 
-  <li><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/selector.html#q15">dynamic pseudo-classes</a>
-  (i.e., :hover, :active and :focus; [<a href="refs.html#ref-CSS2">CSS2</a>],
+  <li><a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/selector.html#pseudo-class-selectors">dynamic pseudo-classes</a>
+  (i.e., :hover, :active and :focus; [<a href="refs.html#ref-CSS21">CSS21</a>],
   section 5.11)</li>
 
   <li>hyperlinks (see <a href="linking.html#Links">Links out of
@@ -884,13 +939,29 @@
 
 <h2 id="EnableZoomAndPanControls">Magnification and panning</h2>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Support level of detail control.</p>
-  <p>Resolution: We will support Level of Detail control in SVG 2.</p>
-  <p><a href="">Pre-TPAC F2F Day 1</a>.</p>
-  <p>Purpose: Control visibility of elements based on zoom level (useful, for example,
-  in mapping). See <a href="http://www.w3.org/Submission/2011/SUBM-SVGTL-20110607/#VisibilityControllingAccordingToZooming">Tiling and Layering Module for SVG 1.2 Tiny</a>.</p>
-  <p>Owner: Doug.</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support level of detail control.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T00-20-33">We will support Level of Detail control in SVG 2.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Control visibility of elements based on zoom level (useful, for example, in mapping).</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Doug (no action)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>See <a href="http://www.w3.org/Submission/2011/SUBM-SVGTL-20110607/#VisibilityControllingAccordingToZooming">Tiling and Layering Module for SVG 1.2 Tiny</a>.</td>
+    </tr>
+  </table>
 </div>
 
 <p id="ZoomAndPanAttribute">Magnification represents a complete, uniform
@@ -950,8 +1021,8 @@
 a <a>'cursor element'</a> element, which can be
 used to define a platform-independent cursor.</p>
 
-<div class="ready-for-wg-review">
-<h3 id="CursorProperty">The <span class="property">'cursor'</span> property</h3>
+<div class="ready-for-wider-review">
+<h3 id="CursorProperty">The effect of the <span class="property">'cursor'</span> property</h3>
 
 <p class="note">See the CSS Basic User Interface Module Level 3 specification
 for the definition of <a>'cursor property'</a>. [<a href="refs.html#ref-CSS3UI">CSS3UI</a>]</p>
@@ -1055,12 +1126,14 @@
 
 The <a>SVGCursorElement</a> interface corresponds to the
 <a>'cursor element'</a> element.
-<pre class="idl">interface <b>SVGCursorElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                             <a class="idlinterface" href="types.html#InterfaceSVGURIReference">SVGURIReference</a>,
-                             <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a> {
+<pre class="idl">interface <b>SVGCursorElement</b> : <a>SVGDefinitionElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="interact.html#__svg__SVGCursorElement__x">x</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="interact.html#__svg__SVGCursorElement__y">y</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGCursorElement</a> implements <a>SVGURIReference</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
--- a/master/intro.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/intro.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -60,7 +62,7 @@
 
 <h2 id="MIMEType">SVG MIME type, file name extension and Macintosh file type</h2>
 
-<p>The MIME type for SVG is "<tt>image/svg+xml</tt>" (see
+<p>The MIME type for SVG is "<code>image/svg+xml</code>" (see
 <a href="http://www.ietf.org/rfc/rfc3023.txt"><cite>XML Media Types</cite></a>
 [<a href="refs.html#ref-RFC3023">RFC3023</a>]). The
 registration of this MIME type is in progress at the W3C.</p>
@@ -79,7 +81,7 @@
 SVG files stored on Macintosh HFS file systems be given a file
 type of <code>"svgz"</code> (all lowercase).</p>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="Namespace">SVG namespace and DTD</h2>
 
 <p>The SVG 2 namespace is <code>http://www.w3.org/2000/svg</code>,
@@ -104,8 +106,8 @@
 
 <ul>
   <li>SVG is an application of XML and is compatible with the
-  <a href="http://www.w3.org/TR/2008/REC-xml-20081126/"><cite>Extensible Markup Language (XML) 1.0</cite></a> Recommendation
-  [<a href="refs.html#ref-XML10">XML10</a>]</li>
+  <a href="http://www.w3.org/TR/2008/REC-xml-20081126/"><cite>Extensible Markup Language (XML) 1.0</cite></a>
+  Recommendation [<a href="refs.html#ref-XML10">XML10</a>]</li>
 
   <li>SVG is compatible with the <a href="http://www.w3.org/TR/2006/REC-xml-names-20060816/"><cite>Namespaces in XML</cite></a> Recommendation
   [<a href="refs.html#ref-XML-NS">XML-NS</a>]</li>
@@ -114,11 +116,16 @@
   [<a href="refs.html#ref-XLINK">XLINK</a>] for IRI
   referencing and requires support for base IRI specifications
   defined in <a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/"><cite>XML Base</cite></a>
-  [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].</li>
+  [<a href="refs.html#ref-XML-BASE">XML-BASE</a>].
+  
+  <p class="issue">The plan is to move away from XLink and use non-namespaced
+  attributes for linking, while keeping <span class='attr-name'>'xlink:href'</span>
+  for compatibility with existing content.  Other unrelated XLink attributes
+  like <a>'xlink:role'</a> will be removed.</p></li>
 
   <li>SVG content can be styled by either CSS (see
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/"><cite>Cascading Style Sheets (CSS) level 2</cite></a>
-  [<a href="refs.html#ref-CSS2">CSS2</a>]) or XSLT
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style Sheets (CSS) Level 2 Revision 1</cite></a>
+  [<a href="refs.html#ref-CSS21">CSS21</a>]) or XSLT
   (see <a href="http://www.w3.org/TR/1999/REC-xslt-19991116"><cite>XSL Transformations (XSLT) Version 1.0</cite></a>
   [<a href="refs.html#ref-XSLT">XSLT</a>] and
   <a href="http://www.w3.org/TR/2007/REC-xslt20-20070123/"><cite>XSL Transformations (XSLT) Version 2.0</cite></a>
@@ -137,16 +144,13 @@
   [<a href="refs.html#ref-XML-SS">XML-SS</a>].</li>
 
   <li>SVG includes a complete Document Object Model (DOM) and
-  conforms to the <a href="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/"><cite>Document Object Model (DOM) Level 1</cite></a>
-  Recommendation [<a
-  href="refs.html#ref-DOM1">DOM1</a>]. The
-  SVG DOM has a high level of compatibility and consistency
+  extends <a href="http://www.w3.org/TR/dom/"><cite>DOM4</cite></a>.
+  The SVG DOM has a high level of compatibility and consistency
   with the HTML DOM that is defined in the DOM Level 1
   specification. Additionally, the SVG DOM supports and
   incorporates many of the facilities described in 
   DOM Level 2, including the CSS object model and event
   handling
-  [<a href="refs.html#ref-DOM2">DOM2</a>]
   [<a href="refs.html#ref-DOM2STYLE">DOM2STYLE</a>]
   [<a href="refs.html#ref-DOM2EVENTS">DOM2EVENTS</a>].</li>
   <li>SVG incorporates some features and approaches that are
@@ -173,7 +177,7 @@
   facilities are modeled directly after HTML, including its use
   of CSS [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>],
   its approach to event handling, and its approach to its
-  Document Object Model [<a href="refs.html#ref-DOM2">DOM2</a>].</li>
+  Document Object Model [<a href="refs.html#ref-DOM4">DOM4</a>].</li>
 
   <li>SVG is compatible with W3C work on internationalization.
   References (W3C and otherwise) include: [<a
@@ -187,8 +191,8 @@
 </ul>
 
 <p>In environments which support
-<a href="http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/">DOM 2 Core</a>
-[<a href="refs.html#ref-DOM2">DOM2</a>] for other
+<a href="http://www.w3.org/TR/dom/">DOM4</a>
+[<a href="refs.html#ref-DOM4">DOM4</a>] for other
 XML grammars (e.g., XHTML [<a href="refs.html#ref-XHTML">XHTML</a>]) and which also
 support SVG and the SVG DOM, a single scripting approach can be
 used simultaneously for both XML documents and SVG graphics, in
@@ -227,9 +231,10 @@
   The animation event attributes are <edit:attributecategory name='animation event'/>.</dd>
 
   <dt id="TermBasicShapeElement">basic shape</dt>
-  <dd>Standard shapes which are predefined in SVG as a
-  convenience for common graphical operations. Specifically:
-  <edit:elementcategory name='basic shape'/>.</dd>
+  <dt id="TermShapeElement">shape</dt>
+  <dd>A graphics element that is defined by some combination of
+  straight lines and curves. Specifically:
+  <edit:elementcategory name='shape'/>.</dd>
 
   <dt id="TermBoundingBox">bounding box</dt>
   <dd>
@@ -267,7 +272,7 @@
   for details.  The conditional processing attributes defined in
   SVG 1.1 are <edit:attributecategory name='conditional processing'/>.</dd>
 
-  <dt id="TermCoreAttributes">core attributes</dt>
+  <dt id="TermCoreAttribute">core attributes</dt>
   <dd>The core attributes are those attributes that can be specified
   on any SVG element.  See <a href="struct.html#CommonAttributes">Common attributes</a>.
   The core attributes are <edit:attributecategory name='core'/>.</dd>
@@ -433,7 +438,7 @@
 
   <dt id="TermMarkableElement">markable element</dt>
   <dd>A markable element is one that can have <a href="painting.html#Markers">markers</a>
-  painted on it either through the use of the <a href="painting.html#MarkerProperties">marker properties</a>
+  painted on it either through the use of the <a href="painting.html#TermMarkerProperties">marker properties</a>
   or by having a <a>'marker element'</a> element as a child.
   The following elements are markable elements:
   <edit:elementcategory name='markable'/></dd>
@@ -494,7 +499,7 @@
   assigned to elements in the SVG language either by
   <a>presentation attributes</a>
   on elements in the SVG language or by using a styling language such as CSS
-  [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>]. See
+  [<a href="refs.html#ref-CSS21">CSS21</a>]. See
   <a href="styling.html">Styling</a>.</dd>
       
   <dt id="TermRootmostSVGElement">rootmost <span class="element-name">'svg'</span> element</dt>
@@ -503,17 +508,6 @@
   <a>SVG context</a>.
   See also <a>SVG document fragment</a>.</dd>
 
-  <dt id="TermShapeElement">shape</dt>
-  <dd>A graphics element that is defined by some combination of
-  straight lines and curves. Specifically:
-  <a>'path'</a>,
-  <a>'rect'</a>,
-  <a>'circle'</a>,
-  <a>'ellipse'</a>,
-  <a>'line'</a>,
-  <a>'polyline'</a> and
-  <a>'polygon'</a>.</dd>
-
   <dt id="TermStroke">stroke</dt>
   <dd>The operation of <a>painting</a> the outline
   of a <a>shape</a> or the outline of
--- a/master/java.html	Fri Sep 07 15:54:44 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional+edit//EN" "xhtml1-transitional+edit.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:edit="http://xmlns.grorg.org/SVGT12NG/">
-<head>
-  <title>Java Language Binding</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
-  <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
-  <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
-  <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
-  <!-- W3C style sheet will be added here during processing. -->
-</head>
-<body>
-
-<h1>Java Language Binding</h1>
-
-<p class="normativity"><em>This appendix is informative, not normative.</em></p>
-
-<h2 id="JavaBinding">The Java language binding</h2>
-
-<p>The Java language binding for the SVG Document Object Model definitions
-is available at:</p>
-
-<pre><edit:locallink href="java-binding.zip"/></pre>
-
-<p>Note that this language binding is not normative. The IDL Definitions are
-the normative parts of the SVG DOM.</p>
-
-<h2 id="UsingSVGWithJava">Using SVG with the Java language</h2>
-
-<p>When scripting SVG with a language such as ECMAScript, it is
-possible to embed script code directly in the SVG content using
-the <a>'script'</a> element and the event attributes (e.g., <a>'image/onload'</a>
-or <a>'onclick'</a>). For programming languages with a binary delivery
-format, such as the Java language, it is not possible to embed
-the code into the <a>'script'</a> element or within the event
-attributes. Therefore there is a need to specify how such
-languages can bind to and handle events in the SVG document.
-The following technique describes how this should be done when
-using the Java language and what is expected of the User Agent
-that supports dynamic SVG content through the Java language.</p>
-
-<ul>
-  <li>The <a>'script'</a> element should reference a jar file containing
-  the compiled code to handle the events fired by the document. For
-  example:
-<pre><![CDATA[
-<script type="application/java-archive" xlink:href="myJavaHandlers.jar"/>
-]]></pre>
-  </li>
-
-  <li>The manifest in the referenced jar file contains an entry,
-  SVG-Handler-Class, defining the class responsible for initializing
-  the event listeners on the SVG document. The entry should be a fully
-  qualified class name. For example:
-<pre>
-Manifest-Version: 1.1
-SVG-Handler-Class: org.example.svg.SVGHandler
-</pre>
-  </li>
-  <li>The class referenced by SVG-Handler-Class implements the
-  EventListenerInitializer interface defined as:
-<pre>
-public interface EventListenerInitializer {
-  void initializeEventListeners(SVGDocument doc);
-}
-</pre>
-  </li>
-
-  <li>The method initializeEventListeners() will be called by
-  the User Agent before the onload event is triggered.</li>
-</ul>
-
-<p>The event binding of other binary programming languages is not specified.</p>
-
-</body>
-</html>
--- a/master/linking.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/linking.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -173,7 +175,6 @@
   <li>the <a>'animateTransform'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
   <li>the <a>'clip-path'</a> property must reference a <a>'clipPath'</a> element</li>
   <li>the <a>'color-profile element'</a> element must reference an ICC profile resource</li>
-  <li>the <a>'color-profile property'</a> property must reference an ICC profile resource or a <a>'color-profile element'</a> element</li>
   <li>the <a href="color.html#ColorProfileSrcProperty">'src'</a> descriptor on an @color-profile definition must reference an ICC profile resource or a <a>'color-profile element'</a> element</li>
   <li>the <a>'cursor element'</a> element must reference a resource that can provide an image for the cursor graphic</li>
   <li>the <a>'cursor property'</a> property must reference a resource that can provide an image for the cursor graphic</li>
@@ -241,8 +242,7 @@
 
     <div class="adef-list">
       <dl>
-        <dt><a id="XLinkTypeAttribute"
-          name="XLinkTypeAttribute"></a> <span
+        <dt><a id="XLinkTypeAttribute" ></a> <span
             class="adef">xlink:type</span> = "<span
               class="attr-value">simple</span>"</dt>
         <dd><p>Identifies the type of XLink being used.  In SVG 1.1, only
@@ -255,8 +255,7 @@
           <p class="anim-target"><a
             href="animate.html#Animatable">Animatable</a>:
             no.</p></dd>
-        <dt><a id="XLinkRoleAttribute"
-          name="XLinkRoleAttribute"></a> <span
+        <dt><a id="XLinkRoleAttribute" ></a> <span
             class="adef">xlink:role</span> = "<span
               class="attr-value"><a
                 href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
@@ -272,8 +271,7 @@
           <p class="anim-target"><a
             href="animate.html#Animatable">Animatable</a>:
             no.</p></dd>
-        <dt><a id="XLinkArcRoleAttribute"
-          name="XLinkArcRoleAttribute"></a> <span
+        <dt><a id="XLinkArcRoleAttribute" ></a> <span
             class="adef">xlink:arcrole</span> = "<span
               class="attr-value"><a
                 href="types.html#DataTypeIRI">&lt;IRI&gt;</a></span>"</dt>
@@ -299,8 +297,7 @@
           <p class="anim-target"><a
             href="animate.html#Animatable">Animatable</a>:
             no.</p></dd>
-        <dt><a id="XLinkTitleAttribute"
-          name="XLinkTitleAttribute"></a> <span
+        <dt><a id="XLinkTitleAttribute" ></a> <span
             class="adef">xlink:title</span> = "<span
                 class="attr-value"><a href="types.html#DataTypeAnything">&lt;anything&gt;</a></span>"</dt>
         <dd><p>The title attribute shall be used to describe the meaning of
@@ -320,8 +317,7 @@
           <p class="anim-target"><a
             href="animate.html#Animatable">Animatable</a>:
             no.</p></dd>
-        <dt><a id="XLinkShowAttribute"
-          name="XLinkShowAttribute"></a> <span
+        <dt><a id="XLinkShowAttribute" ></a> <span
             class="adef">xlink:show</span> = "<span
               class="attr-value">new</span>' |
           '<span
@@ -340,8 +336,7 @@
           <p class="anim-target"><a
             href="animate.html#Animatable">Animatable</a>:
             no.</p></dd>
-        <dt><a id="XLinkActuateAttribute"
-          name="XLinkActuateAttribute"></a> <span
+        <dt><a id="XLinkActuateAttribute" ></a> <span
             class="adef">xlink:actuate</span> = "<span
               class="attr-value">onLoad</span>'</dt>
         <dd><p>This attribute is provided for backwards compatibility with SVG
@@ -413,8 +408,7 @@
     <div class="adef-list">
       <p><em>Attribute definitions:</em></p>
       <dl>
-         <dt><a id="XLinkShowAttribute2"
-          name="XLinkShowAttribute2"></a> <span
+         <dt><a id="XLinkShowAttribute2" ></a> <span
             class="adef">xlink:show</span> = "<span
               class="attr-value">new</span>" |
           "<span
@@ -574,7 +568,7 @@
   <span class="attr-value">preserveAspectRatio(xMidYMid)</span>.</li>
 
   <li><span class="code-fragment">TransformParams</span> corresponds to the
-  parameter values for the <a>'transform'</a> attribute that is available on
+  parameter values for the <a>'transform'</a> property that is available on
   many elements. For example, <span class="attr-value">transform(scale(5))</span>.</li>
 
   <li><span class="code-fragment">ZoomAndPanParams</span> corresponds to the
@@ -679,15 +673,15 @@
 
 <edit:with element='a'>
 
-The <a>SVGAElement</a> interface corresponds to the <a>'a'</a> element.
-<pre class="idl">interface <b>SVGAElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                        <a class="idlinterface" href="types.html#InterfaceSVGURIReference">SVGURIReference</a>,
-                        <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
-                        <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                        <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a>,
-                        <a class="idlinterface" href="types.html#InterfaceSVGTransformable">SVGTransformable</a> {
+<p>The <a>SVGAElement</a> interface corresponds to the <a>'a'</a> element.</p>
+
+<pre class="idl">interface <b>SVGAElement</b> : <a>SVGGraphicsElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedString">SVGAnimatedString</a> <a href="linking.html#__svg__SVGAElement__target">target</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGAElement</a> implements <a>SVGURIReference</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -711,12 +705,16 @@
 
 <edit:with element='view'>
 
-The <a>SVGViewElement</a> interface corresponds to the <a>'view'</a> element.
-<pre class="idl">interface <b>SVGViewElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGFitToViewBox">SVGFitToViewBox</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGZoomAndPan">SVGZoomAndPan</a> {
+<p>The <a>SVGViewElement</a> interface corresponds to the <a>'view'</a> element.</p>
+
+<pre class="idl">interface <b>SVGViewElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGStringList">SVGStringList</a> <a href="linking.html#__svg__SVGViewElement__viewTarget">viewTarget</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGViewElement</a> implements <a>SVGFitToViewBox</a>;
+<a>SVGViewElement</a> implements <a>SVGZoomAndPan</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
--- a/master/masking.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/masking.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,25 +6,15 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
 
-<div class="annotation">
-  <p>
-    The SVG 2 rendering model will follow the rules defined by the <a href="https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html">Compositing and Blending specification</a>.
-  </p>
-  <p>
-    Resolution: <a href="http://www.w3.org/2012/07/24-svg-minutes.html#item09">Seattle/Paris 2012 F2F day 3</a>.
-  </p>
-  <p>
-    Owner: Nikos (Action 3332).
-  </p>
-</div>
-
 <h1>Clipping, Masking and Compositing</h1>
 
 <h2 id="Introduction">Introduction</h2>
@@ -62,6 +52,27 @@
 
 <h2 id="SimpleAlphaBlending">Simple alpha compositing</h2>
 
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support new compositing and blending modes from the <a href="https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html">Compositing and Blending specification</a>.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2012/07/24-svg-minutes.html#item09">SVG WG agrees with publishing the Compositing spec.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow common graphical effects supported by Illustrator, etc.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Nikos (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3332">ACTION-3332</a>)</td>
+    </tr>
+  </table>
+</div>
+
 <p>Graphics elements are blended into the elements already
 rendered on the canvas using simple alpha compositing, in which
 the resulting color and opacity at any given pixel on the
@@ -92,6 +103,11 @@
 
 <h2 id="ClippingPaths">Clipping paths</h2>
 
+<p class="note">
+Note that this section may be moved to a separate CSS Masking specification in
+a future draft.
+</p>
+
 <p>The clipping path restricts the region to which paint can be
 applied. Conceptually, any parts of the drawing that lie
 outside of the region bounded by the currently active clipping
@@ -160,8 +176,8 @@
 </table>
 
 <p>The <a>'overflow'</a> property has the same parameter values and has the
-same meaning <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">as defined in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.1);
+same meaning <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#propdef-overflow">as defined in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.1);
 however, the following additional points apply:</p>
 
 <ul>
@@ -187,16 +203,16 @@
   equivalent to the value <span class='prop-value'>visible</span>.</li>
 
   <li>When an <a>outermost svg element</a> is embedded inline within a
-  parent XML grammar which uses <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html">CSS layout</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 9)
+  parent XML grammar which uses <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html">CSS layout</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], chapter 9)
   or <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/">XSL formatting</a>
   [<a href="refs.html#ref-XSL">XSL</a>], if the
   <a>'overflow'</a> property has the value <span class='prop-value'>hidden</span>
   or <span class='prop-value'>scroll</span>, then the user agent will
   establish an initial clipping path equal to the bounds of the initial
   <a href="coords.html#SVGViewport">viewport</a>; otherwise, the initial
-  clipping path is set according to the <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">clipping rules as defined in CSS2</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.1).</li>
+  clipping path is set according to the <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#overflow">clipping rules as defined in CSS 2.1</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.1).</li>
 
   <li>When an <a>outermost svg element</a> is stand-alone or embedded
   inline within a parent XML grammar which does not use CSS layout
@@ -206,7 +222,7 @@
   the bounds of the initial <a href="coords.html#SVGViewport">viewport</a>.</li>
 
   <li>The initial value for <a>'overflow'</a> as defined
-  in [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#overflow">CSS2-overflow</a>]
+  in [<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#overflow">CSS21-overflow</a>]
   is 'visible', and this applies also to the <a>rootmost 'svg' element</a>; however,
   for child elements of an SVG document, SVG's <a href="styling.html#UAStyleSheet">user agent style sheet</a>
   overrides this initial value and sets the <a>'overflow'</a> property on
@@ -270,8 +286,8 @@
 </table>
 
 <p>The <a>'clip'</a> property has the same parameter values
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#clipping">as defined in CSS2</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], section 11.1.2).
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visufx.html#clipping">as defined in CSS 2.1</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], section 11.1.2).
 Unitless values, which indicate current user coordinates, are
 permitted on the coordinate values on the &lt;shape&gt;. The
 value of <span class='prop-value'>auto</span> defines a clipping path along
@@ -548,10 +564,15 @@
 
 </edit:with>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 
 <h2 id="Masking">Masking</h2>
 
+<p class="note">
+Note that this section may be moved to a separate CSS Masking specification in
+a future draft.
+</p>
+
 <p>In SVG, it is possible to specify another graphics element or file
 to be used as an alpha mask for compositing the current object into the
 background.</p>
@@ -559,9 +580,8 @@
 <p>
 A mask is applied using the <a>'mask property'</a> property.
 The mask source may be defined using a <a>'mask element'</a> element.
-Alternatively, for many simple uses, the <a>'mask property'</a> property may
-refer directly to graphical elements or images to be used as the mask source
-content forgoing the need for an explicit <a>'mask element'</a> element.
+Alternatively, the <a>'mask property'</a> property may refer to a CSS image or
+SVG <a href="pservers.html">paint server</a>.
 </p>
 
 <p>
@@ -627,14 +647,15 @@
 <dl>
   <dt id="DataTypeMaskSource"><span class="prop-value">&lt;mask-source&gt;</span> =</dt>
   <dd>
-    <a>&lt;funciri&gt;</a> | child | element(<a>&lt;compound-selector&gt;</a>)
+    <a>&lt;funciri&gt;</a> | <a>&lt;image&gt;</a> | child |
+    <a>&lt;child-selector&gt;</a>
   </dd>
 </dl>
 
-<div class="issue">
-  This should probably allow a CSS &lt;gradient&gt;, or, even better,
-  a CSS &lt;image&gt;.
-</div>
+<p class="note">
+The ability for the <a>'mask property'</a> property to reference a child element
+without an ID reference, or a CSS <a>&lt;image&gt;</a> is new in SVG 2.
+</p>
 
 <p>
 The meaning of the different <a>&lt;mask-source&gt;</a> values is as follows:
@@ -642,19 +663,33 @@
 
 <dl>
   <dt><span class="prop-value"><a href="types.html#DataTypeFuncIRI">&lt;funciri&gt;</a></span></dt>
-  <dd>An <a>IRI reference</a> to another graphical object which will be used
-  as the mask source.</dd>
+  <dd>An <a>IRI reference</a> to a <a>'mask element'</a> element or <a
+  href="pservers.html">paint server</a> element.</dd>
+  <dt><span class="prop-value"><a href="types.html#DataTypeImage">&lt;image&gt;</a></span></dt>
+  <dd>A CSS image value used to defined the contents of the offscreen buffer
+  used for masking.
+  As per the definition of <a>&lt;image&gt;</a> this value may reference bitmap
+  images, SVG images, gradients and other graphical elements.
+  <p class="issue">
+    <a>&lt;image&gt;</a> overlaps with <a>&lt;funciri&gt;</a> and hence the
+    parsing for <span class="prop-value">url(...)</span> needs to be defined
+    (e.g. references to elements may only refer to <a>'mask element'</a>
+    elements or <a href="pservers.html">paint server</a> elements, whilst <span
+    class="prop-value">url(...)</span> values without a fragment identifier are
+    processed in usual fashion for CSS Images).
+  </p>
+  </dd>
   <dt><span class="prop-value">child</span></dt>
   <dd>A keyword to indicate that the last child <a>'mask element'</a>
   element should be used as the mask source. It is equivalent to
-  <span class="prop-value">element(mask:last-of-type)</span>.</dd>
-  <dt><span class="prop-value">element (<a href="types.html#DataTypeCompoundSelector">&lt;compound-selector&gt;</a>)</span></dt>
-  <dd>A <a>&lt;compound-selector&gt;</a> scoped at the element to which the
-    <span class="property">'mask'</span> property is applied specifying the
-    element to use as the mask source.
-    As a result, only children of the target element may be used for the mask
-    source.
-  </dd>
+  <span class="prop-value">select(mask:last-of-type)</span>.</dd>
+  <dt><span class="prop-value"><a href="types.html#DataTypeChildSelector">&lt;child-selector&gt;</a></span></dt>
+  <dd>A comma-separated list of <a>compound selectors</a> scoped at the element
+      to which the <a>'mask property'</a> property applied.
+      The first matching element in <a>tree order</a> (as defined in [<a
+      href="refs.html#ref-DOM4">DOM4</a>]) as a result of evaluating the list of
+      selectors is taken as the mask source.
+      If there are no matching elements the mask source is invalid.</dd>
 </dl>
 
 <p>
@@ -710,9 +745,8 @@
 
 <p>
 The content and behavior of a mask can be defined using a <a>'mask element'</a>
-element.
-Alternatively, for many simple uses, the <a>'mask property'</a> property can
-refer directly to a graphics element or file to use as the mask source.
+element, a <a href="pservers.html">paint server</a> element, or a CSS
+<a>&lt;image&gt;</a> value.
 </p>
 
 <h4 id="MaskValues">Calculating mask values</h4>
@@ -750,7 +784,7 @@
   element'</a> element is <span class="attr-value">linearRGB</span>, convert the
   original image color values (potentially in the sRGB color space) to the linear
   RGB color space (see <a
-    href="painting.html#RenderingProperties">Rendering properties</a>).
+    href="painting.html#RenderingHints">Rendering properties</a>).
     </li>
     <li>Then, using non-premultiplied RGB color values, apply the
     luminance-to-alpha coefficients (as defined in the <a>'feColorMatrix'</a>
@@ -949,139 +983,46 @@
 on the <a>'mask element'</a> element or any of its ancestors is set to
 <span class="prop-value">none</span>.</p>
 
-<h4 id="DirectMaskSource">Directly referencing a mask source</h4>
+<h4 id="SVGPaintServer">Using an SVG paint server as a mask source</h4>
 
 <p class="note">
-The ability to reference non-<a>'mask element'</a> content is new in SVG 2.
-</p>
-
-<p>
-In some cases the <a>'mask element'</a> element used to wrap mask source content
-is superfluous and it is more convenient to directly refer to the content to be
-used as a mask source instead.
-For example, when the the mask source is a raster image applied only once it is
-more convenient to refer directly to the image than first wrapping it in
-a <a>'mask element'</a> element.
+The ability to reference paint servers with the <a>'mask property'</a> property
+is new in SVG 2.
 </p>
 
 <p>
-Besides a <a>'mask element'</a> element, the <a>'mask property'</a> property may
-refer the following types of mask source content:
-</p>
-
-<ul>
-  <li>a <a href="pservers.html">paint server</a> element,</li>
-  <li>any other element that is permitted as a child of the <a>'mask
-      element'</a> element,</li>
-  <li>an <a>'svg'</a> element or external SVG document,</li>
-  <li>any raster image file supported by the <a>'image'</a> element.</li>
-</ul>
-
-<p>
-The effect of referring directly to content as a mask source depends on the
-type of the source content.
+Besides an SVG <a>'mask element'</a> element, the 'mask' property may
+also refer to an SVG <a href="pservers.html">paint server</a> element such as
+a <a>'linearGradient'</a> element or <a>'pattern'</a> element.
+When the mask source is an SVG paint server, the effect is as if the following
+steps were performed:
 </p>
 
-<dl>
-  <dt>
-    When the mask source content is a <a href="pservers.html">paint
-    server</a> element,
-  </dt>
-  <dd>
-    <p>
-    The effect is as if the following steps were performed:
-    </p>
-    <ol>
-      <li>Create a new <a>'mask element'</a> element as a sibling of the
-          paint server element.</li>
-      <li>Let the <a>'maskUnits'</a> attribute be <span
-          class="attr-value">'userSpaceOnUse'</span>.</li>
-      <li>Let the dimensions of the mask 
-          (<a>'x'</a>, <a>'y'</a>, <a>'width'</a>, and <a>'height'</a>)
-          match the dimensions of the <a>decorated bounding box</a> of the mask
-          target.</li>
-      <li>Let the <a>'maskContentUnits'</a> attribute be <span
-          class="attr-value">'objectBoundingBox'</span>.</li>
-      <li>Create a new <a>'rect'</a> element as a child of the newly
-          created <a>'mask element'</a> element.</li>
-      <li>Let both the width and the height of the <a>'rect'</a> element be
-          <span class="attr-value">'100%'</span>.</li>
-      <li>Let the <a>'fill'</a> property of the <a>'rect'</a> element
-          refer to the paint server element.</li>
-      <li>Use the newly created <a>'mask element'</a> as the mask source.</li>
-    </ol>
-  </dd>
-  <dt>
-    When the mask source content is any other permitted SVG element
-    (including an SVG element in an external document),
-  </dt>
-  <dd>
-    <p>
-    The effect is as if the following steps were performed:
-    </p>
-    <ol>
-      <li>Create a new <a>'mask element'</a> element as a sibling of the
-          source element.</li>
-      <li>Let the <a>'maskUnits'</a> attribute be <span
-          class="attr-value">'userSpaceOnUse'</span>.</li>
-      <li>Let the dimensions of the mask 
-          (<a>'x'</a>, <a>'y'</a>, <a>'width'</a>, and <a>'height'</a>)
-          match the dimensions of the <a>decorated bounding box</a> of the mask
-          target.</li>
-      <li>Deep clone the source element and append it as a child of the newly
-          created <a>'mask element'</a> element.</li>
-      <li>Use the newly created <a>'mask element'</a> as the mask source.</li>
-    </ol>
-    <p>
-    One important result of this procedure is that the rendering of the
-    source content is unaffected by being referenced as a mask source.
-    </p>
-  </dd>
-  <dt>
-    When the mask source content is an external image resource (e.g. a raster
-    image file or an external SVG document),
-  </dt>
-  <dd>
-    The image is rendered into the mask buffer at 0,0 in the current user
-    coordinate space in place at the time when the <a>'mask property'</a>
-    property is applied.
-    The dimensions of the image is established by following the
-    <a href="http://www.w3.org/TR/css3-images/#object-negotiation">
-    CSS&#x21CB;Object Negotation algorithm</a> defined in 
-    [<a href="refs.html#ref-CSS3IMAGES">CSS3IMAGES</a>].
-    The dimensions of the mask are set to match the dimensions of the image.
-  </dd>
-  <dt>
-    Otherwise,
-  </dt>
-  <dd>
-    The type of source content is unsupported and the <a>'mask property'</a>
-    property is considered to have an unsupported value.
-  </dd>
-</dl>
-
-<p>
-Despite the ability to refer to mask source content directly, the <a>'mask
-element'</a> element still has many uses including the following:
-</p>
-
-<ul>
-  <li>To prevent the mask source content from rendering</li>
-  <li>To specify the bounds of the masking region</li>
-  <li>To make the coordinate system of the mask source content relative to the
-      bounds of the mask target (by setting
-      <a>'maskContentUnits'</a> to
-      <span class="attr-value">'objectBoundingBox'</span>)
-  </li>
-  <li>To add a level of semantic richness to the document by differentiating
-      mask source content from other graphical content</li>
-</ul>
+<ol>
+  <li>Create a new <a>'mask element'</a> element as a sibling of the
+      paint server element.</li>
+  <li>Let the <a>'mask/maskUnits'</a> attribute be <span
+      class="attr-value">'userSpaceOnUse'</span>.</li>
+  <li>Let the dimensions of the mask 
+      (<a>'mask/x'</a>, <a>'mask/y'</a>, <a>'mask/width'</a>,
+      and <a>'mask/height'</a>) match the dimensions of the <a>decorated
+      bounding box</a> of the mask target.</li>
+  <li>Let the <a>'mask/maskContentUnits'</a> attribute be <span
+      class="attr-value">'objectBoundingBox'</span>.</li>
+  <li>Create a new <a>'rect'</a> element as a child of the newly
+      created <a>'mask element'</a> element.</li>
+  <li>Let both the width and the height of the <a>'rect'</a> element be
+      <span class="attr-value">'100%'</span>.</li>
+  <li>Let the <a>'fill'</a> property of the <a>'rect'</a> element
+      refer to the paint server element.</li>
+  <li>Use the newly created <a>'mask element'</a> as the mask source.</li>
+</ol>
 
 </edit:with>
 
 </div>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="ObjectAndGroupOpacityProperties">Object and group opacity: the
 effect of the <span class="property">'opacity'</span> property</h2>
 
@@ -1135,7 +1076,7 @@
   <edit:includefile href='images/masking/opacity01.svg'/>
 
   <div class='figure'>
-    <img class='bordered' src='images/masking/opacity01.svg'/>
+    <img class='bordered' src='images/masking/opacity01.svg' alt='Image showing different groups of circles blended into the background.'/>
     <p class='caption'>Each group of red and green circles is first rendered
     to an offscreen image before being blended with the background
     blue rectangle as a whole, with the given <a>'opacity'</a> values.</p>
@@ -1175,19 +1116,17 @@
 
 <h3 id="InterfaceSVGClipPathElement">Interface SVGClipPathElement</h3>
 
-
 <edit:with element='clipPath'>
 
-The <a>SVGClipPathElement</a> interface corresponds to the
-<a>'clipPath'</a> element.
-<pre class="idl">interface <b>SVGClipPathElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                               <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
-                               <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                               <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a>,
-                               <a class="idlinterface" href="types.html#InterfaceSVGTransformable">SVGTransformable</a>,
-                               <a class="idlinterface" href="types.html#InterfaceSVGUnitTypes">SVGUnitTypes</a> {
+<p>The <a>SVGClipPathElement</a> interface corresponds to the <a>'clipPath'</a> element.</p>
+
+<pre class="idl">interface <b>SVGClipPathElement</b> : <a>SVGDefinitionElement</a> {
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedEnumeration">SVGAnimatedEnumeration</a> <a href="masking.html#__svg__SVGClipPathElement__clipPathUnits">clipPathUnits</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGClipPathElement</a> implements <a>SVGUnitTypes</a>;</pre>
+
+<dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
 <dl class="attributes">
@@ -1210,16 +1149,11 @@
 
 <h3 id="InterfaceSVGMaskElement">Interface SVGMaskElement</h3>
 
-
 <edit:with element='mask'>
 
-The <a>SVGMaskElement</a> interface corresponds to the
-<a>'mask element'</a> element.
-<pre class="idl">interface <b>SVGMaskElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGTests">SVGTests</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a>,
-                           <a class="idlinterface" href="types.html#InterfaceSVGUnitTypes">SVGUnitTypes</a> {
+<p>The <a>SVGMaskElement</a> interface corresponds to the <a>'mask element'</a> element.</p>
+
+<pre class="idl">interface <b>SVGMaskElement</b> : <a>SVGDefinitionElement</a> {
 
   // Mask Types
   const unsigned short <a href="masking.html#__svg__SVGMaskElement__SVG_MASKTYPE_LUMINANCE">SVG_MASKTYPE_LUMINANCE</a> = 0;
@@ -1232,7 +1166,11 @@
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="masking.html#__svg__SVGMaskElement__y">y</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="masking.html#__svg__SVGMaskElement__width">width</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedLength">SVGAnimatedLength</a> <a href="masking.html#__svg__SVGMaskElement__height">height</a>;
-};</pre><dl class="interface">
+};
+
+<a>SVGMaskElement</a> implements <a>SVGUnitTypes</a>;</pre>
+
+<dl class="interface">
 <dt class="constants-header">Constants in group “Mask Types”:</dt>
 <dd>
 <dl class="constants">
--- a/master/metadata.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/metadata.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
--- a/master/mimereg.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/mimereg.html	Fri Sep 07 16:16:40 2012 +1000
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional+edit//EN"
  "xhtml1-transitional+edit.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>Media Type registration for image/svg+xml</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -115,7 +117,7 @@
 Published specification:</dt>
 <dd>
 <p>
-This media type registration is extracted from Appendix P of the <a href="http://www.w3.org/TR/SVG11">SVG 1.1 specification</a>.
+This media type registration is extracted from Appendix P of the <a href="http://www.w3.org/TR/SVG11/">SVG 1.1 specification</a>.
 </p>
 
 </dd>
@@ -147,7 +149,7 @@
         <cite>[<a href="refs.html#ref-RFC1952">RFC1952</a>]</cite> compressed "svg ", <em>i.e.</em>
          octet streams of type image/svg+xml, subsequently compressed with gzip.</p></dd>
  <dt>Macintosh Universal Type Identifier code:  </dt>
- <dd><tt>org.w3c.svg</tt> conforms to <tt>public.image</tt>   and to <tt>public.xml</tt></dd>
+ <dd><code>org.w3c.svg</code> conforms to <code>public.image</code>   and to <code>public.xml</code></dd>
  <dt>Windows Clipboard Name:</dt>
  <dd>"SVG Image"</dd>
  <dt>Fragment Identifiers</dt>
--- a/master/minimize.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/minimize.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,8 +6,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
@@ -60,7 +62,7 @@
 using <a href="http://www.ietf.org/rfc/rfc1952.txt">gzip
 compression</a> on SVG documents [<a href="refs.html#ref-RFC1952">RFC1952</a>]:</p>
 
-<table class='vert' summary="gzip compression results on SVG file sizes">
+<table class='vert'>
   <tr style="text-align: center">
     <th>Uncompressed
      SVG</th>
@@ -107,8 +109,8 @@
 
   <li>delayed downloading of images and fonts. Just like some
   HTML browsers, some SVG viewers will download images and
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#q1">WebFonts</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.1)
+  <a href="http://www.w3.org/TR/2011/WD-css3-fonts-20111004/">downloadable fonts</a>
+  ([<a href="refs.html#ref-CSS3FONTS">CSS3FONTS</a>])
   last, substituting a temporary image and system fonts,
   respectively, until the given image and/or font is
   available.</li>
--- a/master/painting.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/painting.html	Fri Sep 07 16:16:40 2012 +1000
@@ -4,11 +4,30 @@
 <head>
   <title>Painting: Filling, Stroking and Marker Symbols</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
+  <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_no_maturity.css"/>
+  <link rel="alternate stylesheet" title="All annotations"       type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
+<style type="text/css">
+table.propdef.attrdef { border-left-color: #888; border-left-width: 0; background-color: #eee; font-size: 90% }
+table.propdef.attrdef th, table.propdef.attrdef td { border-bottom-color: #ccc }
+
+table.propdef.attrdef th:first-child,
+table.propdef.attrdef td:first-child { width: 16em; padding-left: 0 !important }
+
+table.propdef.attrdef th:first-child + th,
+table.propdef.attrdef td:first-child + td { width: auto }
+
+table.propdef.attrdef th:first-child + th + th,
+table.propdef.attrdef td:first-child + td + td { width: 6em }
+
+table.propdef.attrdef th:first-child + th + th + th,
+table.propdef.attrdef td:first-child + td + td + td { width: 6em; padding-right: 0 !important }
+</style>
 </head>
 <body>
 
@@ -44,22 +63,43 @@
 
 <h2 id="SpecifyingPaint">Specifying paint</h2>
 
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Add new paint values for referencing current fill paint, stroke paint, etc.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/29-svg-minutes.html#item02">We will add new paint values currentFillPaint, currentStrokePaint etc. to SVG 2</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Among other things, to provide an easy way to match marker color to stroke color.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3094">ACTION-3094</a>)</td>
+    </tr>
+  </table>
+</div>
+
 <p>Properties <a>'fill'</a> and <a>'stroke'</a> take on a value of type
 <span class="prop-value">&lt;paint&gt;</span>, which is specified as follows:</p>
 
-    <table summary="paint specification" cellspacing="0"
-    cellpadding="0">
-      <tr valign="baseline">
+    <table>
+      <tr>
         <td><span
         class="property">&lt;paint&gt;</span>:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
         <td><span class="prop-value">none |<br />
          currentColor |<br />
+         <a href="types.html#DataTypeGradient">&lt;gradient&gt;</a> |<br />
          <a href="types.html#DataTypeColor">&lt;color&gt;</a>
          [<a href="types.html#DataTypeICCColor">&lt;icccolor&gt;</a>] |<br />
           <a href="types.html#DataTypeFuncIRI">&lt;funciri&gt;</a> [ none | currentColor | <a href="types.html#DataTypeColor">&lt;color&gt;</a>
          [<a href="types.html#DataTypeICCColor">&lt;icccolor&gt;</a>] ] |<br />
          <a class="noxref"
-        href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit">
+        href="http://www.w3.org/TR/2011/REC-CSS2-20110607/cascade.html#value-def-inherit">
         <span
         class="value-inst-inherit noxref">inherit</span></a></span></td>
       </tr>
@@ -79,13 +119,18 @@
   the SVG user agent so that your SVG text will draw in the
   same color.</dd>
 
+  <dt><strong><a href="types.html#DataTypeGradient">&lt;gradient&gt;</a></strong></dt>
+  <dd><a href="types.html#DataTypeGradient">&lt;gradient&gt;</a> is a CSS gradient that can be
+  set as a paint server. Percentage values
+  get resolved against the bounding box of the element to which the gradient is applied.</dd>
+
   <dt><strong>&lt;color&gt; [&lt;icccolor&gt;]</strong></dt>
   <dd><a href="types.html#DataTypeColor">&lt;color&gt;</a> is
   the explicit color (in the sRGB color space [<a href='refs.html#ref-SRGB'>SRGB</a>])
   to be used to paint the current object. SVG supports all of
   the syntax alternatives for &lt;color&gt;
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#value-def-color">defined in CSS2</a>
-  ([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.6), with the
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#value-def-color">defined in CSS 2.1</a>
+  ([<a href="refs.html#ref-CSS21">CSS21</a>], section 4.3.6), with the
   exception that SVG contains an expanded list of <a
   href="types.html#ColorKeywords">recognized color keywords
   names</a>. If an optional ICC color specification [<a href='refs.html#ref-ICC42'>ICC42</a>] is
@@ -115,7 +160,7 @@
    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;currentColor |<br />
    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;color&gt;
   [&lt;icccolor&gt;] ]</strong></dt>
-  <dd>The <a href="types.html#DataTypeFuncIRI">&lt;funciri&gt;</a> is used to identify a <a
+  <dd><a href="types.html#DataTypeFuncIRI">&lt;funciri&gt;</a> is used to identify a <a
   href="pservers.html">paint server</a> such as a gradient, a
   pattern or a custom paint defined by an extension (see <a
   href="extend.html">Extensibility</a>). The &lt;funciri&gt;
@@ -133,7 +178,7 @@
   processing</a>).</dd>
 </dl>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="FillProperties">Fill properties</h2>
 
 <h3 id="SpecifyingFillPaint">Specifying fill paint: the <span class="property">'fill'</span> property</h3>
@@ -345,22 +390,30 @@
 
 <h2 id="StrokeProperties">Stroke properties</h2>
 
-<div class="annotation">
- <p>
-   SVG 2 Requirement: Have the vector-effect property
- </p>
- <p>
-   Resolution: SVG 2 will have the vector-effect property
- </p>
- <p>
-   <a href="http://www.w3.org/2012/02/02-svg-minutes.html#item05">SVG Working Group Teleconference 02 Feb 2012</a>.
- </p>
- <p>
-   Purpose: To get stroke that doesn't scale when element is transformed. 
- </p>
- <p>
-   Owner: Erik
- </p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support non-scaling stroke.</td>
+    </tr>
+    <tr>
+      <th>Resolutions:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T17-46-34">SVG 2 will include non-scaling stroke.</a><br/>
+          <a href="http://www.w3.org/2012/02/02-svg-minutes.html#item05">SVG 2 will have the <span class="property">'vector-effect'</span> property.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To support strokes whose width does not change when zooming a page, as common for example in maps.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Chris or Erik (no action)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>Note that this could be part of more generic non-scaling features.</td>
+    </tr>
+  </table>
 </div>
 
 <p>The following are the properties which affect how an element is stroked.</p>
@@ -445,39 +498,54 @@
 <span class="attr-value">'M 30,30 z'</span> and
 <span class="attr-value">'M 40,40 c 0,0 0,0 0,0'</span>.</p>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Include non-scaling stroke.</p>
-  <p>Resolution: SVG 2 will include non-scaling stroke.</p>
-  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T17-46-34">Pre-TPAC F2F 2011-10-28</a>.</p>
-  <p>Purpose: Keep diagrams readable as zoom level changes.</p>
-  <p>Owner: Chris.</p>
-  <p>Note that this could be part of more generic non-scaling features.</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Include a way to specify stroke position.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T18-09-48">SVG 2 shall include a way to specify stroke position.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow a stroke to be inside or outside the path.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3162">ACTION-3162</a>)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>See <a href="http://www.w3.org/Graphics/SVG/WG/wiki/Proposals/Stroke_position">proposal page</a>.</td>
+    </tr>
+  </table>
 </div>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Include a way to specify stroke-position.</p>
-  <p>Resolution: SVG 2 shall include a way to specify stroke-position.</p>
-  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-09-48">Pre-TPAC F2F 2011-10-28</a>.</p>
-  <p>Purpose: Allow stroke to be inside or outside path.</p>
-  <p>Owner: Cameron.</p>
-  <p>See proposal page: <a href="http://www.w3.org/Graphics/SVG/WG/wiki/Proposals/Stroke_position">Stroke position</a>.</p>
-</div>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Specify more precisely stroke dashing.</p>
-  <p>Resolution: SVG 2 shall specify stroke dashing more precisely.</p>
-  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-14-14">Pre-TPAC F2F 2011-10-28</a>.</p>
-  <p>Purpose: Define dash starting point on basic shapes and path segments.</p>
-  <p>Owner: Cameron.</p>
-</div>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Allow more author control over positions of dashes. (Scaling of dashes to fit path.)</p>
-  <p>Resolution: SVG 2 shall allow more author control over positions of dashes.</p>
-  <p><a href="http://www.w3.org/2011/10/28-svg-irc#T18-17-51">Pre-TPAC 2011-10-28</a>.</p>
-  <p>Purpose: Allow things like aligning dashes at rectangle corners or along paths, needed for mapping.</p>
-  <p>Owner: Cameron.</p>
-  <p>See proposal page: <a href="http://www.w3.org/Graphics/SVG/WG/wiki/Proposals/Stroke_dash_adjustment">Stroke dash adjustment</a>.</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Allow more author control over positions of dashes.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T18-17-51">SVG 2 shall allow more author control over positions of dashes.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To allow things like aligning dashes at rectangle corners or along paths, needed for mapping.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3163">ACTION-3163</a>)</td>
+    </tr>
+    <tr>
+      <th>Note:</th>
+      <td>See <a href="http://www.w3.org/Graphics/SVG/WG/wiki/Proposals/Stroke_dash_adjustment">proposal page</a>.</td>
+    </tr>
+  </table>
 </div>
 
 <h3 id="StrokeOpacity">Stroke paint opacity: the <span class="property">'stroke-opacity'</span>
@@ -981,6 +1049,27 @@
 
 <h3 id="StrokeShape">Computing the shape of the stroke</h3>
 
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Specify stroke dashing more precisely.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/28-svg-irc#T18-14-14">SVG 2 shall specify stroke dashing more precisely.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To define dash starting point on basic shapes and path segments.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (no action)</td>
+    </tr>
+  </table>
+</div>
+
 <p>The following algorithm describes what the shape of a
 <a>'path'</a> or <a>basic shape</a>'s stroke is, taking into account the
 stroking properties above:</p>
@@ -1285,12 +1374,25 @@
 
 <h2 id="Markers">Markers</h2>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Improve markers</p>
-  <p>Resolution: We will improve markers for SVG 2</p>
-  <p><a href="http://www.w3.org/2011/10/27-svg-irc#T18-12-30">Pre-TPAC F2F Day 1</a>.</p>
-  <p>Purpose: To solve the common problems authors have with SVG markers</p>
-  <p>Owner: Cameron (ACTION-3286)</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Improve markers.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/10/27-svg-irc#T18-12-30">We will improve markers for SVG 2.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To solve the common problems authors have with SVG markers.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3286">ACTION-3286</a>)</td>
+    </tr>
+  </table>
 </div>
 
 <edit:with element='marker'>
@@ -1307,20 +1409,20 @@
   other vertex (aside from the first and last).  The <a>'marker-start'</a> and
   <a>'marker-end'</a> can be used for example to add arrowheads to paths.
   Markers placed using these properties are known as
-  <dfn id="TermVertexMarkers">vertex markers</dfn>.</li>
+  <dfn id="TermVertexMarker">vertex markers</dfn>.</li>
 
   <li>The <a>'marker-segment'</a> property can be used to place markers
   at the center of every path segment.  These markers are known as
-  <dfn id="TermSegmentMarkers">segment markers</dfn>.</li>
+  <dfn id="TermSegmentMarker">segment markers</dfn>.</li>
 
   <li>The <a>'marker-pattern'</a> property can be used to define
   a regular repeating pattern of markers to place along the length of the
   path.  Markers placed with <a>'marker-pattern'</a> are known as
-  <dfn id="TermRepeatingMarkers">repeating markers</dfn>.</li>
+  <dfn id="TermRepeatingMarker">repeating markers</dfn>.</li>
 
   <li>A child <a>'marker element'</a> element with a <a>'position'</a> attribute
   can be used to place a marker at a particular location along the path.
-  Such markers are known as <dfn id="TermPositionedMarkers">positioned
+  Such markers are known as <dfn id="TermPositionedMarker">positioned
   markers</dfn>.</li>
 </ul>
 
@@ -1362,23 +1464,6 @@
 
 <p id="MarkerAttributes"><em>Attribute definitions:</em></p>
 
-<style>
-table.attrdef { border-left-color: #888; border-left-width: 0; background-color: #eee; font-size: 90% }
-table.attrdef th, table.attrdef td { border-bottom-color: #ccc }
-
-table.attrdef th:first-child,
-table.attrdef td:first-child { width: 16em; padding-left: 0 !important }
-
-table.attrdef th:first-child + th,
-table.attrdef td:first-child + td { width: auto }
-
-table.attrdef th:first-child + th + th,
-table.attrdef td:first-child + td + td { width: 6em }
-
-table.attrdef th:first-child + th + th + th,
-table.attrdef td:first-child + td + td + td { width: 6em; padding-right: 0 !important }
-</style>
-
 <dl class="attrdef-list">
   <dt>
 
@@ -1463,7 +1548,7 @@
     <th>Animatable</th>
   </tr>
   <tr>
-    <td><dfn id="RefXAttribute">refX</dfn>, <dfn id="RefYAttribute">refY</dfn></td>
+    <td><dfn id="MarkerElementRefXAttribute">refX</dfn>, <dfn id="MarkerElementRefYAttribute">refY</dfn></td>
     <td><a>&lt;coordinate&gt;</a></td>
     <td>0</td>
     <td>yes</td>
@@ -1490,7 +1575,7 @@
     <th>Animatable</th>
   </tr>
   <tr>
-    <td><dfn id="MarkerOrientAttribute">orient</dfn></td>
+    <td><dfn id="OrientAttribute">orient</dfn></td>
     <td>auto | <a>&lt;angle&gt;</a></td>
     <td>0</td>
     <td>yes&#160;(non-additive)</td>
@@ -1670,7 +1755,7 @@
 <a>'display'</a> property on the <a>'marker element'</a> element or any of its
 ancestors is set to <span class="prop-value">none</span>.  <a>'marker element'</a>
 elements that are used as <a>positioned markers</a> can simultaneously be referenced
-by the <a href='#markerProperties'>marker properties</a> to be used as
+by the <a href='#TermMarkerProperties'>marker properties</a> to be used as
 <a>segment markers</a> and <a>repeating markers</a>.</p>
 
 <p><a href="script.html#EventAttributes">Event attributes</a> and
@@ -1716,7 +1801,8 @@
 ]]></pre>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/markers-positioned.svg"/>
+    <img class="bordered" src="images/painting/markers-positioned.svg"
+         alt="Image showing the use of positioned markers."/>
     <p class="caption">Child <a>'marker element'</a> elements are used to position
     two square and two circular markers.  The cross marker is defined inline
     and does not need an ID.</p>
@@ -1808,7 +1894,8 @@
   <edit:includefile href='images/painting/marker.svg'/>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/marker.svg"/>
+    <img class="bordered" src="images/painting/marker.svg"
+         alt="Image showing the use of an automatically oriented marker."/>
     <p class="caption">The triangle is placed at the end of the path and
     oriented automatically so that it points in the right direction.</p>
   </div>
@@ -1910,7 +1997,8 @@
 ]]></pre>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/markers-segment.svg"/>
+    <img class="bordered" src="images/painting/markers-segment.svg"
+         alt="Image showing the use of segment markers."/>
     <p class="caption">Segment markers are used to place crosses at the center
     of each line segment in the line graph.</p>
   </div>
@@ -2020,7 +2108,8 @@
 ]]></pre>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/markers-repeating.svg"/>
+    <img class="bordered" src="images/painting/markers-repeating.svg"
+         alt="Image showing the use of repeating markers."/>
     <p class="caption">Markers specified with the <a>'marker-pattern'</a> property
     are placed along the path at fixed distances, not relative to the path
     vertices.</p>
@@ -2124,6 +2213,10 @@
 <span class="property">'marker-knockout-left'</span> and
 <span class="property">'marker-knockout-right'</span> properties</h3>
 
+<p class="issue">The marker knockout properties are still under heavy development
+and are subject to change. Feedback on how authors might prefer to specify marker
+knockout shapes is welcome.</p>
+
 <table class="propdef">
   <tr>
     <th>Name:</th>
@@ -2165,17 +2258,17 @@
 
 <p>where:</p>
 
-<p class="definition">
-  <dfn id="DataTypeKnockoutShape">&lt;knockout-offset&gt;</dfn> =
+<div class="definition">
+  <dfn id="DataTypeKnockoutOffset">&lt;knockout-offset&gt;</dfn> =
   <div style="margin-left: 4em">[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> ]</div>
-</p>
-
-<p class="definition">
+</div>
+
+<div class="definition">
   <dfn id="DataTypeKnockoutShape">&lt;knockout-shape&gt;</dfn> =
   <div style="margin-left: 4em">[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> ] inverted? circle |</div>
   <div style="margin-left: 4em">[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> ]{2} inverted? ellipse |</div>
   <div style="margin-left: 4em">[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> ]{1,2} inverted? [ rectangle | triangle ]</div>
-</p>
+</div>
 
 <p class="note">New in SVG 2.  Added to allow authors to specify
 parts of a stroke that should be clipped away when a marker is
@@ -2348,7 +2441,8 @@
 be allowed.</p>
 
 <div class="figure">
-  <img class="bordered" src="images/painting/knockout-shapes.svg" style="max-width: none"/>
+  <img class="bordered" src="images/painting/knockout-shapes.svg" style="max-width: none"
+       alt="Image showing various marker knockout shapes."/>
   <p class="caption">An illustration of the use of inverted and non-inverted circle,
   rectangle and triangle knockout shapes, at both 0px and 10px offsets.
   The value beneath each pink stroke is used for both <a>'marker-knockout-left'</a>
@@ -2425,11 +2519,11 @@
 with CSS</a>, the conceptual deep cloning of the referenced
 <a>'marker element'</a> element into a non-exposed DOM tree also
 copies any property values resulting from
-<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html">the CSS cascade</a>
-([<a href="refs.html#ref-CSS2">CSS2</a>], chapter 6) and
-property inheritance on the referenced element and its contents. CSS2
+<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/cascade.html">the CSS cascade</a>
+([<a href="refs.html#ref-CSS21">CSS21</a>], chapter 6) and
+property inheritance on the referenced element and its contents. CSS 2.1
 selectors can be applied to the original (i.e., referenced) elements
-because they are part of the formal document structure. CSS2 selectors
+because they are part of the formal document structure. CSS 2.1 selectors
 cannot be applied to the (conceptually) cloned DOM tree because its
 contents are not part of the formal document structure.</p>
 
@@ -2537,16 +2631,29 @@
 
 </edit:with>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="PaintOrder">Controlling paint operation order: the
 <span class="property">'paint-order'</span> property</h2>
 
-<div class="annotation">
- <p>SVG 2 Requirement: Control the order of painting and filling and markers</p>
- <p>Resolution: SVG 2 will adopt the "paint-order" property proposal, though possibly with a different name.</p>
- <p><a href="http://www.w3.org/2012/05/07-svg-minutes#item05">Hamburg 2012 F2F Day 1</a>.</p>
- <p>Purpose: To address the common desire to paint strokes below fills without having to duplicate an element</p>
- <p>Owner: Cameron (ACTION-3285)</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support control of the order of filling, stroke and painting markers on shapes.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2012/05/07-svg-minutes#item05">SVG 2 will adopt the <span class="property">'paint-order'</span> property proposal, though possibly with a different name.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To address the common desire to paint strokes below fills without having to duplicate an element.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3285">ACTION-3285</a>)</td>
+    </tr>
+  </table>
 </div>
 
 <table class="propdef">
@@ -2645,12 +2752,13 @@
 ]]></pre>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/paintorder.svg"/>
+    <img class="bordered" src="images/painting/paintorder.svg"
+         alt="Image showing the effect of paint-order."/>
     <p class="caption">Text painted with its stroke below the fill.</p>
   </div>
 </div>
 
-<div class="ready-for-wg-review">
+<div class="ready-for-wider-review">
 <h2 id="ColorInterpolation">Color space for interpolation: the
 <span class="property">'color-interpolation'</span> property</h2>
 
@@ -2832,7 +2940,7 @@
 
 <h2 id="RenderingHints">Rendering hints</h2>
 
-<h3 id="ColorRenderingProperty">The <span class="property">'color-rendering'</span> property</h3>
+<h3 id="ColorRendering">The <span class="property">'color-rendering'</span> property</h3>
 
 <table class="propdef">
   <tr>
@@ -2905,7 +3013,7 @@
 optimizes performance, which might mean sacrificing the color interpolation
 precision as specified by <span class="prop-value">color-interpolation-filters: linearRGB</span>.</p>
 
-<h3 id="ShapeRenderingProperty">The <span class="property">'shape-rendering'</span> property</h3>
+<h3 id="ShapeRendering">The <span class="property">'shape-rendering'</span> property</h3>
 
 <table class="propdef">
   <tr>
@@ -2980,7 +3088,7 @@
   precision over speed and crisp edges.</dd>
 </dl>
 
-<h3 id="TextRenderingProperty">The <span class="property">'text-rendering'</span> property</h3>
+<h3 id="TextRendering">The <span class="property">'text-rendering'</span> property</h3>
 
 <table class="propdef">
   <tr>
@@ -3054,7 +3162,7 @@
   geometric precision to the rendering of path data.</dd>
 </dl>
 
-<h3 id="ImageRenderingProperty">The <span class="property">'image-rendering'</span> property</h3>
+<h3 id="ImageRendering">The <span class="property">'image-rendering'</span> property</h3>
 
 <table class="propdef">
   <tr>
@@ -3136,13 +3244,27 @@
 <h3 id="BufferedRendering">The <span class="property">'buffered-rendering'</span>
 property</h3>
 
-<div class="annotation">
- <p>SVG 2 Requirement: Add buffered-rendering</p>
- <p>Resolution: SVG 2 will add buffered-rendering (implementor feedback indicates that it is needed).</p>
- <p><a href="http://www.w3.org/2012/01/26-svg-irc#T21-28-56">SVG telcon 2012-01-26</a>.</p>
- <p>Purpose: For caching rendered results for faster display.</p>
- <p>Owner: Erik</p>
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support a hint to indicate that an element's rendering should be cached.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2012/01/26-svg-irc#T21-28-56">SVG 2 will add <span class="property">'buffered-rendering'</span>, as implementor feedback indicates that it is needed.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>For caching rendered results for faster display.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Erik (no action)</td>
+    </tr>
+  </table>
 </div>
+
 <p>The creator of SVG content might want to provide a hint to the implementation about how often an element is modified to make speed vs. memory tradeoffs as it performs rendering. The <a>'buffered-rendering'</a> property provides a hint to the SVG user agent about how to buffer the rendering of elements:</p>
 
 <table class="propdef">
@@ -3222,7 +3344,8 @@
   <edit:includefile href="images/painting/inheritance.svg"/>
 
   <div class="figure">
-    <img class="bordered" src="images/painting/inheritance.svg"/>
+    <img class="bordered" src="images/painting/inheritance.svg"
+         alt="Image demonstrating the inheritance of painting properties."/>
     <p class="caption">Both rectangles are filled with the same orange-to-yellow
     gradient.</p>
   </div>
@@ -3267,10 +3390,7 @@
 
 The <a>SVGMarkerElement</a> interface corresponds to the
 <a>'marker element'</a> element.
-<pre class="idl">interface <b>SVGMarkerElement</b> : <a class="idlinterface" href="types.html#InterfaceSVGElement">SVGElement</a>,
-                             <a class="idlinterface" href="types.html#InterfaceSVGLangSpace">SVGLangSpace</a>,
-                             <a class="idlinterface" href="types.html#InterfaceSVGStylable">SVGStylable</a>,
-                             <a class="idlinterface" href="types.html#InterfaceSVGFitToViewBox">SVGFitToViewBox</a> {
+<pre class="idl">interface <b>SVGMarkerElement</b> : <a>SVGDefinitionElement</a> {
 
   // Marker Unit Types
   const unsigned short <a href="painting.html#__svg__SVGMarkerElement__SVG_MARKERUNITS_UNKNOWN">SVG_MARKERUNITS_UNKNOWN</a> = 0;
@@ -3290,11 +3410,11 @@
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedEnumeration">SVGAnimatedEnumeration</a> <a href="painting.html#__svg__SVGMarkerElement__orientType">orientType</a>;
   readonly attribute <a class="idlinterface" href="types.html#InterfaceSVGAnimatedAngle">SVGAnimatedAngle</a> <a href="painting.html#__svg__SVGMarkerElement__orientAngle">orientAngle</a>;
 
-  void <a href="painting.html#__svg__SVGMarkerElement__setOrientToAuto">setOrientToAuto</a>() raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  void <a href="painting.html#__svg__SVGMarkerElement__setOrientToAngle">setOrientToAngle</a>(in <a class="idlinterface" href="types.html#InterfaceSVGAngle">SVGAngle</a> angle) raises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-};</pre><dl class="interface">
+  void <a href="painting.html#__svg__SVGMarkerElement__setOrientToAuto">setOrientToAuto</a>();
+  void <a href="painting.html#__svg__SVGMarkerElement__setOrientToAngle">setOrientToAngle</a>(<a class="idlinterface" href="types.html#InterfaceSVGAngle">SVGAngle</a> angle);
+};
+
+<a>SVGMarkerElement</a> implements <a>SVGFitToViewBox</a>;</pre><dl class="interface">
 <dt class="constants-header">Constants in group “Marker Unit Types”:</dt>
 <dd>
 <dl class="constants">
@@ -3453,23 +3573,9 @@
 
 
 </div>
-<dl class="operation">
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
 </dd>
-</dl>
-</dd>
-</dl>
-</dd>
-
-<dt id="__svg__SVGMarkerElement__setOrientToAngle" class="operation">void <b>setOrientToAngle</b>(in <a class="idlinterface" href="types.html#InterfaceSVGAngle">SVGAngle</a> <var>angle</var>)
+
+<dt id="__svg__SVGMarkerElement__setOrientToAngle" class="operation">void <b>setOrientToAngle</b>(<a class="idlinterface" href="types.html#InterfaceSVGAngle">SVGAngle</a> <var>angle</var>)
 </dt>
 <dd class="operation">
 <div>
@@ -3489,18 +3595,6 @@
 </li>
 </ol>
 </dd>
-<dt class="exceptions-header">Exceptions</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception first-child"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
 </dl>
 </dd>
 </dl>
--- a/master/paths.html	Fri Sep 07 15:54:44 2012 +1000
+++ b/master/paths.html	Fri Sep 07 16:16:40 2012 +1000
@@ -6,40 +6,16 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet"           title="Default"               type="text/css" media="screen" href="style/default_svg.css"/>
   <link rel="alternate stylesheet" title="No issues/annotations" type="text/css" media="screen" href="style/default_no_issues.css"/>
+  <!--
   <link rel="alternate stylesheet" title="CSS3 Unmodified"       type="text/css" media="screen" href="style/default.css"/>
   <link rel="alternate stylesheet" title="SVG 1.1"               type="text/css" media="screen" href="style/svg-style.css"/>
+  -->
   <!-- W3C style sheet will be added here during processing. -->
 </head>
 <body>
 
 <h1>Paths</h1>
 
-<div class="annotation">
-  <p>SVG 2 Requirement: Include the smooth path between points functionality (Catmull-Rom).</p>
-  <p>Resolution: Add a Catmull Rom syntax to the path syntax with a
-  tension parameter to control the whole curve (not per-point
-  control)</p>
-  <p><a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#Add_Catmull-Rom_curves_to_path_syntax">Seattle 2011 F2F Day 1</a>.</p>
-  <p>Purpose: Provide and easy way to graph data, etc.</p>
-  <p>Owner: Doug.</p>
-</div>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Add a path rotation command.</p>
-  <p>Resolution: Same as requirement.</p>
-  <p><a href="http://www.w3.org/Graphics/SVG/WG/wiki/SVG2_Resolutions#Add_a_path_rotation_command">Seattle 2011 F2F Day 1</a>.</p>
-  <p>Purpose: Make path rotations easy to animate. Make pie charts easy to draw.</p>
-  <p>Owner: Cameron.</p>
-</div>
-
-<div class="annotation">
-  <p>SVG 2 Requirement: Make arcs in paths easier.</p>
-  <p>Resolution: Same as requirement.</p>
-  <p><a href="http://www.w3.org/2011/11/04-svg-minutes.html#item08">TPAC 2011 F2F</a>.</p>
-  <p>Purpose: Allow arcs of longer than 180 degrees easily.</p>
-  <p>Owner: Cameron.</p>
-</div>
-
 <edit:with element='path'>
 
 <h2 id="Introduction">Introduction</h2>
@@ -130,6 +106,48 @@
 
 <h2 id="PathData">Path data</h2>
 
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Include smooth path between points functionality.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item11">We will add a Catmull Rom syntax to the path syntax with a tension parameter to control the whole curve (not per-point control).</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Provide an easy way to graph data, etc.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Doug (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3085">ACTION-3085</a>)</td>
+    </tr>
+  </table>
+</div>
+
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Support turtle-graphics-like current rotation in path syntax.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/07/27-svg-minutes.html#item11">We will add a path rotation command.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>Make path rotations easier to animate and pie charts easier to draw.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3125">ACTION-3125</a>)</td>
+    </tr>
+  </table>
+</div>
+
 <h3 id="PathDataGeneralInformation">General information about path data</h3>
 
 <p>A path is defined by including a <a>'path'</a>
@@ -221,8 +239,7 @@
 is not the first command) represent the start of a new
 <em>subpath</em>:</p>
 
-<table summary="moveto command" class="PathDataTable"
-border="1" cellspacing="2" cellpadding="5">
+<table class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -275,8 +292,7 @@
 At the end of the command, the new current point is set to the
 initial point of the current subpath.</p>
 
-<table summary="closepath command" class="PathDataTable"
-border="1" cellspacing="2" cellpadding="5">
+<table  class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -299,8 +315,7 @@
 <p>The various "lineto" commands draw straight lines from the
 current point to a new point:</p>
 
-<table summary="lineto command" class="PathDataTable"
-border="1" cellspacing="2" cellpadding="5">
+<table  class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -380,9 +395,7 @@
 
 <p>The cubic Bézier commands are as follows:</p>
 
-<table summary="cubic Bézier command"
-class="PathDataTable" border="1" cellspacing="2"
-cellpadding="5">
+<table class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -454,9 +467,7 @@
 
 <p>The quadratic Bézier commands are as follows:</p>
 
-<table summary="quadratic Bézier command"
-class="PathDataTable" border="1" cellspacing="2"
-cellpadding="5">
+<table class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -509,10 +520,30 @@
 
 <h3 id="PathDataEllipticalArcCommands">The elliptical arc curve commands</h3>
 
+<div class="annotation svg2-requirement">
+  <table>
+    <tr>
+      <th>SVG 2 Requirement:</th>
+      <td>Make it simpler to draw arcs in SVG path syntax.</td>
+    </tr>
+    <tr>
+      <th>Resolution:</th>
+      <td><a href="http://www.w3.org/2011/11/04-svg-minutes.html#item08">Make arcs in paths easier.</a></td>
+    </tr>
+    <tr>
+      <th>Purpose:</th>
+      <td>To make it easier for authors to write path data with arcs by hand.</td>
+    </tr>
+    <tr>
+      <th>Owner:</th>
+      <td>Cameron (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3151">ACTION-3151</a>)</td>
+    </tr>
+  </table>
+</div>
+
 <p>The elliptical arc commands are as follows:</p>
 
-<table summary="elliptical arc commands" class="PathDataTable"
-border="1" cellspacing="2" cellpadding="5">
+<table  class="PathDataTable">
   <tr>
     <th>Command</th>
     <th>Name</th>
@@ -1050,10 +1081,8 @@
 The <a>SVGPathSegMovetoAbs</a> interface corresponds to an
 "absolute moveto" (M) path data command.
 <pre class="idl">interface <b>SVGPathSegMovetoAbs</b> : <a class="idlinterface" href="paths.html#InterfaceSVGPathSeg">SVGPathSeg</a> {
-  attribute float <a href="paths.html#__svg__SVGPathSegMovetoAbs__x">x</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="paths.html#__svg__SVGPathSegMovetoAbs__y">y</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
+  attribute float <a href="paths.html#__svg__SVGPathSegMovetoAbs__x">x</a>;
+  attribute float <a href="paths.html#__svg__SVGPathSegMovetoAbs__y">y</a>;
 };</pre><dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
@@ -1066,20 +1095,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGPathSegMovetoAbs__y" class="attribute"><b>y</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -1089,20 +1104,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 </dl>
 </dd>
@@ -1115,10 +1116,8 @@
 The <a>SVGPathSegMovetoRel</a> interface corresponds to a
 "relative moveto" (m) path data command.
 <pre class="idl">interface <b>SVGPathSegMovetoRel</b> : <a class="idlinterface" href="paths.html#InterfaceSVGPathSeg">SVGPathSeg</a> {
-  attribute float <a href="paths.html#__svg__SVGPathSegMovetoRel__x">x</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="paths.html#__svg__SVGPathSegMovetoRel__y">y</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
+  attribute float <a href="paths.html#__svg__SVGPathSegMovetoRel__x">x</a>;
+  attribute float <a href="paths.html#__svg__SVGPathSegMovetoRel__y">y</a>;
 };</pre><dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
@@ -1131,20 +1130,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGPathSegMovetoRel__y" class="attribute"><b>y</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -1154,20 +1139,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 </dl>
 </dd>
@@ -1180,10 +1151,8 @@
 The <a>SVGPathSegLinetoAbs</a> interface corresponds to an
 "absolute lineto" (L) path data command.
 <pre class="idl">interface <b>SVGPathSegLinetoAbs</b> : <a class="idlinterface" href="paths.html#InterfaceSVGPathSeg">SVGPathSeg</a> {
-  attribute float <a href="paths.html#__svg__SVGPathSegLinetoAbs__x">x</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
-  attribute float <a href="paths.html#__svg__SVGPathSegLinetoAbs__y">y</a> setraises(<a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>);
+  attribute float <a href="paths.html#__svg__SVGPathSegLinetoAbs__x">x</a>;
+  attribute float <a href="paths.html#__svg__SVGPathSegLinetoAbs__y">y</a>;
 };</pre><dl class="interface">
 <dt class="attributes-header">Attributes:</dt>
 <dd>
@@ -1196,20 +1165,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 
 <dt id="__svg__SVGPathSegLinetoAbs__y" class="attribute"><b>y</b><span class="idl-type-parenthetical"> (float)</span></dt>
@@ -1219,20 +1174,6 @@
 
 
 </div>
-<dl class="attribute">
-<dt class="exceptions-header">Exceptions on setting</dt>
-<dd>
-<dl class="exceptions">
-<dt class="exception"><a class="idlinterface"
-   href="http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-17189187">DOMException</a>, code NO_MODIFICATION_ALLOWED_ERR
-</dt>
-<dd class="exception"> Raised on an attempt
-to change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
-
-</dd>
-</dl>
-</dd>
-</dl>
 </dd>
 </dl>
 </dd>
@@ -1245,10 +1186,8 @@
 The <a>SVGPathSegLinetoRel</a> interface corresponds to a
 "relative lineto" (l) path data command.
 <pre class="idl">interface <b>SVGPathSegLinetoRel</b> : <a class="idlinterface" href="paths.html#InterfaceSVGPathSeg">SVGPathSeg</a> {
-  attribute float <a href="paths.html#__svg__SVGPathSegLinetoR