[svn] added missing lexers to pygments docs, svn ignored "*.pyc"

3 files changed, 55 insertions, 10 deletions

diff --git a/docs/src/lexers.txt b/docs/src/lexers.txt
index 319c8e79..ab0af16b 100644
--- a/docs/src/lexers.txt
+++ b/docs/src/lexers.txt
@@ -371,12 +371,12 @@ Template languages
 `DjangoLexer`
 
     Generic `django <http://www.djangoproject.com/documentation/templates/>`_
-    template lexer.
+    and `jinja <http://wsgiarea.pocoo.org/jinja/>`_ template lexer.
 
-    It just highlights django code between the preprocessor directives, other
-    data is left untouched by the lexer.
+    It just highlights django/jinja code between the preprocessor directives,
+    other data is left untouched by the lexer.
 
-    :Aliases:   ``django``
+    :Aliases:   ``django``, ``jinja``
     :Filename patterns: None
 
 
@@ -387,7 +387,7 @@ Template languages
 
     Nested Javascript and CSS is highlighted too.
 
-    :Aliases:   ``html+django``
+    :Aliases:   ``html+django``, ``html+jinja``
     :Filename patterns: None
 
 
@@ -396,7 +396,7 @@ Template languages
     Subclass of the `DjangoLexer` that highlights unlexed data with the
     `XmlLexer`.
 
-    :Aliases:   ``xml+django``
+    :Aliases:   ``xml+django``, ``xml+jinja``
     :Filename patterns: None
 
 
@@ -405,7 +405,7 @@ Template languages
     Subclass of the `DjangoLexer` that highlights unlexed data with the
     `CssLexer`.
 
-    :Aliases:   ``css+django``
+    :Aliases:   ``css+django``, ``css+jinja``
     :Filename patterns: None
 
 
@@ -414,7 +414,8 @@ Template languages
     Subclass of the `DjangoLexer` that highlights unlexed data with the
     `JavascriptLexer`.
 
-    :Aliases:   ``javascript+django``
+    :Aliases:   ``javascript+django``, ``js+django``,
+                ``javascript+jinja``, ``js+jinja``
     :Filename patterns: None
 
 
@@ -467,6 +468,50 @@ Template languages
     :Filename patterns: None
 
 
+`GenshiTextLexer`
+
+    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ text
+    templates.
+
+    :Aliases:   ``genshitext``
+    :Filename patterns: None
+
+
+`HtmlGenshiLexer`
+
+    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and
+    `kid <http://kid-templating.org/>`_ kid HTML templates.
+
+    :Aliases:   ``html+genshi``, ``html+kid``
+    :Filename patterns: None
+
+
+`GenshiLexer`
+
+    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and
+    `kid <http://kid-templating.org/>`_ kid XML templates.
+
+    :Aliases:   ``genshi``, ``kid``, ``xml+genshi``, ``xml.kid``
+    :Filename patterns: ``*.kid``
+
+
+`JavascriptGenshiLexer`
+
+    A lexer that highlights javascript code in genshi text templates.
+
+    :Aliases:   ``js+genshitext``, ``js+genshi``, ``javascript+genshitext``,
+                ``javascript+genshi``
+    :Filename patterns: None
+
+
+`CssGenshiLexer`
+
+    A lexer that highlights CSS definitions in genshi text templates.
+
+    :Aliases:   ``css+genshitext``, ``css+genshi``
+    :Filename patterns: None
+
+
 Other languages
 ===============
 
diff --git a/scripts/vim2pygments.py b/scripts/vim2pygments.py
index 7402b082..57d506da 100644
--- a/scripts/vim2pygments.py
+++ b/scripts/vim2pygments.py
@@ -858,7 +858,7 @@ def find_colors(code):
             for token in tokens:
                 color_map[token] = ' '.join(tmp)
 
-    default_token = color_map.pop('', '')
+    default_token = color_map.pop('')
     return default_token, color_map
 
 
@@ -867,7 +867,6 @@ class StyleWriter(object):
     def __init__(self, code, name):
         self.code = code
         self.name = name.lower()
-        self.styles = {}
 
     def write_header(self, out):
         out.write('# -*- coding: utf-8 -*-\n"""\n')
diff --git a/setup.py b/setup.py
index b8fdbee6..05617a89 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import ez_setup
 ez_setup.use_setuptools()