w3c
diff --git a/‎css2/css2.html‎
Lines changed: 62 additions & 53 deletions b/‎css2/css2.html‎
Lines changed: 62 additions & 53 deletions
@@ -8089,9 +8089,7 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to height of containing block
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:relative', see section
-  <a href="visuren.html#relative-positioning">Relative
-  Positioning.</a> For 'position:static', 'auto'. Otherwise: if
+<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:static', 'auto'. Otherwise: if
   specified as a length, the corresponding absolute length; if
   specified as a percentage, the specified value; otherwise, 'auto'.
 </table>
@@ -8119,9 +8117,7 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to width of containing block
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:relative', see section
-  <a href="visuren.html#relative-positioning">Relative
-  Positioning.</a> For 'position:static', 'auto'. Otherwise: if
+<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:static', 'auto'. Otherwise: if
   specified as a length, the corresponding absolute length; if
   specified as a percentage, the specified value; otherwise,
   'auto'.
@@ -8148,9 +8144,7 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to height of containing block
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:relative', see section
-  <a href="visuren.html#relative-positioning">Relative
-  Positioning.</a> For 'position:static', 'auto'. Otherwise: if
+<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:static', 'auto'. Otherwise: if
   specified as a length, the corresponding absolute length; if
   specified as a percentage, the specified value; otherwise, 'auto'.
 </table>
@@ -8176,9 +8170,7 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to width of containing block
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:relative', see section
-  <a href="visuren.html#relative-positioning">Relative
-  Positioning.</a> For 'position:static', 'auto'. Otherwise: if
+<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>for 'position:static', 'auto'. Otherwise: if
   specified as a length, the corresponding absolute length; if
   specified as a percentage, the specified value; otherwise,
   'auto'.
@@ -8451,16 +8443,16 @@ <h3>9.4.3 <a name="relative-positioning">Relative positioning</a></h3>
 box(es) horizontally, without changing their size. 'left' moves the
 boxes to the right, and 'right' moves them to the left. Since boxes
 are not split or stretched as a result of 'left' or 'right', the
-computed values are always: left = -right.
+used values are always: left = -right.
 </p>
 <p>If both 'left' and 'right' are 'auto' (their initial values), the
-computed values are '0' (i.e., the boxes stay in their original
+used values are '0' (i.e., the boxes stay in their original
 position).
 </p>
-<p>If 'left' is 'auto', its computed value is minus the value of 'right'
+<p>If 'left' is 'auto', its used value is minus the value of 'right'
 (i.e., the boxes move to the left by the value of 'right').
 </p>
-<p>If 'right' is specified as 'auto', its computed value is minus the
+<p>If 'right' is specified as 'auto', its used value is minus the
 value of 'left'.
 </p>
 <p>If neither 'left' nor 'right' is 'auto', the position is
@@ -8481,10 +8473,10 @@ <h3>9.4.3 <a name="relative-positioning">Relative positioning</a></h3>
 element(s) up or down without changing their size.  'top' moves the
 boxes down, and 'bottom' moves them up. Since boxes
 are not split or stretched as a result of 'top' or 'bottom', the
-computed values are always: top = -bottom.
-If both are 'auto', their computed values are both '0'. If one of them is
+used values are always: top = -bottom.
+If both are 'auto', their used values are both '0'. If one of them is
 'auto', it becomes the negative of the other. If neither is 'auto',
-'bottom' is ignored (i.e., the computed value of 'bottom' will be
+'bottom' is ignored (i.e., the used value of 'bottom' will be
 minus the value of 'top').
 </p>
 
@@ -9550,7 +9542,7 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
   <li>the in-flow, inline-level, non-positioned descendants, including
   inline tables and inline blocks.
 
-  <li>the stacking contexts with stack level 0, and the positioned
+  <li>the child stacking contexts with stack level 0, and the positioned
   descendants with 'z-index: auto'.
 
   <li>the child stacking contexts with positive stack levels (least
@@ -11378,11 +11370,12 @@ <h3>10.8.1 <a name="leading">Leading and half-leading</a></h3>
 is composed of <a href="visuren.html#inline-level">inline-level</a>
 elements, 'line-height' specifies the <em>minimal</em> height of line boxes
 within the element. The minimum height consists of a minimum height above
-the block's baseline and a minimum depth below it, exactly as if each
+the baseline and a minimum depth below it, exactly as if each
 line box starts with a <a name="strut">zero-width inline box with the
-block's font and line height properties (what T<sub>E</sub>X calls a
-"strut").</a>
+element's font and line height properties.</a> We call that imaginary
+box a "strut." (The name is inspired by TeX.).
 </p>
+
 <p>The height and depth of the font above and below the baseline are
 assumed to be metrics that are contained in the font. (For more
 details, see CSS level&nbsp;3.)
@@ -14422,7 +14415,7 @@ <h2>15.2 <a name="algorithm">Font matching algorithm</a></h2>
 <ol>
 
 <li>The User Agent makes (or accesses) a database of relevant CSS&nbsp;2.1
-properties of all the fonts of which the UA is aware. 
+properties of all the fonts of which the UA is aware.
 If there are two fonts with exactly the same properties, the user
 agent selects one of them.
 </li>
@@ -14471,7 +14464,7 @@ <h2>15.2 <a name="algorithm">Font matching algorithm</a></h2>
 font labeled as 'small-caps', (2) a font in which the small caps are
 synthesized, or (3) a font where all lowercase letters are replaced by
 upper case letters. A small-caps font may be synthesized by
-electronically scaling uppercase letters from a normal font. 
+electronically scaling uppercase letters from a normal font.
 'normal' matches a font's normal (non-small-caps) variant. A font cannot fail to have a normal variant. A font
  that is only available as small-caps shall be selectable as either a 'normal' face or a 'small-caps' face.
 </li>
@@ -14482,7 +14475,7 @@ <h2>15.2 <a name="algorithm">Font matching algorithm</a></h2>
 UA-dependent margin of tolerance. (Typically, sizes for scalable fonts
 are rounded to the nearest whole pixel, while the tolerance for
 bitmapped fonts could be as large as 20%.) Further computations, e.g.,
-by 'em' values in other properties, are based on 
+by 'em' values in other properties, are based on
 the computed value of 'font-size'.
 </li>
 
@@ -14558,23 +14551,39 @@ <h2>15.3 <a name="font-family-prop">Font family</a>: the <a href="fonts.html#pro
 </dd>
 </dl>
 
-<p>If an unquoted font family name contains 
-parentheses, brackets, and/or braces, they must still be  
-escaped per CSS grammar rules.  Similarly, quotation marks (both single and double), semicolons, 
-exclamation marks, commas, and leading slashes within unquoted font family names must be escaped. 
-Font names containing any such characters or white space should be quoted:
-</p>
+<p>Font family names must either be given quoted as <a
+href="syndata.html#strings">strings,</a> or unquoted as a sequence of
+one or more <a
+href="syndata.html#value-def-identifier">identifiers.</a> This means
+most punctuation characters and digits at the start of each token must
+be escaped in unquoted font family names.
+
+<p>For example, the following declarations are invalid:
+
+<pre>
+font-family: Red/Black, sans-serif;
+font-family: "Lucida" Grande, sans-serif;
+font-family: Ahem!, sans-serif;
+font-family: test@foo, sans-serif;
+font-family: #POUND, sans-serif;
+font-family: Hawaii 5-0, sans-serif;
+</pre>
+
+<p>If a sequence of identifiers is given as a font family name, the
+computed value is the name converted to a string by joining all the
+identifiers in the sequence by single spaces.
+
+<p>To avoid mistakes in escaping, it is recommended to quote font
+family names that contain white space, digits, or punctuation
+characters other than hyphens:
 
 <pre>
 body { font-family: "New Century Schoolbook", serif }
-  
-&lt;BODY STYLE="font-family: 'My own font', fantasy"&gt;
+
 &lt;BODY STYLE="font-family: '21st Century', fantasy">
 </pre>
 
-<p>If quoting is omitted, any white space characters before and after
-the font name are ignored and any sequence of white space characters
-inside the font name is converted to a single space.
-Font family <em>names</em> that happen to be the same as a keyword
+<p>Font family <em>names</em> that happen to be the same as a keyword
 value ('inherit', 'serif', 'sans-serif', 'monospace', 'fantasy', and
 'cursive') must be quoted to prevent confusion with the keywords with
 the same names. The keywords 'initial' and 'default' are reserved for
@@ -14811,7 +14820,7 @@ <h2>15.5 <a name="small-caps">Small-caps</a>: the
 replacement for a small-caps font.
 </p>
 <p>The following example results in an 'H3' element in small-caps,
-with any emphasized words in oblique, and any emphasized words within 
+with any emphasized words in oblique, and any emphasized words within
 an 'H3' oblique small-caps:
 </p>
 <pre>
@@ -14872,7 +14881,7 @@ <h2>15.6 <a name="font-boldness">Font boldness</a>: the
 values are names that are descriptive of the "weight" of a font. There
 is no accepted, universal meaning to these weight names. Their primary
 role is to distinguish faces of differing darkness within a single
-font family. Usage across font families is quite variant; for example, 
+font family. Usage across font families is quite variant; for example,
 a font that one might think of as being bold might be described as
 being <em>Regular, Roman, Book, Medium, Semi-</em> or <em>DemiBold,
 Bold,</em> or <em>Black,</em> depending on how black the "normal" face
@@ -15030,8 +15039,8 @@ <h2>15.7 <a name="font-size-props">Font size</a>: the <a href="fonts.html#propde
 <dd>An &lt;absolute-size&gt; keyword is an index to a table of font
 sizes computed and kept by the UA. Possible values are:
 <p> [ xx-small | x-small | small | medium | large | x-large | xx-large ]</p>
-<p>The following table provides user agent guidelines for the absolute-size 
- mapping to HTML heading and absolute font-sizes. The 'medium' value is 
+<p>The following table provides user agent guidelines for the absolute-size
+ mapping to HTML heading and absolute font-sizes. The 'medium' value is
  the user's preferred font size and is used as the reference middle value.</p>
 
 <table border="1" style="border-collapse: collapse" width="73%" id="AutoNumber2">
@@ -15069,10 +15078,10 @@ <h2>15.7 <a name="font-size-props">Font size</a>: the <a href="fonts.html#propde
 to another.
 </p>
 
-<p class="note"><em><strong>Note 1.</strong> To preserve readability, a UA applying 
+<p class="note"><em><strong>Note 1.</strong> To preserve readability, a UA applying
 these guidelines should nevertheless avoid creating font-size resulting
  in less than 9 pixels per EM unit on a computer display.</em></p>
- 
+
 <p class="note"><em><strong>Note 2.</strong> In CSS1, the suggested
 scaling factor between adjacent indexes was 1.5, which user experience
 proved to be too large. In CSS2, the suggested scaling factor for a
@@ -15157,10 +15166,10 @@ <h2>15.8 <a name="font-shorthand">Shorthand font property</a>: the <a href="font
 typographical shorthand notation to set multiple properties related to
 fonts.
 </p>
-<p>All font-related properties are first reset to their initial values, 
-including those listed in the preceding paragraph. 
-Then, those properties that are given explicit values in the 
-<a href="fonts.html#propdef-font" class="noxref"><span class="propinst-font">'font'</span></a> shorthand are set to those values. 
+<p>All font-related properties are first reset to their initial values,
+including those listed in the preceding paragraph.
+Then, those properties that are given explicit values in the
+<a href="fonts.html#propdef-font" class="noxref"><span class="propinst-font">'font'</span></a> shorthand are set to those values.
 For a definition of allowed and initial values, see the previously defined properties.
 </p>
 <pre>
@@ -15206,7 +15215,7 @@ <h2>15.8 <a name="font-shorthand">Shorthand font property</a>: the <a href="font
 </dl>
 
 <p>System fonts may only be set as a whole; that is, the font
-family, size, weight, style, etc. are all set at the same time. 
+family, size, weight, style, etc. are all set at the same time.
 These values may then be altered individually if desired.  If no
 font with the indicated characteristics exists on a given platform,
 the user agent should either intelligently substitute (e.g., a smaller
@@ -15250,7 +15259,7 @@ <h2>15.8 <a name="font-shorthand">Shorthand font property</a>: the <a href="font
   font-weight: 600;
   font-size: 9px;
   line-height: normal;
-} 
+}
 </pre>
 
 </div>
@@ -15395,9 +15404,9 @@ <h2>16.2 <a name="alignment-prop">Alignment:</a> the <a href="text.html#propdef-
 class="propinst-word-spacing">'word-spacing'</span></a>.)
 </p>
 <p>
-If the computed value of text-align is 'justify' while the computed
-value of white-space is 'pre' or 'pre-line', the actual value of
-text-align is set to the initial value.
+If an element has a computed value for 'white-space' of 'pre' or
+'pre-wrap', then neither the glyphs of that element's text content nor
+its white space may be altered for the purpose of justification.
 </p>
 
 <div class="example"><P style="display:none">Example(s):</P><p>