--- a/master/changes.html Fri May 25 08:48:14 2012 +1000
+++ b/master/changes.html Fri May 25 09:44:35 2012 +1000
@@ -41,6 +41,12 @@
<li>References to the SVG DTD have been removed.</li>
</ul>
+<h3 id="styling">Styling chapter</h3>
+
+<ul>
+ <li>Removed the <span class="attr-name">'contentStyleType'</span> attribute.</li>
+</ul>
+
<h3 id="text">Text chapter</h3>
<ul>
@@ -89,6 +95,12 @@
Filter Effect specification.</li>
</ul>
+<h3 id="script">Scripting chapter</h3>
+
+<ul>
+ <li>Removed the <span class="attr-name">'contentScriptType'</span> attribute.</li>
+</ul>
+
<h3 id="svgdtd">Document Type Definition appendix</h3>
<ul>
--- a/master/definitions.xml Fri May 25 08:48:14 2012 +1000
+++ b/master/definitions.xml Fri May 25 09:44:35 2012 +1000
@@ -939,7 +939,7 @@
elementcategories='animation, descriptive, shape, structural, gradient'
elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
attributecategories='conditional processing, core, document event, graphical event, presentation, style'
- attributes='externalResourcesRequired, viewBox, preserveAspectRatio, zoomAndPan, contentScriptType, contentStyleType'
+ attributes='externalResourcesRequired, viewBox, preserveAspectRatio, zoomAndPan'
interfaces='SVGSVGElement'>
<attribute name='x' href='struct.html#SVGElementXAttribute' animatable='yes'/>
<attribute name='y' href='struct.html#SVGElementYAttribute' animatable='yes'/>
@@ -1122,8 +1122,6 @@
<attribute name='xlink:href' elements='animate, animateColor, animateMotion, animateTransform, set' href='animate.html#HrefAttribute'/>
<!-- misc: Applies to all <element>s that include attribute name in 'attribute'. -->
- <attribute name='contentScriptType' href='script.html#ContentScriptTypeAttribute'/>
- <attribute name='contentStyleType' href='styling.html#ContentStyleTypeAttribute'/>
<attribute name='externalResourcesRequired' href='struct.html#ExternalResourcesRequiredAttribute'/>
<attribute name='viewBox' href='coords.html#ViewBoxAttribute' animatable='yes'/>
<attribute name='preserveAspectRatio' href='coords.html#PreserveAspectRatioAttribute' animatable='yes'/>
--- a/master/script.html Fri May 25 08:48:14 2012 +1000
+++ b/master/script.html Fri May 25 09:44:35 2012 +1000
@@ -14,42 +14,6 @@
<h1>Scripting</h1>
-<h2 id="ScriptingLanguage">Specifying the scripting language</h2>
-
-<h3 id="DefaultScriptingLanguage">Specifying the default scripting language</h3>
-
-<p>The <a>'svg/contentScriptType'</a> attribute on the <a>'svg'</a> element
-specifies the default scripting language for the given document fragment.</p>
-
- <div class="adef-list">
- <dl>
- <dt id="ContentScriptTypeAttribute"><span
- class="adef">contentScriptType</span> = "<span
- class="attr-value"><em>content-type</em></span>"</dt>
- <dd>Identifies the default scripting language for the given
- SVG document fragment. This attribute sets the default scripting language used
- to process the value strings in <a
- href="script.html#EventAttributes">event attributes</a>.
- This language must be used for all instances of script that do not specify
- their own scripting language.
- The value <span
- class="attr-value"><em>content-type</em></span> specifies a
- media type, per <a href="http://www.ietf.org/rfc/rfc2046.txt">MIME Part Two: Media Types</a>
- [<a href="refs.html#ref-RFC2046">RFC2046</a>].
- The default value is <span class='attr-value'>'application/ecmascript'</span>
- [<a href='refs.html#ref-RFC4329'>RFC4329</a>].<br />
- <span class="anim-target"><a
- href="animate.html#Animatable">Animatable</a>:
- no.</span></dd>
- </dl>
- </div>
-
-<h3 id="SpecifiedScriptingLanguage">Local declaration of a scripting language</h3>
-
-<p>It is also possible to specify the scripting language for each individual
-<a>'script'</a> element by specifying a <a>'script/type'</a> on the
-<a>'script'</a> element.</p>
-
<h2 id="ScriptElement">The <span class="element-name">'script'</span> element</h2>
<div class="annotation">
@@ -152,13 +116,10 @@
specifies a media type, per
<a href="http://www.ietf.org/rfc/rfc2046.txt">Multipurpose Internet Mail Extensions
(MIME) Part Two</a> [<a href="refs.html#ref-RFC2046">RFC2046</a>].
- If a <a>'script/type'</a> is not provided, the value of <a>'contentScriptType'</a> on
- the <a>'svg'</a> element shall be used, which in turn defaults to
- "application/ecmascript" [<a href="refs.html#ref-RFC4329">RFC4329</a>]. If a
- <a>'script element'</a> element falls outside of the
- <a>outermost svg element</a> and the <a>'script/type'</a>
- is not provided, the <a>'script/type'</a> must default to "application/ecmascript"
- [<a href="refs.html#ref-RFC4329">RFC4329</a>].<br/>
+ If a <a>'script/type'</a> is not provided, then the default scripting
+ language assumed is ECMAScript, as if processed with the
+ <span class="attr-name">'application/ecmascript'</span> media type.
+ [<a href="refs.html#ref-RFC4329">RFC4329</a>]<br/>
<span class="anim-target"><a
href="animate.html#Animatable">Animatable</a>:
no.</span></dd>
@@ -209,6 +170,10 @@
and descriptions of those events is provided in
<a href="interact.html#SVGEvents">Complete list of supported events</a>.</p>
+<p>The contents of event attributes are always interpreted as ECMAScript,
+as if processed with the media type <span class="attr-value">'application/ecmascript'</span>.
+[<a href="refs.html#ref-RFC2046">RFC2046</a>][<a href='refs.html#ref-RFC4329'>RFC4329</a>]</p>
+
<h3 id="LoadEvent">Event attribute for the SVGLoad event</h3>
<p>Below is the definition for the <a>'g/onload'</a> event attribute. It
--- a/master/struct.html Fri May 25 08:48:14 2012 +1000
+++ b/master/struct.html Fri May 25 09:44:35 2012 +1000
@@ -239,22 +239,6 @@
</p>
<p><span class="anim-target"><a href="animate.html#Animatable">Animatable</a>: yes.</span></p>
</dd>
- <dt id="SVGElementContentScriptTypeAttribute">
- <span class="adef">contentScriptType</span> = "<span class='attr-value'><a href="script.html#ContentScriptTypeAttribute"><em>content-type</em></a></span>"
- </dt>
- <dd>
- <p>
- See <span class="attr"><a href="script.html#ContentScriptTypeAttribute">'contentScriptType'</a></span>.
- </p>
- </dd>
- <dt id="SVGElementContentStyleTypeAttribute">
- <span class="adef">contentStyleType</span> = "<span class='attr-value'><a href="styling.html#ContentStyleTypeAttribute"><em>content-type</em></a></span>"
- </dt>
- <dd>
- <p>
- See <span class="attr"><a href="styling.html#ContentStyleTypeAttribute">'contentStyleType'</a></span>.
- </p>
- </dd>
<dt id="SVGElementZoomAndPanAttribute">
<span class="adef">zoomAndPan</span> = "<span class='attr-value'><a href="interact.html#ZoomAndPanAttribute">disable | magnify</a></span>"
</dt>
--- a/master/styling.html Fri May 25 08:48:14 2012 +1000
+++ b/master/styling.html Fri May 25 09:44:35 2012 +1000
@@ -738,13 +738,9 @@
the element's contents. The style sheet language is
specified as a content type (e.g., "text/css"), as per <a href="http://www.ietf.org/rfc/rfc2046.txt">MIME Part Two: Media Types</a>
[<a href="refs.html#ref-RFC2046">RFC2046</a>].
- If a <a>'style/type'</a> is not provided, the value of <a>'contentStyleType'</a>
- on the <a>'svg'</a> element shall be used, which in turn defaults to "text/css"
- [<a href="refs.html#ref-RFC2046">RFC2046</a>]. If a <a>'style'</a> element falls
- outside of the <a>outermost svg element</a>
- and the <a>'style/type'</a> is not
- provided, the <a>'style/type'</a> must default to "text/css"
- [<a href="refs.html#ref-RFC2046">RFC2046</a>]. <br />
+ If the attribute is not specified, then the
+ style sheet language is assumed to be CSS.
+ <br />
<span class="anim-target"><a
href="animate.html#Animatable">Animatable</a>:
no.</span></dd>
@@ -859,9 +855,7 @@
<dd>This attribute specifies style information for the
current element. The style attribute specifies style
information for a single element. The style sheet language
- of inline style rules is given by the value of attribute
- <a>'contentStyleType'</a> on the <a>'svg'</a> element.
- The syntax of style data depends on the style sheet language.<br />
+ of inline style rules is CSS.<br />
<span class="anim-target"><a
href="animate.html#Animatable">Animatable</a>:
no.</span></dd>
@@ -877,45 +871,6 @@
attribute is provided above (see <a
href="styling.html#StyleAttributeExample">example</a>).</p>
-<h2 id='DefaultStyleSheetLanguage'>Specifying the default style sheet language</h2>
-
-<p>The <a>'contentStyleType'</a> attribute on the <a>'svg'</a> element
-specifies the default style sheet language for the given document
-fragment.</p>
-
- <div class="adef-list">
- <dl>
- <dt id="ContentStyleTypeAttribute"><span
- class="adef">contentStyleType</span> = "<span
- class="attr-value"><em>content-type</em></span>"</dt>
- <dd>Identifies the default style sheet language for the
- given document. That language must then be used for all instances of style that
- do not specify their own style sheet language, such as the <a>'style attribute'</a>
- attributes that are available on many elements. The value <span
- class="attr-value"><em>content-type</em></span> specifies a media
- type, per <a href="http://www.ietf.org/rfc/rfc2046.txt">MIME Part Two: Media Types</a>
- [<a href="refs.html#ref-RFC2046">RFC2046</a>].
- The default value is <span class="attr-value">"text/css"</span>
- [<a href="refs.html#ref-RFC2318">RFC2318</a>].<br />
- <span class="anim-target"><a
- href="animate.html#Animatable">Animatable</a>:
- no.</span></dd>
- </dl>
- </div>
-
-<p>Since the only widely deployed language used for inline styling (in style
-elements and style attributes) is CSS, and since that is already the default
-language if <a>'contentStyleType'</a> is omitted, in practice <a>'contentStyleType'</a> is not well
-supported in user agents. XSL style sheets are typically external. If a new
-style sheet language becomes popular, it might not use style attributes and could
-easily declare which language is in use with the type attribute on the style element.</p>
-
-<p>The use of <a>'contentStyleType'</a> is therefore deprecated; new content
-should not use it. Future versions of the SVG specification may remove
-<a>'contentStyleType'</a>.</p>
-
-<p class='issue'>We should probably do that.</p>
-
<h2 id='Inheritance'>Property inheritance</h2>
<p>Whether or not the user agent supports CSS, property
--- a/master/svg.idl Fri May 25 08:48:14 2012 +1000
+++ b/master/svg.idl Fri May 25 09:44:35 2012 +1000
@@ -1939,24 +1939,6 @@
readonly attribute SVGAnimatedLength height;
/**
- * Corresponds to attribute <a>'contentScriptType'</a> on the given
- * <a>'svg'</a> element.
- *
- * @setraises DOMException(NO_MODIFICATION_ALLOWED_ERR) Raised on an attempt to
- * change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
- */
- attribute DOMString contentScriptType setraises(DOMException);
-
- /**
- * Corresponds to attribute <a>'contentStyleType'</a> on the given
- * <a>'svg'</a> element.
- *
- * @setraises DOMException(NO_MODIFICATION_ALLOWED_ERR) Raised on an attempt to
- * change the value of a <a href="svgdom.html#ReadOnlyNodes">read only attribute</a>.
- */
- attribute DOMString contentStyleType setraises(DOMException);
-
- /**
* <p>The position and size of the viewport (implicit or explicit) that
* corresponds to this <a>'svg'</a> element. When the user agent is actually
* rendering the content, then the position and size values represent the