--- a/lisp/w3/default.css	Mon Aug 13 08:45:53 2007 +0200
+++ b/lisp/w3/default.css	Mon Aug 13 08:46:35 2007 +0200
@@ -1,11 +1,26 @@
-/*       File: default.css
+/******************************************************************************
+**       File: default.css
 **    Purpose: Default Stylesheet for Emacs-W3
 **       Info: Copyright (c) 1995 William M. Perry <wmperry@spry.com>
 **    Created: William M. Perry <wmperry@spry.com>, Aug-31-1995
 ** Maintainer: William M. Perry <wmperry@spry.com>
 **
 **  This contains the top level fallback default styles for Emacs-w3
-*/
+**
+******************************************************************************
+**
+** To specify device-dependent styles, you must mark a section with
+** :devicetype:
+** If you are not using 'devicetype', then anything up to the next
+** :xxx: media descriptor is ignored.
+**
+** There are a few special Emacs-W3 sections
+**
+**  emacs - only include this chunk if you are using Emacs 19
+** xemacs - only include this chunk if you are using XEmacs
+** normal - always include this chunk (useful for switching out of another 
+**          device-type block
+******************************************************************************/
 
 /*
 ** Headers
@@ -14,7 +29,7 @@
 h1,h2,h3,
 h4,h5,h6  {
 	    display: block;
-            font-family : utopia charter times itc-zapf-chancery inja;
+            font-family : serif;
             font-weight : bold;
           }
 
@@ -24,12 +39,21 @@
 */
 
 :xemacs:
-      h1  { font-size : 24pt }
-      h2  { font-size : 18pt }
-      h3  { font-size : 16pt }
-      h4  { font-size : 14pt }
-      h5  { font-size : 12pt }
-      h6  { font-size : 10pt }
+      h1  { font-size : +10pt }
+      h2  { font-size : +6pt  }
+      h3  { font-size : +3pt  }
+      h4  {                   } /* Do nothing, normal sized font, just bold */
+      h5  { font-size : -3pt  }
+      h6  { font-size : -6pt  }
+
+/*
+** Emacs-19 also doesn't handle how Emacs-W3 changes this type of font
+** very well, so lets only do it under XEmacs for now.  Emacs-19 can only
+** do monospaced fonts anyway, so its redundant.
+*/
+   pre,xmp,
+  plaintext { font-family: monospace; display: block }
+key,code,tt { font-family: monospace }
 
 /*
 ** Best we can do under Emacs-19 is use the default font and try to make
@@ -38,7 +62,15 @@
 
 :emacs:
 h1,h2,h3,
-h4,h5,h6  { font-style: small-caps; text-decoration: underline }
+h4,h5,h6  { 
+            font-style: small-caps;
+            text-decoration: underline;
+	    color: blue;
+          }
+
+strong,em { color: red         }
+      dfn { font-style: italic }
+ s,strike { color: green       }
 
 :normal:
        p  { display: block }
@@ -57,23 +89,15 @@
        dd { insert-before: 3em; display: list-item }
 
 /*
-** All items that require fixed-width fonts
-*/
-
-   pre,xmp,
-  plaintext { font-family: monospace; display: block }
-key,code,tt { font-family: monospace }
-
-/*
 ** All logical emphasis tags, the way god intended
 */
 
-  strong,em { font-weight: bold }
-        dfn { font-style: italic }
+  strong,em { font-weight: bold             }
+        dfn { font-style: italic            }
    s,strike { text-decoration: line-through }
-        sub { text-position: sub }
-        sup { text-position: sup }
-     secret { text-transform: rot13 }
+        sub { text-position: sub            }
+        sup { text-position: sup            }
+     secret { text-transform: rot13         }
 
 /*
 ** Physical emphasis - spawn of evil
@@ -96,9 +120,9 @@
 */
 
 a         { cursor: hand2  }
-a.link    { color: #FF0000 }
-a.visited { color: #B22222 }
-a.active  { color: #FF0000 }
+a:link    { color: #FF0000 }
+a:visited { color: #B22222 }
+a:active  { color: #FF0000 }
 
 /*
 ** Various other character-level formatting issues
@@ -110,13 +134,11 @@
 
 /*
 ** Now for monochrome defaults
-** Anything up to the next :xxx: media descriptor is only used if
-** you are on that type of media.
 */
 :mono:
-   a.link { color: black; text-decoration: underline }
-a.visited { color: black; text-decoration: underline }
- a.active { color: white }
+   a:link { color: black; text-decoration: underline }
+a:visited { color: black; text-decoration: underline }
+ a:active { color: white }
 
 /*
 ** All the TTY specific formatting
@@ -131,16 +153,16 @@
 
 h1,h2,h3,
 h4,h5,h6 {
-           insert-before: *;
-           insert-after: *
+           insert.before: *;
+           insert.after: *
          }
 
-a.visited{
+a:visited{
            insert.before: "{{";
            insert.after: "}}"
          }
 
-a.link   {
+a:link   {
            insert.before: "[[";
            insert.after: "]]"
          }
@@ -172,6 +194,31 @@
 
 h1,h2,h3,
 h4,h5,h6  { color : cyan     }
-a.visited { color : magenta  }
-   a.link { color : red      }
- a.active { color : yellow   }
+a:visited { color : magenta  }
+   a:link { color : red      }
+ a:active { color : yellow   }
+
+:speech:
+h1,h2,h3,
+h4,h5,h6 { voice-family: paul; stress: 8; }
+      h1 { pitch: 9; pitch-range: 9; }
+      h2 { pitch: 8; pitch-range: 8; }
+      h3 { pitch: 7; pitch-range: 7; }
+      h4 { pitch: 6; pitch-range: 6; }
+   h5,h6 { pitch: 5; pitch-range: 5; }
+      li { pitch: 6; richness: 6; }
+      dt { voice-family: harry;   }
+      dd { pitch: 6; richness: 6; }
+pre,xmp,
+plaintext { pitch: 1; pitch-range: 1; stress: 1; richness: 9; }
+key,code,
+       tt { pitch: 1; pitch-range: 1; stress: 1; richness: 9; }
+strong,em { pitch: 6; stress: 8; pitch-range: 9; }
+      dfn { pitch: 7; pitch-range: 6; stress: 6; }
+ s,strike { richness: 9; }
+        b { pitch: 6; pitch-range: 9; stress: 8; }
+        i { pitch: 7; pitch-range: 6; stress: 6; }
+        u { richness: 0; }
+a:link    { voice-family: harry;  }
+a:visited { voice-family: betty;  }
+a:active  { voice-family: ursula; }