Skip to content

Commit a2a718b

Browse files
annevkannevk
committed
update terminology
1 parent 71cd13f commit a2a718b

3 files changed

Lines changed: 154 additions & 103 deletions

File tree

‎cssom/Overview.html‎

Lines changed: 60 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,27 @@ <h2 id="conformance"><span class="secno">2 </span>Conformance</h2>
204204
<p>Unless otherwise stated, string comparisons are done in a <span>case-sensitive</span> manner.
205205

206206

207-
<h2 id="terminology"><span class="secno">3 </span>Terminology</h2>
207+
<h2 id="terminology"><span class="secno">3 </span>Terminology</h2>
208208

209-
<p class="XXX">
210-
<dfn id="content-type-metadata">Content-Type metadata</dfn>,
211-
<dfn id="supported-styling-language">supported styling language</dfn>,
212-
<dfn id="xml-stylesheet-processing-instruction"><code>xml-stylesheet</code> processing instruction</dfn>,
213-
</p>
209+
<p>Terminology used in this specification is from
210+
<cite>DOM Core</cite>,
211+
<cite>HTML</cite>,
212+
<cite>Associating Style Sheets with XML documents</cite>
213+
and
214+
<span>XML</span>
215+
<a href="#refsDOMCORE">[DOMCORE]</a>
216+
<a href="#refsHTML">[HTML]</a>
217+
<a href="#refsXMLSS">[XMLSS]</a>
218+
<a href="#refsXML">[XML]</a>
214219

215-
<p>When this specification talks about object <code><var title="">A</var></code>
216-
where <code><var title="">A</var></code> is actually an interface, it generally means
217-
an object implementing interface <code><var title="">A</var></code>.</p>
220+
<p class="XXX"><dfn id="supported-styling-language">supported styling language</dfn>
218221

219-
<p>The term <dfn id="whitespace">whitespace</dfn> is used as defined in
220-
CSS. <!--XXX <a href="#ref-css">[CSS]</a>--></p>
222+
<p>When this specification talks about object
223+
<code title=""><var>A</var></code> where <code title=""><var>A</var></code> is actually an interface, it generally means an object implementing interface
224+
<code title=""><var>A</var></code>.</p>
225+
226+
<p>The term <dfn id="whitespace">whitespace</dfn> is used as defined in CSS.
227+
<!--XXX <a href="#ref-css">[CSS]</a>--></p>
221228

222229

223230
<h3 id="common-serializing-idioms"><span class="secno">3.1 </span>Common Serializing Idioms</h3>
@@ -1397,16 +1404,17 @@ <h4 id="examples"><span class="secno">6.2.5 </span>Examples</h4>
13971404

13981405
<h3 id="style-sheet-association"><span class="secno">6.3 </span>Style Sheet Association</h3>
13991406

1400-
<p>This section defines the interface a <a href="#style-sheet-owner-node">style sheet owner node</a> of a
1401-
<a href="#style-sheet">style sheet</a> has to implement and defines the requirements for
1402-
<a href="#xml-stylesheet-processing-instruction" title="xml-stylesheet processing instruction">xml-stylesheet processing instructions</a>
1407+
<p>This section defines the interface a
1408+
<a href="#style-sheet-owner-node">style sheet owner node</a> of a <a href="#style-sheet">style sheet</a> has to
1409+
implement and defines the requirements for
1410+
<a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-xml-stylesheet" title="xml-stylesheet processing instruction">xml-stylesheet processing instructions</a>
14031411
and HTTP <code title="http-link">Link</code> headers when the link
1404-
releation type is an
1412+
relation type is an
14051413
<a class="external" href="http://www.whatwg.org/html/#ascii-case-insensitive">ASCII case-insensitive</a> match for
14061414
"<code title="">stylesheet</code>" since nobody else was interested in
14071415
defining this.</p>
14081416

1409-
<p>The editor is in good hope that HTML and SVG will define the
1417+
<p class="note">The editor is in good hope that HTML and SVG will define the
14101418
appropriate processing in their respective specifications, in terms of
14111419
this specification, in due course.</p>
14121420

@@ -1419,7 +1427,7 @@ <h4 id="the-linkstyle-interface"><span class="secno">6.3.1 </span>The <code titl
14191427
<a href="#style-sheet-owner-node">style sheet owner node</a>
14201428
implements the <code><a href="#linkstyle">LinkStyle</a></code> interface.</p>
14211429

1422-
<p class="XXX">Also [Supplemental]?</p>
1430+
<p class="XXX">Use partial instead?</p>
14231431

14241432
<pre class="idl">[NoInterfaceObject] interface <dfn id="linkstyle">LinkStyle</dfn> {
14251433
readonly attribute <a href="#stylesheet">StyleSheet</a> <a href="#linkstyle-sheet" title="linkstyle-sheet">sheet</a>;
@@ -1469,36 +1477,40 @@ <h4 id="requirements-on-user-agents-implementing-the-xml-stylesheet-processing-i
14691477
<pre class="idl"><span>ProcessingInstruction</span> implements <a href="#linkstyle">LinkStyle</a>;</pre>
14701478

14711479
<p>For each
1472-
<a href="#xml-stylesheet-processing-instruction"><code>xml-stylesheet</code> processing instruction</a> that is
1473-
not part of the <span>document type declaration</span> and has an
1474-
<code title="">href</code> pseudo-attribute these steps
1475-
must (unless otherwise stated) be run:</p>
1480+
<a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-xml-stylesheet"><code>xml-stylesheet</code> processing instruction</a>
1481+
that is not part of the
1482+
<a class="external" href="http://www.w3.org/TR/xml/#dt-doctype">document type declaration</a> and has an
1483+
<code title="">href</code>
1484+
<a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a> these steps must
1485+
(unless otherwise stated) be run:</p>
14761486

14771487
<ol>
14781488
<li><p>Let <var title="">title</var> be the value of the
1479-
<code title="">title</code> pseudo-attribute or the empty string if the
1480-
<code title="">title</code> pseudo-attribute is not specified.</li>
1489+
<code title="">title</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a> or the empty string if the
1490+
<code title="">title</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a> is not specified.</li>
14811491

1482-
<li><p>If there is an <code title="">alternate</code> pseudo-attribute
1492+
<li><p>If there is an <code title="">alternate</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a>
14831493
whose value is a <a class="external" href="http://www.whatwg.org/html/#case-sensitive">case-sensitive</a> match
14841494
for "<code title="">yes</code>" and <var title="">title</var> is the
14851495
empty string terminate these steps.</li>
14861496

1487-
<li><p>If there is a <code title="">type</code> pseudo-attribute whose
1497+
<li><p>If there is a <code title="">type</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a> whose
14881498
value is not a <a href="#supported-styling-language">supported styling language</a> the user agent
14891499
may terminate these steps.</li>
14901500

14911501
<li><p><a class="external" href="http://www.whatwg.org/html/#resolve-a-url" title="Resolve a URL">Resolve</a>
14921502
the <a class="external" href="http://www.whatwg.org/html/#url">URL</a> specified by the
1493-
<code title="">href</code> pseudo-attribute and then
1503+
<code title="">href</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a> and then
14941504
<a class="external" href="http://www.whatwg.org/html/#fetch">fetch</a> it.</li>
14951505

14961506
<li>
14971507
<p>When the resource is available, the document is in
1498-
<span>quirks mode</span> and the <a href="#content-type-metadata">Content-Type metadata</a> of
1508+
<a class="external" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-quirks-mode" title="concept-quirks-mode">quirks mode</a>
1509+
and the
1510+
<a class="external" href="http://www.whatwg.org/html/#content-type">Content-Type metadata</a> of
14991511
the resource is not a <a href="#supported-styling-language">supported styling language</a> change the
1500-
<a href="#content-type-metadata">Content-Type metadata</a> of the resource to
1501-
<code title="">text/css</code>.</p>
1512+
<a class="external" href="http://www.whatwg.org/html/#content-type">Content-Type metadata</a> of the resource
1513+
to <code title="">text/css</code>.</p>
15021514

15031515
<p class="note">This step might never actually happen, but is included
15041516
here in case other specifications change, to keep things consistent.</p>
@@ -1525,14 +1537,14 @@ <h4 id="requirements-on-user-agents-implementing-the-xml-stylesheet-processing-i
15251537
<dd><p>null</dd>
15261538

15271539
<dt><a href="#style-sheet-media">style sheet media</a></dt>
1528-
<dd><p>The value of the <code title="">media</code> pseudo-attribute
1540+
<dd><p>The value of the <code title="">media</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a>
15291541
if any, or the empty string otherwise.</dd>
15301542

15311543
<dt><a href="#style-sheet-title">style sheet title</a></dt>
15321544
<dd><p><var title="">title</var></dd>
15331545

15341546
<dt><a href="#style-sheet-alternate-flag">style sheet alternate flag</a></dt>
1535-
<dd><p>True if the <code title="">alternate</code> pseudo-attribute
1547+
<dd><p>True if the <code title="">alternate</code> <a class="external" href="http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute">pseudo-attribute</a>
15361548
value is a <a class="external" href="http://www.whatwg.org/html/#case-sensitive">case-sensitive</a> match for
15371549
"<code>yes</code>", and false otherwise.</dd>
15381550
</dl>
@@ -1569,10 +1581,11 @@ <h4 id="requirements-on-user-agents-implementing-the-http-link-header"><span cla
15691581
<a class="external" href="http://www.whatwg.org/html/#fetch">fetch</a> it.</li>
15701582

15711583
<li><p>When the resource is available, the document is in
1572-
<span>quirks mode</span> and the <a href="#content-type-metadata">Content-Type metadata</a> of
1584+
<a class="external" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-quirks-mode" title="concept-quirks-mode">quirks mode</a>
1585+
and the <a class="external" href="http://www.whatwg.org/html/#content-type">Content-Type metadata</a> of
15731586
the resource is not a <a href="#supported-styling-language">supported styling language</a> change the
1574-
<a href="#content-type-metadata">Content-Type metadata</a> of the resource to
1575-
<code title="">text/css</code>.</li>
1587+
<a class="external" href="http://www.whatwg.org/html/#content-type">Content-Type metadata</a> of the resource
1588+
to <code title="">text/css</code>.</li>
15761589

15771590
<li><p>If the resource is not in a
15781591
<a href="#supported-styling-language">supported styling language</a> terminate these steps.</li>
@@ -3232,9 +3245,21 @@ <h3 id="default-style"><span class="secno">9.1 </span><dfn title="http-default-s
32323245

32333246
<h2 class="no-num" id="references">References</h2>
32343247
<h3 class="no-num" id="normative-references">Normative references</h3>
3235-
<div id="anolis-references-normative"><dl><dt id="refsRFC2119">[RFC2119]
3248+
<div id="anolis-references-normative"><dl><dt id="refsDOMCORE">[DOMCORE]
3249+
<dd><cite><a href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html">DOM Core</a></cite>, A. van Kesteren and Ms2ger. W3C.
3250+
3251+
<dt id="refsHTML">[HTML]
3252+
<dd><cite><a href="http://www.whatwg.org/html">HTML</a></cite>, I. Hickson. WHATWG.
3253+
3254+
<dt id="refsRFC2119">[RFC2119]
32363255
<dd><cite><a href="http://www.ietf.org/rfc/rfc2119.txt">Key words for use in RFCs to Indicate Requirement Levels</a></cite>, S. Bradner. IETF.
32373256

3257+
<dt id="refsXML">[XML]
3258+
<dd><cite><a href="http://www.w3.org/TR/xml/">Extensible Markup Language</a></cite>, T. Bray, J. Paoli, C. Sperberg-McQueen et al.. W3C.
3259+
3260+
<dt id="refsXMLSS">[XMLSS]
3261+
<dd><cite><a href="http://www.w3.org/TR/xml-stylesheet/">Associating Style Sheets with XML documents 1.0 (Second Edition)</a></cite>, J. Clark, S. Pieters and H. S. Thompson. W3C.
3262+
32383263
</dl></div>
32393264

32403265
<h3 class="no-num" id="informative-references">Informative references</h3>

‎cssom/Overview.src.html‎

Lines changed: 47 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,27 @@ <h2>Conformance</h2>
129129
<p>Unless otherwise stated, string comparisons are done in a <span>case-sensitive</span> manner.
130130

131131

132-
<h2 id="terminology">Terminology</h2>
132+
<h2 id="terminology">Terminology</h2>
133133

134-
<p class="XXX">
135-
<dfn>Content-Type metadata</dfn>,
136-
<dfn>supported styling language</dfn>,
137-
<dfn><code>xml-stylesheet</code> processing instruction</dfn>,
138-
</p>
134+
<p>Terminology used in this specification is from
135+
<cite>DOM Core</cite>,
136+
<cite>HTML</cite>,
137+
<cite>Associating Style Sheets with XML documents</cite>
138+
and
139+
<span>XML</span>
140+
<span data-anolis-ref>DOMCORE</span>
141+
<span data-anolis-ref>HTML</span>
142+
<span data-anolis-ref>XMLSS</span>
143+
<span data-anolis-ref>XML</span>
139144

140-
<p>When this specification talks about object <code><var title="">A</var></code>
141-
where <code><var title="">A</var></code> is actually an interface, it generally means
142-
an object implementing interface <code><var title="">A</var></code>.</p>
145+
<p class="XXX"><dfn>supported styling language</dfn>
143146

144-
<p>The term <dfn id="whitespace">whitespace</dfn> is used as defined in
145-
CSS. <!--XXX <a href="#ref-css">[CSS]</a>--></p>
147+
<p>When this specification talks about object
148+
<code title><var>A</var></code> where <code title><var>A</var></code> is actually an interface, it generally means an object implementing interface
149+
<code title><var>A</var></code>.</p>
150+
151+
<p>The term <dfn id="whitespace">whitespace</dfn> is used as defined in CSS.
152+
<!--XXX <a href="#ref-css">[CSS]</a>--></p>
146153

147154

148155
<h3>Common Serializing Idioms</h3>
@@ -1322,16 +1329,17 @@ <h4>Examples</h4>
13221329

13231330
<h3>Style Sheet Association</h3>
13241331

1325-
<p>This section defines the interface a <span>style sheet owner node</span> of a
1326-
<span>style sheet</span> has to implement and defines the requirements for
1327-
<span title="xml-stylesheet processing instruction">xml-stylesheet processing instructions</span>
1332+
<p>This section defines the interface a
1333+
<span>style sheet owner node</span> of a <span>style sheet</span> has to
1334+
implement and defines the requirements for
1335+
<span data-anolis-spec=xmlss title="xml-stylesheet processing instruction">xml-stylesheet processing instructions</span>
13281336
and HTTP <code title="http-link">Link</code> headers when the link
1329-
releation type is an
1337+
relation type is an
13301338
<span data-anolis-spec=html>ASCII case-insensitive</span> match for
13311339
"<code title="">stylesheet</code>" since nobody else was interested in
13321340
defining this.</p>
13331341

1334-
<p>The editor is in good hope that HTML and SVG will define the
1342+
<p class=note>The editor is in good hope that HTML and SVG will define the
13351343
appropriate processing in their respective specifications, in terms of
13361344
this specification, in due course.</p>
13371345

@@ -1344,7 +1352,7 @@ <h4>The <code title="">LinkStyle</code> Interface</h4>
13441352
<span>style sheet owner node</span>
13451353
implements the <code>LinkStyle</code> interface.</p>
13461354

1347-
<p class="XXX">Also [Supplemental]?</p>
1355+
<p class="XXX">Use partial instead?</p>
13481356

13491357
<pre class="idl">[NoInterfaceObject] interface <dfn>LinkStyle</dfn> {
13501358
readonly attribute <span>StyleSheet</span> <span title="linkstyle-sheet">sheet</span>;
@@ -1394,36 +1402,40 @@ <h4>Requirements on User Agents Implementing the
13941402
<pre class="idl"><span>ProcessingInstruction</span> implements <span>LinkStyle</span>;</pre>
13951403

13961404
<p>For each
1397-
<span><code>xml-stylesheet</code> processing instruction</span> that is
1398-
not part of the <span>document type declaration</span> and has an
1399-
<code title="">href</code> pseudo-attribute these steps
1400-
must (unless otherwise stated) be run:</p>
1405+
<span data-anolis-spec=xmlss><code>xml-stylesheet</code> processing instruction</span>
1406+
that is not part of the
1407+
<span data-anolis-spec=xml>document type declaration</span> and has an
1408+
<code title="">href</code>
1409+
<span data-anolis-spec=xmlss>pseudo-attribute</span> these steps must
1410+
(unless otherwise stated) be run:</p>
14011411

14021412
<ol>
14031413
<li><p>Let <var title="">title</var> be the value of the
1404-
<code title="">title</code> pseudo-attribute or the empty string if the
1405-
<code title="">title</code> pseudo-attribute is not specified.</p></li>
1414+
<code title="">title</code> <span data-anolis-spec=xmlss>pseudo-attribute</span> or the empty string if the
1415+
<code title="">title</code> <span data-anolis-spec=xmlss>pseudo-attribute</span> is not specified.</p></li>
14061416

1407-
<li><p>If there is an <code title="">alternate</code> pseudo-attribute
1417+
<li><p>If there is an <code title="">alternate</code> <span data-anolis-spec=xmlss>pseudo-attribute</span>
14081418
whose value is a <span data-anolis-spec=html>case-sensitive</span> match
14091419
for "<code title="">yes</code>" and <var title="">title</var> is the
14101420
empty string terminate these steps.</p></li>
14111421

1412-
<li><p>If there is a <code title="">type</code> pseudo-attribute whose
1422+
<li><p>If there is a <code title="">type</code> <span data-anolis-spec=xmlss>pseudo-attribute</span> whose
14131423
value is not a <span>supported styling language</span> the user agent
14141424
may terminate these steps.</p></li>
14151425

14161426
<li><p><span data-anolis-spec=html title="Resolve a URL">Resolve</span>
14171427
the <span data-anolis-spec=html>URL</span> specified by the
1418-
<code title="">href</code> pseudo-attribute and then
1428+
<code title="">href</code> <span data-anolis-spec=xmlss>pseudo-attribute</span> and then
14191429
<span data-anolis-spec=html>fetch</span> it.</p></li>
14201430

14211431
<li>
14221432
<p>When the resource is available, the document is in
1423-
<span>quirks mode</span> and the <span>Content-Type metadata</span> of
1433+
<span data-anolis-spec=domcore title=concept-quirks-mode>quirks mode</span>
1434+
and the
1435+
<span data-anolis-spec=html>Content-Type metadata</span> of
14241436
the resource is not a <span>supported styling language</span> change the
1425-
<span>Content-Type metadata</span> of the resource to
1426-
<code title="">text/css</code>.</p>
1437+
<span data-anolis-spec=html>Content-Type metadata</span> of the resource
1438+
to <code title="">text/css</code>.</p>
14271439

14281440
<p class="note">This step might never actually happen, but is included
14291441
here in case other specifications change, to keep things consistent.</p>
@@ -1450,14 +1462,14 @@ <h4>Requirements on User Agents Implementing the
14501462
<dd><p>null</p></dd>
14511463

14521464
<dt><span>style sheet media</span></dt>
1453-
<dd><p>The value of the <code title="">media</code> pseudo-attribute
1465+
<dd><p>The value of the <code title="">media</code> <span data-anolis-spec=xmlss>pseudo-attribute</span>
14541466
if any, or the empty string otherwise.</p></dd>
14551467

14561468
<dt><span>style sheet title</span></dt>
14571469
<dd><p><var title="">title</var></p></dd>
14581470

14591471
<dt><span>style sheet alternate flag</span></dt>
1460-
<dd><p>True if the <code title="">alternate</code> pseudo-attribute
1472+
<dd><p>True if the <code title="">alternate</code> <span data-anolis-spec=xmlss>pseudo-attribute</span>
14611473
value is a <span data-anolis-spec=html>case-sensitive</span> match for
14621474
"<code>yes</code>", and false otherwise.</p></dd>
14631475
</dl>
@@ -1494,10 +1506,11 @@ <h4>Requirements on User Agents Implementing the HTTP
14941506
<span data-anolis-spec=html>fetch</span> it.</p></li>
14951507

14961508
<li><p>When the resource is available, the document is in
1497-
<span>quirks mode</span> and the <span>Content-Type metadata</span> of
1509+
<span data-anolis-spec=domcore title=concept-quirks-mode>quirks mode</span>
1510+
and the <span data-anolis-spec=html>Content-Type metadata</span> of
14981511
the resource is not a <span>supported styling language</span> change the
1499-
<span>Content-Type metadata</span> of the resource to
1500-
<code title="">text/css</code>.</p></li>
1512+
<span data-anolis-spec=html>Content-Type metadata</span> of the resource
1513+
to <code title="">text/css</code>.</p></li>
15011514

15021515
<li><p>If the resource is not in a
15031516
<span>supported styling language</span> terminate these steps.</p></li>

0 commit comments

Comments
 (0)