[css2] Final (hopefully) issues

bert-github · bert-github · commit adf174cf846c · 2004-02-17T21:40:55.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402215
diff --git a/css2/box.src b/css2/box.src
@@ -2,7 +2,7 @@
   'http://www.w3.org/TR/html4/strict.dtd'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.55 2004-02-16 18:33:43 bbos Exp $ -->
+<!-- $Id: box.src,v 1.56 2004-02-17 21:40:55 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -47,7 +47,11 @@ and margin) is called an "edge", so each box has four edges:</P>
 <dt><span class="index-def"
 title="content edge"><a name="content-edge"><strong>content edge</strong></a></span>
 or <span class="index-def" title="inner edge"><a name="inner-edge"><strong>inner edge</strong></a></span>
-<dd>The content edge surrounds the element's <a href="conform.html#rendered-content">rendered content</a>.
+<dd>The content edge surrounds the rectangle given by the <a
+href="visudet.html#Computing_widths_and_margins">width</a> and <a
+href="visudet.html#Computing_heights_and_margins">height</a>
+of the box, which often depend on the element's <a
+href="conform.html#rendered-content">rendered content</a>.
 <dt><span class="index-def" title="padding edge"><a name="padding-edge"><strong>padding edge</strong></a></span>
 <dd>The padding edge surrounds the box padding. If the padding
 has 0 width, the padding edge is the same as the content edge.
diff --git a/css2/changes.src b/css2/changes.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.42 2003-08-27 17:25:33 bbos Exp $ -->
+<!-- $Id: changes.src,v 2.43 2004-02-17 21:40:55 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Changes</TITLE>
@@ -182,7 +182,8 @@ sheets</a></h3>
 <p>Chapter 19 on aural style sheets has become appendix A and is not
 normative in CSS&nbsp;2.1. Related units (deg, grad, rad, ms, s, Hz,
 kHz) are also moved to this appendix, as is the 'speak-header'
-property from the "tables" chapter.
+property from the "tables" chapter. The 'aural' media type is deprecated.
+(A new 'speech' media type is expected in CSS3.)
 
 <h3 id="other">Other</h3>
 
diff --git a/css2/conform.src b/css2/conform.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: conform.src,v 2.57 2004-02-14 00:59:12 bbos Exp $ -->
+<!-- $Id: conform.src,v 2.58 2004-02-17 21:40:55 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Conformance: requirements and recommendations</TITLE>
@@ -75,7 +75,8 @@ encoded in some language that represents the document as a tree of <a
 href="#element">elements</a>. Each element consists of a name that
 identifies the type of element, optionally a number of <a
 href="#attribute">attributes</a>, and a (possibly empty) <a
-href="#content">content</a>.</dd>
+href="#content">content</a>. For example, the source document could be 
+an XML or SGML instance.</dd>
 
 <dt><strong><span class="index-def" title="document language"><a
 name="doclanguage">Document language</a></span></strong>
diff --git a/css2/media.src b/css2/media.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: media.src,v 2.32 2004-02-14 00:59:12 bbos Exp $ -->
+<!-- $Id: media.src,v 2.33 2004-02-17 21:40:55 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Media types</TITLE>
@@ -152,9 +152,9 @@ information about formatting issues that are specific to paged media.
 <dd>Intended primarily for color computer screens. 
 
 <dt><strong>speech</strong>
-<dd>Intended for speech synthesizers. Note: CSS2 had a similar media type called 'aural' for this purpose.  See the
-appendix on <a href="./aural.html">aural style sheets</a> for details. 
-</dd>
+<dd>Intended for speech synthesizers. Note: CSS2 had a similar media type 
+called 'aural' for this purpose.  See the appendix on 
+<a href="./aural.html">aural style sheets</a> for details. 
 
 <dt><strong>tty</strong>
 <dd>Intended for media using a fixed-pitch character grid (such as
@@ -265,6 +265,7 @@ align="center">both<TD align="center">both</TR>
 <TR><TH>print<TD align="center">paged<TD align="center">visual<TD
 align="center">bitmap<TD align="center">static</TR>
 <TR><TH>projection<TD align="center">paged<TD align="center">visual<TD align="center">bitmap<TD align="center">interactive</TR>
+<TR><TH>reader<TD align="center">continuous<TD align="center">visual, audio, speech, tactile<TD align="center">both<TD align="center">interactive</TR>
 <TR><TH>screen<TD align="center">continuous<TD align="center">visual, audio<TD align="center">bitmap<TD align="center">both</TR>
 <TR><TH>speech<TD align="center">continuous<TD align="center">speech<TD align="center">N/A<TD align="center">both</TR>
 <TR><TH>tty<TD align="center">continuous<TD align="center">visual<TD align="center">grid<TD align="center">both</TR>
diff --git a/css2/properties/properties.db b/css2/properties/properties.db
@@ -601,8 +601,8 @@ table-cell | table-caption | none | inherit;;
 
 /* list-style-type;;
   disc | circle | square | decimal | decimal-leading-zero | 
- lower-roman | upper-roman |
- lower-latin | upper-latin | 
+ lower-roman | upper-roman | lower-greek |
+ lower-latin | upper-latin | armenian | georgian |
  none | inherit;;
   disc;;
   elements with 'display: list-item';;
@@ -940,7 +940,7 @@ leftwards | rightwards | inherit;;
 */
 
 /* content;;
-  normal | [ <string> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit;;
+  normal | [ <string> | <uri> | <counter> | attr(<identifier>) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit;;
   normal;;
   :before and :after pseudo-elements;;
   no;;
