E5A3 [css2] Generated. Do not edit! · w3c/csswg-drafts@a216b7b · GitHub
Skip to content

Commit a216b7b

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402981
1 parent 32ea563 commit a216b7b

15 files changed

Lines changed: 387 additions & 372 deletions

css2/box.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
415415
been if the element had a non-zero bottom border.</li></ul>
416416

417417
<p>An element that has had <a
418-
href="visuren.html#clearance">clearance</a> applied to it never
418+
href="visuren.html#clearance">clearance</a> never
419419
collapses its top margin with its parent block's bottom margin.</p>
420420

421421
<p>Note that the positions of elements that have been collapsed
@@ -452,8 +452,8 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
452452
and it does not contain a line box, and all of its in-flow children's
453453
margins (if any) are adjoining.</p>
454454

455-
<p>When an element's own margins collapse, and that element has had
456-
clearance applied to it, its top margin collapses with the adjoining
455+
<p>When an element's own margins collapse, and that element has
456+
clearance, its top margin collapses with the adjoining
457457
margins of subsequent siblings but that resulting margin does not
458458
collapse with the bottom margin of the parent block.</p>
459459

css2/diffs-rec/box.html

Lines changed: 3 additions & 3 deletions
< 935E td data-grid-cell-id="diff-285a1881e544d54c4da5c847a5845c266b3166377c489092aac954e4bcf2257d-454-454-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">454
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
415415
been if the element had a non-zero bottom border.</ins></li></ul>
416416

417417
<p><ins>An element that has had</ins> <a
418-
href="visuren.html#clearance"><ins>clearance</ins></a> <ins>applied to it never
418+
href="visuren.html#clearance"><ins>clearance</ins></a> <ins>never
419419
collapses its top margin with its parent block's bottom margin.</ins></p>
420420

421421
<p><ins>Note that the positions of elements that have been collapsed
@@ -452,8 +452,8 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
452452
and it does not contain a line box, and all of its in-flow children's
453453
margins (if any) are adjoining.</ins></p>
454

455-
<p><ins>When an element's own margins collapse, and that element has had
456-
clearance applied to it, its top margin collapses with the adjoining
455+
<p><ins>When an element's own margins collapse, and that element has
456+
clearance, its top margin collapses with the adjoining
457457
margins of subsequent siblings but that resulting margin does not
458458
collapse with the bottom margin of the parent block.</ins></p>
459459

css2/diffs-rec/refs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ <H2> <del>E.2</del><ins>B.2</ins> <a name="informative">Informative references</
188188

189189
<dt><strong><a name="ref-CSS3SEL"
190190
class="informref"><ins>[CSS3SEL]</ins></a></strong> <dd><ins>"Selectors", D. Glazman,
191-
T. ?lik, I. Hickson, 13 November 2001</ins><br>
191+
T. &Ccedil;elik, I. Hickson, 13 November 2001</ins><br>
192192
<ins>Available at</ins> <a href="http://www.w3.org/TR/2001/CR-css3-selectors-20011113/">
193193
<ins>http://www.w3.org/TR/2001/CR-css3-selectors-20011113</ins></a>
194194

@@ -201,7 +201,7 @@ <H2> <del>E.2</del><ins>B.2</ins> <a name="informative">Informative references</
201201

202202
<dt><strong><a name="ref-DOM-LEVEL-3-CORE"
203203
class="informref"><ins>[DOM-LEVEL-3-CORE]</ins></a></strong> <dd><ins>"Document Object
204-
Model (DOM) Level 3 Core Specification",</ins> A. <del>Mutz, 9 March, 1997.</del><ins>Le Hors, P. Le H~ret, et
204+
Model (DOM) Level 3 Core Specification",</ins> A. <del>Mutz, 9 March, 1997.</del><ins>Le Hors, P. Le H&eacute;garet, et
205205
al. (eds.), 7 April 2004, W3C Recommendation.</ins> Available at <a
206206
href="http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/">
207207
<del>http://gewis.win.tue.nl/~koen/conneg/draft-ietf-http-negotiation-01.html. [OPENTYPE] See http://www.microsoft.com/OpenType/OTSpec/tablist.htm . [PANOSE] For information about PANOSE classification metrics, consult http://www.fonts.com/hp/panose/greybook and the following chapters: Latin Text , Latin Script , Latin Decorative , and Latin Pictorial . Panose numbers for some fonts are available online and may be queried . [PANOSE2] See http://www.w3.org/Fonts/Panose/pan2.html Panose-2 is not limited to Latin typefaces</del><ins>http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/</ins></a>.
@@ -214,7 +214,7 @@ <H2> <del>E.2</del><ins>B.2</ins> <a name="informative">Informative references</
214214
<ins>http://www.w3.org/TR/2001/REC-MathML2-20010221</ins></a>
215215

216216
<dt><strong><a name="ref-MEDIAQ" class="informref"><ins>[MEDIAQ]</ins></a></strong>
217-
<dd><ins>"Media Queries", Håkon Wium Lie, Tantek Çelik, Daniel Glazman,
217+
<dd><ins>"Media Queries", H&aring;kon Wium Lie, Tantek &Ccedil;elik, Daniel Glazman,
218218
Anne van Kesteren, 23 April 2009</ins><br>
219219
<ins>(Work</ins> in <del>WWW: A Unifying Syntax</del><ins>progress.) Available at</ins> <a
220220
href="http://www.w3.org/TR/2009/CR-css3-mediaqueries-20090423/">

css2/diffs-rec/syndata.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ <h3>4.1.8 <a name="declaration">Declarations</a> and <a
598598
</p>
599599
<p>A user agent must <span class="index-inst" title="ignore"><a name="x22"
600600
href="#ignore">ignore</a></span> a declaration with an invalid property
601-
name or an invalid value. Every <del>CSS2</del><ins>CSS&nbsp;2.1</ins> property has its own syntactic
601+
name or an invalid value. Every <del>CSS2</del><ins>CSS</ins> property has its own syntactic
602602
and semantic restrictions on the values it accepts.
603603
</p>
604604
<div class="illegal-example"><P style="display:none">Illegal example(s):</P><p>
@@ -714,7 +714,7 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
714714
p { color:red; color; color:green } /* same with expected recovery */
715715
p</ins> { <ins>color:green;</ins> color: <del>red</del>} <ins>/* malformed declaration missing value */
716716
p { color:red; color:; color:green</ins> } <del>H1</del><ins>/* same with expected recovery */
717-
p</ins> { <del>color: blue</del><ins>color:green; color{;color:maroon}</ins> } <del>The '@three-dee' at-rule is not part of CSS2. Therefore, the whole at-rule (up to, and including, the third right curly brace)</del><ins>/* unexpected tokens { } */
717+
p</ins> { <del>color: blue</del><ins>color:green; color{;color:maroon}</ins> } <del>The '@three-dee' at-rule is not part of CSS2. Therefore, the whole at-rule (up to, and including, the third right curly</del><ins>/* unexpected tokens { } */
718718
p { color:red; color{;color:maroon}; color:green } /* same with recovery */</ins>
719719
</code></pre>
720720

@@ -759,7 +759,7 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
759759
</code></pre>
760760

761761
<p> <ins>The '@three-dee' at-rule is not part of CSS&nbsp;2.1. Therefore, the whole
762-
at-rule (up to, and including, the third right curly brace)</ins> is <span
762+
at-rule (up to, and including, the third right curly</ins> brace) is <span
763763
class="index-inst" title="ignore"><a name="x29" href="#ignore">ignored.</a></span> A
764764
<del>CSS2</del><ins>CSS&nbsp;2.1</ins> user agent <span class="index-inst" title="ignore"><a name="x30"
765765
href="#ignore">ignores</a></span> it, effectively reducing the style sheet
@@ -769,7 +769,7 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
769769
h1 { color: blue }
770770
</code></pre>
771771

772-
<p> <del>4.3 Values 4.3.1 Integers and real numbers Some value types may have integer values (denoted by &lt;integer&gt; ) or real number values (denoted by &lt;number&gt; ). Real numbers and integers are specified in decimal notation only. An &lt;integer&gt; consists of one or more digits "0" to "9". A &lt;number&gt; can either be</del><ins>Something inside</ins> an <del>&lt;integer&gt;, or</del><ins>at-rule that is ignored because</ins> it <del>can be zero or more digits followed by a dot (.) followed by one or more digits. Both integers and real numbers</del><ins>is invalid,
772+
<p> <del>4.3 Values 4.3.1 Integers and real numbers Some value types may have integer values (denoted by &lt;integer&gt; ) or real number values (denoted by &lt;number&gt; ). Real numbers and integers are specified in decimal notation only. An &lt;integer&gt; consists of one or more digits "0" to "9". A &lt;number&gt; can either be</del><ins>Something inside</ins> an <del>&lt;integer&gt;, or</del><ins>at-rule that is ignored because</ins> it <del>can be zero or more digits followed by a dot (.) followed by one or more digits. Both integers and real numbers may</del><ins>is invalid,
773773
such as an invalid declaration within an @media-rule, does not make
774774
the entire at-rule invalid.</ins>
775775
</p>
@@ -842,8 +842,8 @@ <h3><ins>4.3.1</ins> <a name="numbers"><ins>Integers and real numbers</ins></a><
842842
integers are specified in decimal notation only. An &lt;integer&gt;
843843
consists of one or more digits "0" to "9". A &lt;number&gt; can either
844844
be an &lt;integer&gt;, or it can be zero or more digits followed by a
845-
dot (.) followed by one or more digits. Both integers and real numbers</ins>
846-
may be preceded by a "-" or "+" to indicate the sign.
845+
dot (.) followed by one or more digits. Both integers and real numbers
846+
may</ins> be preceded by a "-" or "+" to indicate the sign.
847847
<ins>-0 is equivalent to 0 and is not a negative number.</ins></p>
848848

849849
<p>Note that many properties that allow an integer or real number as a
@@ -907,12 +907,12 @@ <h3>4.3.2 <a name="length-units">Lengths</a></h3>
907907
<p>The <span class="index-def" title="x-height|ex (unit)"><a
908908
name="ex">'ex'</a></span> unit is defined by the <del>font's 'x-height' .</del><ins>element's first available
909909
font.</ins>
910-
The <del>x-height is so called because it</del><ins>exception</ins> is <del>often equal to the</del><ins>when 'ex' occurs in the value of the</ins> <a href="fonts.html#propdef-font-size" class="noxref"><span
910+
The <del>x-height is so called because it</del><ins>exception</ins> is <del>often equal to</del><ins>when 'ex' occurs in the value of the</ins> <a href="fonts.html#propdef-font-size" class="noxref"><span
911911
class="propinst-font-size"><ins>'font-size'</ins></span></a> <ins>property, in which case
912912
it refers to the 'ex' of the parent element.</ins>
913913

914914
<p><ins>The</ins> <span class="descinst-x-height"><ins>'x-height'</ins></span> <ins>is so called
915-
because it is often equal to the</ins> height of the lowercase "x". However,
915+
because it is often equal to</ins> the height of the lowercase "x". However,
916916
an 'ex' is defined even for fonts that <del>don't</del><ins>do not</ins> contain an "x".</p>
917917
<p><ins>The x-height of a font can be found in different ways. Some fonts
918918
contain reliable metrics for the x-height. If reliable font metrics are
@@ -1100,7 +1100,7 @@ <h3>4.3.4 <a name="uri"> <del>URL + URN = URI</del>URLs <del>(Uniform Resource
11001100

11011101
<p>
11021102
<ins>Some characters appearing in an unquoted URI, such as</ins> parentheses,
1103-
commas, <del>whitespace</del><ins>white space</ins> characters, single quotes (') and double quotes
1103+
<del>commas, whitespace</del><ins>white space</ins> characters, single quotes (') and double quotes
11041104
<del>(") appearing in a URI</del><ins>("),</ins> must be escaped with a <del>backslash:</del><ins>backslash so that the resulting URI value
11051105
is a URI token:</ins> '\(', '\)', '\,'.
11061106
</p>
@@ -1153,8 +1153,8 @@ <h3>4.3.5 <a name="counter">Counters</a></h3>
11531153
properties). To refer to the value of a counter, the notation
11541154
<a name="x46"><span class="index-def" title="counter()">
11551155
'counter(&lt;identifier&gt;)'</span></a> or 'counter(&lt;identifier&gt;,
1156-
<del>&lt;list-style-type&gt;)' is used. The default</del><ins>&lt;'list-style-type'&gt;)', with optional white space separating the tokens,
1157-
is used. The default</ins> style is 'decimal'.
1156+
<del>&lt;list-style-type&gt;)' is used. The default style</del><ins>&lt;'list-style-type'&gt;)', with optional white space separating the tokens,
1157+
is used. The default style</ins> is 'decimal'.
11581158
</p>
11591159
<p>To refer to a sequence of nested counters of the same name, the
11601160
notation is 'counters(&lt;identifier&gt;, &lt;string&gt;)' or

0 commit comments

Comments
 (0)