[css2] Generated. Do not edit!

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403120

Author: bert-github

css2/aural.html

@@ -545,7 +545,7 @@ <H2>A.6 <a name="cue-props">Cue properties</a>: <a href="aural.html#propdef-cue-
 <P>Please see the sections on <a
 href="generate.html#before-after-content"> the :before and :after
 pseudo-elements</a> for information on other content generation
-techniques. 'cue-before' sounds and 'pause-before' gaps are inserted
+techniques. 'Cue-before' sounds and 'pause-before' gaps are inserted
 before content from the ':before' pseudo-element. Similarly,
 'pause-after' gaps and 'cue-after' sounds are inserted after content
 from the ':after' pseudo-element.

css2/changes.html

@@ -536,6 +536,11 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
     <li class="tocline2"><a href="changes.html#q494" class="tocxref">C.8 Changes since the working draft of 7 December 2010</a>
     <ul class="toc">
       <li class="tocline3"><a href="changes.html#q495" class="tocxref">C.8.1 8.3.1 Collapsing margins</a>
+      <li class="tocline3"><a href="changes.html#q496" class="tocxref">C.8.2 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q497" class="tocxref">C.8.3 10.3 Calculating widths and margins</a>
+      <li class="tocline3"><a href="changes.html#q498" class="tocxref">C.8.4 14.3 Gamma correction</a>
+      <li class="tocline3"><a href="changes.html#q499" class="tocxref">C.8.5 11.1.2 Clipping: the 'clip' property</a>
+      <li class="tocline3"><a href="changes.html#q500" class="tocxref">C.8.6 9.4.2 Inline formatting contexts</a>
     </ul>
   </ul>
 </div>
@@ -1357,7 +1362,7 @@ <h3 id="c11.1.1"><a name="q87">C.2.80 </a><a href="visufx.html#overflow">Section
 Overflow</a></h3>
 
 <p>'projection' media are no longer permitted to print overflowing
-content for 'overflow: scroll'. 'print' media now <em>may</em>, as
+content for 'overflow: scroll'. 'Print' media now <em>may</em>, as
 opposed to <em>should</em>.</p>
 
 <p>UAs are now required to apply the 'overflow' property set on the root
@@ -4068,7 +4073,7 @@ <h3 id="s.12.5.1a"><a name="q345">C.5.58 </a><a
 <blockquote><p><ins>&hellip; but does require that for list items whose
 'direction' property is 'ltr' the marker box be on the left side of
 the content and for elements whose 'direction' property is 'rtl' the
-marker box be on the right side of the content. 'overflow' on the
+marker box be on the right side of the content. 'Overflow' on the
 element does not clip the marker box. The marker box is fixed with
 respect to the principal block box's border and does not scroll with
 the principal block box's content. The size or contents of the marker
@@ -6961,6 +6966,74 @@ <h3 id=u.8.3.1><a name="q495">C.8.1 </a><a
 shorter and clearer.
 
 
+
+<h3 id=u.10.8.1><a name="q496">C.8.2 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#leading">10.8.1 Leading
+and half-leading</a></h3>
+
+<p>The remark about equal line spacing is made more precise and put in
+green, to make it clearer that it is a note:
+
+<blockquote>
+<p class=note><em><del>Generally,</del>
+<ins><strong>Note.</strong></ins> when there is only one value of
+'line-height' for all inline boxes in a block container box <ins>and
+they are all in the same font</ins> (and <ins>there are</ins> no
+replaced elements, inline-block elements, etc.), the above will ensure
+that baselines of successive lines are exactly 'line-height'
+apart. This is important when columns of text in different fonts have
+to be aligned, for example in a table.</em>
+</blockquote>
+
+
+
+<h3 id=u.10.3><a name="q497">C.8.3 </a><a
+href="/TR/2010/WD-CSS2-20101207/visudet.html#Computing_widths_and_margins">10.3
+Calculating widths and margins</a></h3>
+
+<p>Added a note that the width calculation only yields a tentative
+value, still to be compared to 'min-width' and 'max-width'
+
+<blockquote>
+<p><p class=note><em><strong>Note.</strong> The used value of 'width'
+calculated below is a tentative value, and may have to be calculated
+multiple times, depending on 'min-width' and 'max-width', see the
+section Minimum and maximum widths below.</em>
+</blockquote>
+
+<p>A similar note is added to section&nbsp;10.6 about calculating
+heights.
+
+
+
+<h3 id=u.14.3><a name="q498">C.8.4 </a><a
+href="/TR/2010/WD-CSS2-20101207/colors.html#gamma-correction">14.3
+Gamma correction</a></h3>
+
+<p>The section on gamma correction was removed. It existed only to
+help implementations on certain operating systems of the 1990s.
+
+
+
+<h3 id=u.11.1.2><a name="q499">C.8.5 </a><a
+href="/TR/2010/WD-CSS2-20101207/visufx.html#clipping">11.1.2 Clipping:
+the 'clip' property</a></h3>
+
+<p>The 2nd and 4th offsets of the clip rectangle are offsets from the
+left edge of the element. The 'direction' property no longer has an
+influence.
+
+
+
+<h3 id=u.9.4.2><a name="q500">C.8.6 </a><a
+href="/TR/2010/WD-CSS2-20101207/visuren.html#inline-formatting">9.4.2
+Inline formatting contexts</a></h3>
+
+<p>The words "line feed" were a typing error. The intended words are
+"forced line break."
+
+
+
 <hr class="navbar">
 
 <div class="navbar">

css2/colors.html

@@ -40,7 +40,6 @@ <h1><a name="q0">14 Colors and Backgrounds</a></h1>
     <ul class="toc">
       <li class="tocline3"><a href="colors.html#background-properties" class="tocxref">14.2.1 Background properties: <span class="propinst-background-color">'background-color'</span>, <span class="propinst-background-image">'background-image'</span>, <span class="propinst-background-repeat">'background-repeat'</span>, <span class="propinst-background-attachment">'background-attachment'</span>, <span class="propinst-background-position">'background-position'</span>, and <span class="propinst-background">'background'</span></a>
     </ul>
-    <li class="tocline2"><a href="colors.html#gamma-correction" class="tocxref">14.3 Gamma correction</a>
   </ul>
 </div>
 
@@ -532,57 +531,6 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
 </pre>
 </div>
 
-<h2>14.3 <a name="gamma-correction">Gamma correction</a></h2>
-
-<p><em>For information about gamma issues, please consult the 
-Gamma Tutorial in the PNG specification (<a href="refs.html#ref-PNG" rel="biblioentry" class="noxref"><span class="normref">[PNG]</span></a>).</em></p>
-
-
-<div class="note"><p>
-<em><strong>Note.</strong>
-In the computation of gamma correction, UAs displaying on a CRT
-may assume an ideal CRT and ignore any effects on apparent gamma
-caused by dithering. That means the minimal handling they need to do
-on current platforms is:
-</em>
-</p>
-  <dl>
-    <dt> PC using MS-Windows</dt>
-    <dd> none</dd>
-    <dt> Unix using X11</dt>
-    <dd> none</dd>
-    <dt> Mac using QuickDraw</dt>
-    <dd> apply gamma 1.45 <a href="refs.html#ref-ICC42" rel="biblioentry" class="noxref"><span class="normref">[ICC42]</span></a> (ColorSync-savvy applications
-      may simply pass the sRGB ICC profile to ColorSync
-      to perform correct color correction)</dd>
-    <dt> SGI using X</dt>
-    <dd> apply the gamma value from
-    <tt>/etc/config/system.glGammaVal</tt> (the default value being
-    1.70; applications running on Irix 6.2 or above may simply pass
-    the sRGB ICC profile to the color management system)</dd>
-    <dt> NeXT using NeXTStep</dt>
-    <dd> apply gamma 2.22</dd>
-  </dl>
-
-<p>"Applying gamma" means that each of the three R, G and B must be
-converted to R'=R<sup>gamma</sup>, G'=G<sup>gamma</sup>,
-B'=B<sup>gamma</sup>, before being handed to the OS.
-</p>
-<p>This may be done rapidly by building a 256-element lookup table
-once per browser invocation thus:
-</p>
-<pre>
-for i := 0 to 255 do
-  raw := i / 255.0;
-  corr := pow (raw, gamma);
-  table[i] := trunc (0.5 + corr * 255.0)
-end
-</pre>
-
-<p>which then avoids any need to do transcendental math per color
-attribute, far less per pixel.
-</p>
-</div>
 <hr class="navbar">
 
 <div class="navbar">

css2/cover.html

@@ -637,7 +637,6 @@ <h2><a name="toc">Full Table of Contents</a></h2>
     <ul class="toc">
       <li class="tocline3"><a href="colors.html#background-properties" class="tocxref">14.2.1 Background properties: <span class="propinst-background-color">'background-color'</span>, <span class="propinst-background-image">'background-image'</span>, <span class="propinst-background-repeat">'background-repeat'</span>, <span class="propinst-background-attachment">'background-attachment'</span>, <span class="propinst-background-position">'background-position'</span>, and <span class="propinst-background">'background'</span></a>
     </ul>
-    <li class="tocline2"><a href="colors.html#gamma-correction" class="tocxref">14.3 Gamma correction</a>
   </ul>
   <li class="tocline1"><a href="fonts.html" class="tocxref">15 Fonts</a>
   <ul class="toc">
@@ -1266,6 +1265,11 @@ <h2><a name="toc">Full Table of Contents</a></h2>
     <li class="tocline2"><a href="changes.html#q494" class="tocxref">C.8 Changes since the working draft of 7 December 2010</a>
     <ul class="toc">
       <li class="tocline3"><a href="changes.html#q495" class="tocxref">C.8.1 8.3.1 Collapsing margins</a>
+      <li class="tocline3"><a href="changes.html#q496" class="tocxref">C.8.2 10.8.1 Leading and half-leading</a>
+      <li class="tocline3"><a href="changes.html#q497" class="tocxref">C.8.3 10.3 Calculating widths and margins</a>
+      <li class="tocline3"><a href="changes.html#q498" class="tocxref">C.8.4 14.3 Gamma correction</a>
+      <li class="tocline3"><a href="changes.html#q499" class="tocxref">C.8.5 11.1.2 Clipping: the 'clip' property</a>
+      <li class="tocline3"><a href="changes.html#q500" class="tocxref">C.8.6 9.4.2 Inline formatting contexts</a>
     </ul>
   </ul>
   <li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>