--- a/master/definitions.xml Fri Jan 18 15:26:47 2013 +1100
+++ b/master/definitions.xml Fri Jan 18 15:52:31 2013 +1100
@@ -1155,7 +1155,6 @@
<!-- ... grammar symbols ................................................ -->
<symbol name='align' href='coords.html#DataTypeAlign'/>
- <symbol name='angle' href='types.html#DataTypeAngle'/>
<symbol name='anything' href='types.html#DataTypeAnything'/>
<symbol name='color' href='types.html#DataTypeColor'/>
<symbol name='child-selector' href='types.html#DataTypeChildSelector'/>
@@ -1357,6 +1356,7 @@
<term name='SyntaxError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#syntaxerror'/>
<!-- ... grammar symbols ................................................ -->
+ <symbol name='angle' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#angles'/>
<symbol name='identifier' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#identifier'/>
<symbol name='transform-function' href='http://dev.w3.org/csswg/css3-transforms/#transform-functions'/>
--- a/master/painting.html Fri Jan 18 15:26:47 2013 +1100
+++ b/master/painting.html Fri Jan 18 15:52:31 2013 +1100
@@ -1914,7 +1914,7 @@
</tr>
<tr>
<td><dfn id="OrientAttribute">orient</dfn></td>
- <td>auto | <a><angle></a></td>
+ <td>auto | <a><angle></a> | <a><number></a></td>
<td>0</td>
<td>yes (non-additive)</td>
</tr>
@@ -1957,14 +1957,16 @@
</dd>
<dt><span class="attr-value"><a><angle></a></span></dt>
+ <dt><span class="attr-value"><a><number></a></span></dt>
<dd>
<p>An <a><angle></a> value represents the angle the marker's
positive x-axis makes with the positive x-axis in the user space
- of the <a>markable element</a>. For example, if a value of
+ of the <a>markable element</a>, and a <a><number></a> value
+ with no unit represents an angle in degrees. For example, if a value of
<span class="attr-value">'0'</span> is given, then the marker will be drawn
such that its x-axis will align with the x-axis of the user
space of the graphic object referencing the marker.
- A value of <span class="attr-value">'90'</span> will result in the
+ A value of <span class="attr-value">'90deg'</span> will result in the
marker being drawn with its positive x-axis in the direction
of the positive y-axis of the <a>markable element</a>'s user space.</p>
</dd>
--- a/master/text.html Fri Jan 18 15:26:47 2013 +1100
+++ b/master/text.html Fri Jan 18 15:52:31 2013 +1100
@@ -1596,8 +1596,7 @@
class="propinfo" >
<tr>
<td><em>Value:</em> </td>
- <td>auto | <a
- href="types.html#DataTypeAngle"><angle></a></td>
+ <td>auto | <a><angle></a> | <a><number></a></td>
</tr>
<tr>
<td><em>Initial:</em> </td>
@@ -1679,9 +1678,11 @@
</ul>
</dd>
- <dt><span class="prop-value"><a
- href="types.html#DataTypeAngle"><angle></a></span></dt>
- <dd>The value of the angle is restricted to 0, 90, 180, and
+ <dt><span class="prop-value"><a><angle></a></span></dt>
+ <dt><span class="prop-value"><a><number></a></span></dt>
+ <dd>The glyph orientation angle. A value specified as a
+ <a><number></a> is interpreted as an angle in degrees.
+ The value of the angle is restricted to 0, 90, 180, and
270 degrees. The user agent shall round the value of the
angle to the closest of the permitted values.<br />
A value of <span class="prop-value">0deg</span> indicates
@@ -1760,8 +1761,7 @@
class="propinfo" >
<tr>
<td><em>Value:</em> </td>
- <td><a
- href="types.html#DataTypeAngle"><angle></a></td>
+ <td><a><angle></a> | <a><number></a></td>
</tr>
<tr>
<td><em>Initial:</em> </td>
@@ -1794,9 +1794,11 @@
</div>
<dl>
- <dt><span class="prop-value"><a
- href="types.html#DataTypeAngle"><angle></a></span></dt>
- <dd>The value of the angle is restricted to 0, 90, 180, and
+ <dt><span class="prop-value"><a><angle></a></span></dt>
+ <dt><span class="prop-value"><a><number></a></span></dt>
+ <dd>The glyph orientation angle. A value specified as a
+ <a><number></a> is interpreted as an angle in degrees.
+ The value of the angle is restricted to 0, 90, 180, and
270 degrees. The user agent shall round the value of the
angle to the closest of the permitted values.<br />
A value of <span class="prop-value">0deg</span> indicates
--- a/master/types.html Fri Jan 18 15:26:47 2013 +1100
+++ b/master/types.html Fri Jan 18 15:52:31 2013 +1100
@@ -204,44 +204,7 @@
attributes, including presentation attributes, but not in style sheets.</p>
<dl class='definitions'>
-
- <dt id='DataTypeAngle'><angle></dt>
- <dd>
- <p>Angles are specified in one of two ways depending upon whether
- they are used in CSS <a>property</a> syntax or SVG <a>presentation attribute</a>
- syntax:</p>
-
- <ul>
- <li>
- <p>When an <angle> is used in a style sheet or with a
- <a>property</a> in a <a>'style attribute'</a> attribute, the
- syntax must match the following pattern:</p>
- <pre class='grammar'><span id='Angle'>angle</span> ::= <a href='#DataTypeNumber'>number</a> (~"deg" | ~"grad" | ~"rad")?</pre>
- <p>where <span class='prop-value'>deg</span> indicates degrees,
- <span class='prop-value'>grad</span> indicates grads and
- <span class='prop-value'>rad</span> indicates radians.
- The unit identifier may be in lower (recommended) or upper case.</p>
- <p>For properties defined in CSS 2.1
- [<a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">CSS21</a>],
- an angle unit identifier must be provided (for non-zero
- values). For SVG-specific <a>properties</a> the angle unit
- identifier is optional. If a unit is not provided, the angle
- value is assumed to be in degrees.</p>
- </li>
- <li>
- <p>When an <angle> is used in an SVG <a>presentation attribute</a>,
- the syntax must match the following pattern:</p>
-
- <pre class='grammar'>angle ::= <a href='#DataTypeNumber'>number</a> ("deg" | "grad" | "rad")?</pre>
-
- <p>The unit identifier, if present, must be in lower case; if
- not present, the angle value is assumed to be in degrees.</p>
- </li>
- </ul>
- <p>In the SVG DOM, <angle> values are represented using
- <a>SVGAngle</a> or <a>SVGAnimatedAngle</a> objects.</p>
- </dd>
-
+
<dt id='DataTypeAnything'><anything></dt>
<dd>
<p>The basic type <anything> is a sequence of zero or more characters.