Skip to content

Commit 45394a8

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403296
1 parent 22f7d0b commit 45394a8

11 files changed

Lines changed: 270 additions & 105 deletions

File tree

css2/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Makefile to generate the CSS2 document based on its "source files"
22
# Arnaud Le Hors - lehors@w3.org
3-
# $Id: Makefile,v 2.121 2013-05-02 10:07:29 bbos Exp $
3+
# $Id: Makefile,v 2.122 2013-07-18 08:21:21 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -376,7 +376,8 @@ errata.html : errata.src
376376

377377
extras: css2.tgz
378378

379-
%.pdf: %.html style/default.css; prince -o $@ $<
379+
# The sources are in ISO-8859-1, make them ASCII to avoid encoding problems
380+
%.pdf: %.html style/default.css; asc2xml < $< | xml2asc | prince -o $@ -
380381
%.ps: %.pdf; $(PDF2PS) $< $@
381382

382383
css2.pdf: $(SPECOBJS:.html=.pdf)

css2/changes.html

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8810,7 +8810,7 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
88108810

88118811

88128812

8813-
<li id=s.15.3b class=change>
8813+
<li id=s.15.3b class=clarification>
88148814
<p><span class=updated>[2013-07-15]</span> In <a
88158815
href="fonts.html#font-family-prop" >15.3 Font family: the
88168816
'font-family' property</a> the grammar is missing a pair of brackets:
@@ -8827,7 +8827,7 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
88278827

88288828

88298829
<li id=s.G.1a class=change>
8830-
<p><span class=updated>[2012-05-02]</span> Spaces and comments are
8830+
<p><span class=updated>[2013-07-15]</span> Spaces and comments are
88318831
not allowed between the sign and the digits of a &lt;number&gt;,
88328832
&lt;length&gt; or &lt;percentage&gt;. In <a
88338833
href="grammar.html#scanner" >&ldquo;G.2 Lexical
@@ -8864,6 +8864,47 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
88648864

88658865

88668866

8867+
<li id=s.10.5a class=change>
8868+
<p><span class=updated>[2013-07-18]</span> A percentage on
8869+
'height', even if not used, can be inherited. In <a
8870+
href="visudet.html#the-height-property" >&ldquo;10.5 Content
8871+
height: the 'height' property,&rdquo;</a> change the “computed
8872+
value” line as follows:
8873+
8874+
<blockquote>
8875+
<table>
8876+
<tr>
8877+
<td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;
8878+
8879+
<td>the percentage or 'auto' <del>(see prose under <a
8880+
href="syndata.html#value-def-percentage" class="noxref"><a href="syndata.html#value-def-percentage" class="noxref"><span
8881+
class="value-inst-percentage">&lt;percentage&gt;</span></a></a>)</del>
8882+
<ins>(as specified)</ins>
8883+
</table>
8884+
</blockquote>
8885+
8886+
<p>and in the definition of &lt;percentage&gt;:
8887+
8888+
<blockquote>
8889+
<dl>
8890+
<dt><strong>&lt;percentage&gt;</strong>
8891+
8892+
<dd>Specifies a percentage height. The percentage is calculated
8893+
with respect to the height of the generated box's <a
8894+
href="visuren.html#containing-block">containing block</a>. If
8895+
the height of the containing block is not specified explicitly
8896+
(i.e., it depends on content height), and this element is not
8897+
absolutely positioned, <del>the value computes to 'auto'</del>
8898+
<ins>the used height is calculated as if 'auto' was
8899+
specified</ins>.
8900+
</dl>
8901+
</blockquote>
8902+
8903+
8904+
8905+
8906+
8907+
88678908

88688909

88698910

css2/css2.html

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8439,7 +8439,7 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
84398439
<h2>9.4 <a name="normal-flow">Normal flow</a></h2>
84408440

84418441
<p>Boxes in the normal flow belong to a <a name="x32"><span class="index-def"
8442-
title="formatting context">formatting context</span></a>, which in CSS 2.1
8442+
title="formatting context">formatting context</span></a>, which in CSS&nbsp;2.1
84438443
may be table, block or inline. In future levels of CSS, other types of
84448444
formatting context will be introduced. <a
84458445
href="#block-level">Block-level</a> boxes participate in a <a
@@ -11084,7 +11084,7 @@ <h2>10.5 <a name="the-height-property">Content height</a>: the <a href="visudet.
1108411084
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
1108511085
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>see prose
1108611086
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
11087-
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>the percentage or 'auto' (see prose under <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a>) or the absolute length
11087+
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>the percentage or 'auto' (as specified) or the absolute length
1108811088
</table>
1108911089
</dl>
1109011090
</div>
@@ -28675,7 +28675,7 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
2867528675

2867628676

2867728677

28678-
<li id=s.15.3b class=change>
28678+
<li id=s.15.3b class=clarification>
2867928679
<p><span class=updated>[2013-07-15]</span> In <a
2868028680
href="fonts.html#font-family-prop" >15.3 Font family: the
2868128681
'font-family' property</a> the grammar is missing a pair of brackets:
@@ -28692,7 +28692,7 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
2869228692

2869328693

2869428694
<li id=s.G.1a class=change>
28695-
<p><span class=updated>[2012-05-02]</span> Spaces and comments are
28695+
<p><span class=updated>[2013-07-15]</span> Spaces and comments are
2869628696
not allowed between the sign and the digits of a &lt;number&gt;,
2869728697
&lt;length&gt; or &lt;percentage&gt;. In <a
2869828698
href="grammar.html#scanner" >&ldquo;G.2 Lexical
@@ -28729,6 +28729,47 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
2872928729

2873028730

2873128731

28732+
<li id=s.10.5a class=change>
28733+
<p><span class=updated>[2013-07-18]</span> A percentage on
28734+
'height', even if not used, can be inherited. In <a
28735+
href="visudet.html#the-height-property" >&ldquo;10.5 Content
28736+
height: the 'height' property,&rdquo;</a> change the “computed
28737+
value” line as follows:
28738+
28739+
<blockquote>
28740+
<table>
28741+
<tr>
28742+
<td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;
28743+
28744+
<td>the percentage or 'auto' <del>(see prose under <a
28745+
href="syndata.html#value-def-percentage" class="noxref"><a href="syndata.html#value-def-percentage" class="noxref"><span
28746+
class="value-inst-percentage">&lt;percentage&gt;</span></a></a>)</del>
28747+
<ins>(as specified)</ins>
28748+
</table>
28749+
</blockquote>
28750+
28751+
<p>and in the definition of &lt;percentage&gt;:
28752+
28753+
<blockquote>
28754+
<dl>
28755+
<dt><strong>&lt;percentage&gt;</strong>
28756+
28757+
<dd>Specifies a percentage height. The percentage is calculated
28758+
with respect to the height of the generated box's <a
28759+
href="visuren.html#containing-block">containing block</a>. If
28760+
the height of the containing block is not specified explicitly
28761+
(i.e., it depends on content height), and this element is not
28762+
absolutely positioned, <del>the value computes to 'auto'</del>
28763+
<ins>the used height is calculated as if 'auto' was
28764+
specified</ins>.
28765+
</dl>
28766+
</blockquote>
28767+
28768+
28769+
28770+
28771+
28772+
2873228773

2873328774

2873428775

0 commit comments

Comments
 (0)