[svn] A new default theme.

3 files changed, 92 insertions, 13 deletions

diff --git a/pygments/styles/__init__.py b/pygments/styles/__init__.py
index cd172adf..4bbb5063 100644
--- a/pygments/styles/__init__.py
+++ b/pygments/styles/__init__.py
@@ -16,7 +16,7 @@ from pygments.util import ClassNotFound
 #: Maps style names to 'submodule::classname'.
 STYLE_MAP = {
     'default':  'default::DefaultStyle',
-    'emacs':    'default::DefaultStyle',
+    'emacs':    'emacs::EmacsStyle',
     'friendly': 'friendly::FriendlyStyle',
     'colorful': 'colorful::ColorfulStyle',
     'autumn':   'autumn::AutumnStyle',
diff --git a/pygments/styles/default.py b/pygments/styles/default.py
index f6a9cdd8..a256d56d 100644
--- a/pygments/styles/default.py
+++ b/pygments/styles/default.py
@@ -3,9 +3,10 @@
     pygments.styles.default
     ~~~~~~~~~~~~~~~~~~~~~~~
 
-    The default highlighting style for Pygments.
+    The default highlighting style.
 
-    :copyright: 2006-2007 by Georg Brandl.
+    :copyright: 2007 by Tiberius Teng.
+    :copyright: 2006 by Georg Brandl.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -19,40 +20,47 @@ class DefaultStyle(Style):
     The default style (inspired by Emacs 22).
     """
 
-    background_color = "#f8f8f8"
+    background_color = "#f2f2f2"
     default_style = ""
 
     styles = {
-        Comment:                   "italic #008800",
+        Comment:                   "italic #408080",
         Comment.Preproc:           "noitalic",
-        Comment.Special:           "noitalic bold",
 
-        Keyword:                   "bold #AA22FF",
+        #Keyword:                   "bold #AA22FF",
+        Keyword:                   "bold #008000",
         Keyword.Pseudo:            "nobold",
         Keyword.Type:              "",
 
         Operator:                  "#666666",
         Operator.Word:             "bold #AA22FF",
 
-        Name.Builtin:              "#AA22FF",
-        Name.Function:             "#00A000",
+        #Name.Builtin:              "#AA22FF",
+        Name.Builtin:              "#008000",
+        #Name.Function:             "#00A000",
+        Name.Function:             "#BC7A00",
         Name.Class:                "#0000FF",
         Name.Namespace:            "bold #0000FF",
         Name.Exception:            "bold #D2413A",
-        Name.Variable:             "#B8860B",
+        #Name.Variable:             "#B8860B",
+        Name.Variable:             "#19177C",
         Name.Constant:             "#880000",
         Name.Label:                "#A0A000",
         Name.Entity:               "bold #999999",
-        Name.Attribute:            "#BB4444",
+        #Name.Attribute:            "#BB4444",
+        #Name.Attribute:            "#705406",
+        Name.Attribute:            "#7D6029",
         Name.Tag:                  "bold #008000",
         Name.Decorator:            "#AA22FF",
 
-        String:                    "#BB4444",
+        #String:                    "#BB4444",
+        String:                    "#BA2121",
         String.Doc:                "italic",
         String.Interpol:           "bold #BB6688",
         String.Escape:             "bold #BB6622",
         String.Regex:              "#BB6688",
-        String.Symbol:             "#B8860B",
+        #String.Symbol:             "#B8860B",
+        String.Symbol:             "#19177C",
         String.Other:              "#008000",
         Number:                    "#666666",
 
diff --git a/pygments/styles/emacs.py b/pygments/styles/emacs.py
new file mode 100644
index 00000000..cf7b2dc8
--- /dev/null
+++ b/pygments/styles/emacs.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+"""
+    pygments.styles.emacs
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    A highlighting style for Pygments, inspired by Emacs.
+
+    :copyright: 2006-2007 by Georg Brandl.
+    :license: BSD, see LICENSE for more details.
+"""
+
+from pygments.style import Style
+from pygments.token import Keyword, Name, Comment, String, Error, \
+     Number, Operator, Generic
+
+
+class EmacsStyle(Style):
+    """
+    The default style (inspired by Emacs 22).
+    """
+
+    background_color = "#f8f8f8"
+    default_style = ""
+
+    styles = {
+        Comment:                   "italic #008800",
+        Comment.Preproc:           "noitalic",
+        Comment.Special:           "noitalic bold",
+
+        Keyword:                   "bold #AA22FF",
+        Keyword.Pseudo:            "nobold",
+        Keyword.Type:              "",
+
+        Operator:                  "#666666",
+        Operator.Word:             "bold #AA22FF",
+
+        Name.Builtin:              "#AA22FF",
+        Name.Function:             "#00A000",
+        Name.Class:                "#0000FF",
+        Name.Namespace:            "bold #0000FF",
+        Name.Exception:            "bold #D2413A",
+        Name.Variable:             "#B8860B",
+        Name.Constant:             "#880000",
+        Name.Label:                "#A0A000",
+        Name.Entity:               "bold #999999",
+        Name.Attribute:            "#BB4444",
+        Name.Tag:                  "bold #008000",
+        Name.Decorator:            "#AA22FF",
+
+        String:                    "#BB4444",
+        String.Doc:                "italic",
+        String.Interpol:           "bold #BB6688",
+        String.Escape:             "bold #BB6622",
+        String.Regex:              "#BB6688",
+        String.Symbol:             "#B8860B",
+        String.Other:              "#008000",
+        Number:                    "#666666",
+
+        Generic.Heading:           "bold #000080",
+        Generic.Subheading:        "bold #800080",
+        Generic.Deleted:           "#A00000",
+        Generic.Inserted:          "#00A000",
+        Generic.Error:             "#FF0000",
+        Generic.Emph:              "italic",
+        Generic.Strong:            "bold",
+        Generic.Prompt:            "bold #000080",
+        Generic.Output:            "#888",
+        Generic.Traceback:         "#04D",
+
+        Error:                     "border:#FF0000"
+    }