Skip to content

Commit 90c266d

Browse files
committed
[css-syntax] Export terms.
1 parent ddbc850 commit 90c266d

File tree

3 files changed

+72
-40
lines changed

3 files changed

+72
-40
lines changed

css-grid/Overview.src.html

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,31 +1198,63 @@ <h3 id="grid-template-areas-property">
11981198
<dt><dfn><<string>>+</dfn>
11991199
<dd>
12001200
A row is created for every separate string listed for the 'grid-template-areas' property,
1201-
and a column is created for each identifier or period ("." U+002E) in the string,
1202-
when the string's contents are parsed as CSS.
1201+
and a column is created for each cell name in the string,
1202+
when parsed as follows:
1203+
1204+
<ol>
1205+
<li>
1206+
Tokenize the string into a list of the following tokens,
1207+
using longest-match semantics:
1208+
1209+
<ul>
1210+
<li>
1211+
A sequence of consecutive <a>name code points</a>,
1212+
representing a <dfn>named cell token</dfn>
1213+
with a name consisting of its code points.
1214+
<li>
1215+
A "." (U+002E FULL STOP),
1216+
representing a <dfn>null cell token</dfn>.
1217+
1218+
<li>
1219+
A sequence of whitespace,
1220+
representing nothing
1221+
(do not produce a token).
1222+
1223+
<li>
1224+
A sequence of any other characters,
1225+
representing a <dfn>trash token</dfn>.
1226+
</ul>
1227+
1228+
<li>
1229+
If the list of tokens contains any <a>trash tokens</a>,
1230+
this is a syntax error,
1231+
and the property is invalid.
1232+
</ol>
1233+
1234+
Note: Other CSS syntax, such as character escapes, is not valid within a row string.
1235+
(The \ character that would start a character escape produces a trash token instead.)
1236+
These rules can produce cell names that do not match the <<ident>> syntax,
1237+
such as "1st 2nd 3rd",
1238+
which requires escaping when referencing those areas by name in other properties,
1239+
like ''grid-row: \31st;'' to reference the area named ''1st''.
12031240

12041241
<ul>
12051242
<li>
1206-
A period represents an unnamed area in the <a>grid container</a>.
1243+
A <a>null cell token</a> represents an unnamed area in the <a>grid container</a>.
12071244

12081245
<li>
1209-
An identifier creates a <a>named grid area</a> with the identifier as its name.
1210-
Multiple identical identifiers
1246+
A <a>named cell token</a> creates a <a>named grid area</a> with the same name.
1247+
Multiple <a>named cell tokens</a> within and between rows
12111248
create a single <a>named grid area</a> that spans the corresponding <a>grid cells</a>.
12121249
</ul>
12131250

1214-
<p>
1215-
All strings must have the same number of columns,
1216-
or else the declaration is invalid.
1217-
If a <a>named grid area</a> spans multiple <a>grid cells</a>,
1218-
but those cells do not form a single filled-in rectangle,
1219-
the declaration is invalid.
1220-
If a string's contents, when parsed as CSS,
1221-
contain anything other than whitespace, identifiers, or periods,
1222-
the declaration is invalid.
1223-
1224-
<p class='note'>
1225-
Non-rectangular or disconnected regions may be permitted in a future version of this module.
1251+
All strings must have the same number of columns,
1252+
or else the declaration is invalid.
1253+
If a <a>named grid area</a> spans multiple <a>grid cells</a>,
1254+
but those cells do not form a single filled-in rectangle,
1255+
the declaration is invalid.
1256+
1257+
Note: Non-rectangular or disconnected regions may be permitted in a future version of this module.
12261258
</dl>
12271259

12281260

css-syntax/Overview.html

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</p>
5555
<h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
5656
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
57-
<span class=dt-updated><span class=value-title title=20131114>14 November 2013</span></span></span></h2>
57+
<span class=dt-updated><span class=value-title title=20131202>2 December 2013</span></span></span></h2>
5858
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-syntax-3/>http://www.w3.org/TR/css-syntax-3/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/</a>
5959
<dt>Feedback:</dt>
6060
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -1805,97 +1805,97 @@ <h3 class="heading settled heading" data-level=4.2 id=tokenizer-definitions><spa
18051805

18061806
<p> This section defines several terms used during the tokenization phase.
18071807

1808-
<dl>
1809-
<dt><dfn data-dfn-type=dfn data-noexport="" id=code-point>code point<a class=self-link href=#code-point></a></dfn>
1808+
<dl data-export="">
1809+
<dt><dfn data-dfn-type=dfn data-export="" id=code-point>code point<a class=self-link href=#code-point></a></dfn>
18101810
<dd>
18111811
A <a href=http://unicode.org/glossary/#code_point>Unicode code point</a>.
18121812
Any value in the Unicode codespace; that is, the range of integers from 0 to (hexadecimal) 10FFFF.
18131813

1814-
<dt><dfn data-dfn-type=dfn data-noexport="" id=next-input-code-point>next input code point<a class=self-link href=#next-input-code-point></a></dfn>
1814+
<dt><dfn data-dfn-type=dfn data-export="" id=next-input-code-point>next input code point<a class=self-link href=#next-input-code-point></a></dfn>
18151815
<dd>
18161816
The first <a data-link-type=dfn href=#code-point title="code point">code point</a> in the input stream that has not yet been consumed.
18171817

1818-
<dt><dfn data-dfn-type=dfn data-noexport="" id=current-input-code-point>current input code point<a class=self-link href=#current-input-code-point></a></dfn>
1818+
<dt><dfn data-dfn-type=dfn data-export="" id=current-input-code-point>current input code point<a class=self-link href=#current-input-code-point></a></dfn>
18191819
<dd>
18201820
The last <a data-link-type=dfn href=#code-point title="code point">code point</a> to have been consumed.
18211821

1822-
<dt><dfn data-dfn-type=dfn data-noexport="" id=reconsume-the-current-input-code-point>reconsume the current input code point<a class=self-link href=#reconsume-the-current-input-code-point></a></dfn>
1822+
<dt><dfn data-dfn-type=dfn data-export="" id=reconsume-the-current-input-code-point>reconsume the current input code point<a class=self-link href=#reconsume-the-current-input-code-point></a></dfn>
18231823
<dd>
18241824
Push the <a data-link-type=dfn href=#current-input-code-point title="current input code point">current input code point</a> back onto the front of the input stream,
18251825
so that the next time you are instructed to consume the <a data-link-type=dfn href=#next-input-code-point title="next input code point">next input code point</a>,
18261826
it will instead reconsume the <a data-link-type=dfn href=#current-input-code-point title="current input code point">current input code point</a>.
18271827

1828-
<dt><dfn data-dfn-type=dfn data-noexport="" id=eof-code-point>EOF code point<a class=self-link href=#eof-code-point></a></dfn>
1828+
<dt><dfn data-dfn-type=dfn data-export="" id=eof-code-point>EOF code point<a class=self-link href=#eof-code-point></a></dfn>
18291829
<dd>
18301830
A conceptual <a data-link-type=dfn href=#code-point title="code point">code point</a> representing the end of the input stream.
18311831
Whenever the input stream is empty,
18321832
the <a data-link-type=dfn href=#next-input-code-point title="next input code point">next input code point</a> is always an EOF code point.
18331833

1834-
<dt><dfn data-dfn-type=dfn data-noexport="" id=digit>digit<a class=self-link href=#digit></a></dfn>
1834+
<dt><dfn data-dfn-type=dfn data-export="" id=digit>digit<a class=self-link href=#digit></a></dfn>
18351835
<dd>
18361836
A <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0030 DIGIT ZERO (0) and U+0039 DIGIT NINE (9).
18371837

1838-
<dt><dfn data-dfn-type=dfn data-noexport="" id=hex-digit>hex digit<a class=self-link href=#hex-digit></a></dfn>
1838+
<dt><dfn data-dfn-type=dfn data-export="" id=hex-digit>hex digit<a class=self-link href=#hex-digit></a></dfn>
18391839
<dd>
18401840
A <a data-link-type=dfn href=#digit title=digit>digit</a>,
18411841
or a <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0041 LATIN CAPITAL LETTER A (A) and U+0046 LATIN CAPITAL LETTER F (F),
18421842
or a <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0061 LATIN SMALL LETTER A (a) and U+0066 LATIN SMALL LETTER F (f).
18431843

1844-
<dt><dfn data-dfn-type=dfn data-noexport="" id=uppercase-letter>uppercase letter<a class=self-link href=#uppercase-letter></a></dfn>
1844+
<dt><dfn data-dfn-type=dfn data-export="" id=uppercase-letter>uppercase letter<a class=self-link href=#uppercase-letter></a></dfn>
18451845
<dd>
18461846
A <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0041 LATIN CAPITAL LETTER A (A) and U+005A LATIN CAPITAL LETTER Z (Z).
18471847

1848-
<dt><dfn data-dfn-type=dfn data-noexport="" id=lowercase-letter>lowercase letter<a class=self-link href=#lowercase-letter></a></dfn>
1848+
<dt><dfn data-dfn-type=dfn data-export="" id=lowercase-letter>lowercase letter<a class=self-link href=#lowercase-letter></a></dfn>
18491849
<dd>
18501850
A <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0061 LATIN SMALL LETTER A (a) and U+007A LATIN SMALL LETTER Z (z).
18511851

1852-
<dt><dfn data-dfn-type=dfn data-noexport="" id=letter>letter<a class=self-link href=#letter></a></dfn>
1852+
<dt><dfn data-dfn-type=dfn data-export="" id=letter>letter<a class=self-link href=#letter></a></dfn>
18531853
<dd>
18541854
An <a data-link-type=dfn href=#uppercase-letter title="uppercase letter">uppercase letter</a>
18551855
or a <a data-link-type=dfn href=#lowercase-letter title="lowercase letter">lowercase letter</a>.
18561856

1857-
<dt><dfn data-dfn-type=dfn data-noexport="" id=non-ascii-code-point>non-ASCII code point<a class=self-link href=#non-ascii-code-point></a></dfn>
1857+
<dt><dfn data-dfn-type=dfn data-export="" id=non-ascii-code-point>non-ASCII code point<a class=self-link href=#non-ascii-code-point></a></dfn>
18581858
<dd>
18591859
A <a data-link-type=dfn href=#code-point title="code point">code point</a> with a value equal to or greater than U+0080 &lt;control&gt;.
18601860

1861-
<dt><dfn data-dfn-type=dfn data-noexport="" id=name-start-code-point>name-start code point<a class=self-link href=#name-start-code-point></a></dfn>
1861+
<dt><dfn data-dfn-type=dfn data-export="" id=name-start-code-point>name-start code point<a class=self-link href=#name-start-code-point></a></dfn>
18621862
<dd>
18631863
A <a data-link-type=dfn href=#letter title=letter>letter</a>,
18641864
a <a data-link-type=dfn href=#non-ascii-code-point title="non-ascii code point">non-ASCII code point</a>,
18651865
or U+005F LOW LINE (_).
18661866

1867-
<dt><dfn data-dfn-type=dfn data-noexport="" id=name-code-point>name code point<a class=self-link href=#name-code-point></a></dfn>
1867+
<dt><dfn data-dfn-type=dfn data-export="" id=name-code-point>name code point<a class=self-link href=#name-code-point></a></dfn>
18681868
<dd>
18691869
A <a data-link-type=dfn href=#name-start-code-point title="name-start code point">name-start code point</a>,
18701870
A <a data-link-type=dfn href=#digit title=digit>digit</a>,
18711871
or U+002D HYPHEN-MINUS (-).
18721872

1873-
<dt><dfn data-dfn-type=dfn data-noexport="" id=non-printable-code-point>non-printable code point<a class=self-link href=#non-printable-code-point></a></dfn>
1873+
<dt><dfn data-dfn-type=dfn data-export="" id=non-printable-code-point>non-printable code point<a class=self-link href=#non-printable-code-point></a></dfn>
18741874
<dd>
18751875
A <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+0000 NULL and U+0008 BACKSPACE,
18761876
or U+000B LINE TABULATION,
18771877
or a <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+000E SHIFT OUT and U+001F INFORMATION SEPARATOR ONE,
18781878
or U+007F DELETE.
18791879

1880-
<dt><dfn data-dfn-type=dfn data-noexport="" id=newline>newline<a class=self-link href=#newline></a></dfn>
1880+
<dt><dfn data-dfn-type=dfn data-export="" id=newline>newline<a class=self-link href=#newline></a></dfn>
18811881
<dd>
18821882
U+000A LINE FEED.
18831883
<span class=note>
18841884
Note that U+000D CARRIAGE RETURN and U+000C FORM FEED are not included in this definition,
18851885
as they are converted to U+000A LINE FEED during <a href=#input-preprocessing>preprocessing</a>.
18861886
</span>
18871887

1888-
<dt><dfn data-dfn-type=dfn data-noexport="" id=whitespace>whitespace<a class=self-link href=#whitespace></a></dfn>
1888+
<dt><dfn data-dfn-type=dfn data-export="" id=whitespace>whitespace<a class=self-link href=#whitespace></a></dfn>
18891889
<dd>A <a data-link-type=dfn href=#newline title=newline>newline</a>, U+0009 CHARACTER TABULATION, or U+0020 SPACE.
18901890

1891-
<dt><dfn data-dfn-type=dfn data-noexport="" id=surrogate-code-point>surrogate code point<a class=self-link href=#surrogate-code-point></a></dfn>
1891+
<dt><dfn data-dfn-type=dfn data-export="" id=surrogate-code-point>surrogate code point<a class=self-link href=#surrogate-code-point></a></dfn>
18921892
<dd>
18931893
A <a data-link-type=dfn href=#code-point title="code point">code point</a> between U+D800 and U+DFFF inclusive.
18941894

1895-
<dt><dfn data-dfn-type=dfn data-noexport="" id=maximum-allowed-code-point>maximum allowed code point<a class=self-link href=#maximum-allowed-code-point></a></dfn>
1895+
<dt><dfn data-dfn-type=dfn data-export="" id=maximum-allowed-code-point>maximum allowed code point<a class=self-link href=#maximum-allowed-code-point></a></dfn>
18961896
<dd>The greatest <a data-link-type=dfn href=#code-point title="code point">code point</a> defined by Unicode: U+10FFFF.
18971897

1898-
<dt><dfn data-dfn-type=dfn data-noexport="" id=identifier>identifier<a class=self-link href=#identifier></a></dfn>
1898+
<dt><dfn data-dfn-type=dfn data-export="" id=identifier>identifier<a class=self-link href=#identifier></a></dfn>
18991899
<dd>
19001900
A portion of the CSS source that has the same syntax as an <a class="production css-code" data-link-type=type href=#typedef-ident-token title="<ident-token>">&lt;ident-token&gt;</a>.
19011901
Also appears in <a class="production css-code" data-link-type=type href=#typedef-at-keyword-token title="<at-keyword-token>">&lt;at-keyword-token&gt;</a>,
@@ -4977,7 +4977,7 @@ <h3 class="no-num no-ref heading settled heading" id=normative><span class=conte
49774977

49784978
<h3 class="no-num no-ref heading settled heading" id=informative><span class=content>
49794979
Informative References</span><a class=self-link href=#informative></a></h3>
4980-
<div data-fill-with=informative-references><dl><dt id=css-variables title=CSS-VARIABLES><a class=self-link href=#css-variables></a>[CSS-VARIABLES]<dd>Tab Atkins Jr.. <a href=http://www.w3.org/TR/2013/WD-css-variables-1-20130620/>CSS Custom Properties for Cascading Variables Module Level 1</a>. 20 June 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css-variables-1-20130620/>http://www.w3.org/TR/2013/WD-css-variables-1-20130620/</a><dt id=css3-animations title=CSS3-ANIMATIONS><a class=self-link href=#css3-animations></a>[CSS3-ANIMATIONS]<dd>Dean Jackson; et al. <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>CSS Animations</a>. 19 February 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>http://www.w3.org/TR/2013/WD-css3-animations-20130219/</a><dt id=css3-conditional title=CSS3-CONDITIONAL><a class=self-link href=#css3-conditional></a>[CSS3-CONDITIONAL]<dd>L. David Baron. <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>CSS Conditional Rules Module Level 3</a>. 4 April 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a><dt id=cssom title=CSSOM><a class=self-link href=#cssom></a>[CSSOM]<dd>Anne van Kesteren. <a href=http://www.w3.org/TR/2011/WD-cssom-20110712/>CSSOM</a>. 12 July 2011. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2011/WD-cssom-20110712/>http://www.w3.org/TR/2011/WD-cssom-20110712/</a><dt id=mediaq title=MEDIAQ><a class=self-link href=#mediaq></a>[MEDIAQ]<dd>Florian Rivoal. <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>Media Queries</a>. 19 June 2012. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/</a></dl></div>
4980+
<div data-fill-with=informative-references><dl><dt id=css-variables title=CSS-VARIABLES><a class=self-link href=#css-variables></a>[CSS-VARIABLES]<dd>Tab Atkins Jr.; Luke Macpherson; Daniel Glazman. <a href=http://www.w3.org/TR/2013/WD-css-variables-20130620/>CSS Custom Properties for Cascading Variables Module Level 1</a>. 20 June 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css-variables-20130620/>http://www.w3.org/TR/2013/WD-css-variables-20130620/</a><dt id=css3-animations title=CSS3-ANIMATIONS><a class=self-link href=#css3-animations></a>[CSS3-ANIMATIONS]<dd>Dean Jackson; et al. <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>CSS Animations</a>. 19 February 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>http://www.w3.org/TR/2013/WD-css3-animations-20130219/</a><dt id=css3-conditional title=CSS3-CONDITIONAL><a class=self-link href=#css3-conditional></a>[CSS3-CONDITIONAL]<dd>L. David Baron. <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>CSS Conditional Rules Module Level 3</a>. 4 April 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a><dt id=cssom title=CSSOM><a class=self-link href=#cssom></a>[CSSOM]<dd>Anne van Kesteren. <a href=http://www.w3.org/TR/2011/WD-cssom-20110712/>CSSOM</a>. 12 July 2011. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2011/WD-cssom-20110712/>http://www.w3.org/TR/2011/WD-cssom-20110712/</a><dt id=mediaq title=MEDIAQ><a class=self-link href=#mediaq></a>[MEDIAQ]<dd>Florian Rivoal. <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>Media Queries</a>. 19 June 2012. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/</a></dl></div>
49814981

49824982
<h2 class="no-num no-ref heading settled heading" id=index><span class=content>
49834983
Index</span><a class=self-link href=#index></a></h2>

css-syntax/Overview.src.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ <h3 id="tokenizer-definitions">
771771

772772
This section defines several terms used during the tokenization phase.
773773

774-
<dl>
774+
<dl export>
775775
<dt><dfn>code point</dfn>
776776
<dd>
777777
A <a href="http://unicode.org/glossary/#code_point">Unicode code point</a>.

0 commit comments

Comments
 (0)