- From: SVG Working Group repository <cam@mcc.id.au>
- Date: Thu, 17 Jan 2013 20:54:25 -0800
- To: public-svg-wg@w3.org
details: https://svgwg.org/hg/svg2/rev/fcdf3264bc92
branches:
changeset: 424:fcdf3264bc92
user: Cameron McCormack <cam@mcc.id.au>
date: Fri Jan 18 15:52:31 2013 +1100
description:
Remove definition of <angle> type and reference css3-values.
diffstat:
master/definitions.xml | 2 +-
master/painting.html | 8 +++++---
master/text.html | 22 ++++++++++++----------
master/types.html | 39 +--------------------------------------
4 files changed, 19 insertions(+), 52 deletions(-)
diffs (238 lines):
diff --git a/master/definitions.xml b/master/definitions.xml
--- a/master/definitions.xml
+++ b/master/definitions.xml
@@ -1150,17 +1150,16 @@
<interface name='SVGFontFaceFormatElement' href='fonts.html#InterfaceSVGFontFaceFormatElement'/>
<interface name='SVGFontFaceNameElement' href='fonts.html#InterfaceSVGFontFaceNameElement'/>
<interface name='SVGMetadataElement' href='metadata.html#InterfaceSVGMetadataElement'/>
<interface name='SVGForeignObjectElement' href='extend.html#InterfaceSVGForeignObjectElement'/>
<interface name='SVGSolidColorElement' href='pservers.html#InterfaceSVGSolidColorElement'/>
<!-- ... 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'/>
<symbol name='coordinate' href='types.html#DataTypeCoordinate'/>
<symbol name='dasharray' href='painting.html#DataTypeDasharray'/>
<symbol name='frequency' href='types.html#DataTypeFrequency'/>
<symbol name='gradient' href='types.html#DataTypeGradient'/>
<symbol name='icccolor' href='types.html#DataTypeICCColor'/>
@@ -1352,12 +1351,13 @@
<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='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'/>
</definitions>
diff --git a/master/painting.html b/master/painting.html
--- a/master/painting.html
+++ b/master/painting.html
@@ -1909,17 +1909,17 @@ coordinate system of the marker contents
<tr>
<th>Name</th>
<th>Value</th>
<th>Lacuna value</th>
<th>Animatable</th>
</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>
</table>
</dt>
<dd>
@@ -1952,24 +1952,26 @@ Values have the following meaning:</p>
<li>the first path segment of the <em>current</em> subpath,
if the following subpath does begin with a
<a href="paths.html#PathDataMovetoCommands">'moveto'</a> command
or if there is no following subpath.</li>
</ul>
</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>
</dl>
<p>The orientation occurs after the marker has been fitted into its
viewport. See the <a href="#MarkerAlgorithm">Details on how markers are rendered</a>
section below for an illustrative example.</p>
diff --git a/master/text.html b/master/text.html
--- a/master/text.html
+++ b/master/text.html
@@ -1591,18 +1591,17 @@ inline-progression-direction is horizont
<div class="propdef">
<dl>
<dt id="GlyphOrientationVerticalProperty"><span class="propdef-title property">'glyph-orientation-vertical'</span></dt>
<dd>
<table
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>
<td>auto</td>
</tr>
<tr>
<td><em>Applies to:</em> </td>
<td><a>text content elements</a></td>
@@ -1674,19 +1673,21 @@ inline-progression-direction is horizont
the various JIS or other national standards.</p>
</li>
</ul>
</blockquote>
</li>
</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
that all glyphs are set with the top of the glyphs oriented
towards the <a
href="text.html#ReferenceOrientation">reference
orientation</a>. A value of <span
class="prop-value">90deg</span> indicates an orientation of
@@ -1755,18 +1756,17 @@ src="images/text/GlyphOrientZero.png" />
<div class="propdef">
<dl>
<dt id="GlyphOrientationHorizontalProperty"><span class="propdef-title property">'glyph-orientation-horizontal'</span></dt>
<dd>
<table
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>
<td>0deg</td>
</tr>
<tr>
<td><em>Applies to:</em> </td>
<td><a>text content elements</a></td>
@@ -1789,19 +1789,21 @@ src="images/text/GlyphOrientZero.png" />
<td>no</td>
</tr>
</table>
</dd>
</dl>
</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
that all glyphs are set with the top of the glyphs oriented
towards the <a
href="text.html#ReferenceOrientation">reference
orientation</a>. A value of <span
class="prop-value">90deg</span> indicates an orientation of
diff --git a/master/types.html b/master/types.html
--- a/master/types.html
+++ b/master/types.html
@@ -199,54 +199,17 @@ multiple properties and attributes are d
<p>Note that, as mentioned below, the specification of some types is different
for CSS property values in style sheets (in the <a>'style attribute'</a> attribute,
<a>'style element'</a> element or an external style sheet) than it is for for
XML attribute values (including <a>presentation attribute</a>s). This is due to
restrictions in the CSS grammar. For example, scientific notation is allowed in
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.
Specifically:</p>
<pre class='grammar'><span id='Anything'>anything</span> ::= <a href='http://www.w3.org/TR/2008/REC-xml-20081126/#NT-Char'>Char</a>*</pre>
<p>where <a href='http://www.w3.org/TR/2008/REC-xml-20081126/#NT-Char'>Char</a> is the
Received on Friday, 18 January 2013 04:54:47 UTC