[svn] added JavascriptGenshiLexer and CssGenshiLexer

2 files changed, 29 insertions, 2 deletions

diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 06aa1dd5..83c0dc96 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -21,6 +21,7 @@ LEXERS = {
     'CppLexer': ('pygments.lexers.compiled', 'C++', ('cpp', 'c++'), ('*.cpp', '*.hpp', '*.c++', '*.h++')),
     'CssDjangoLexer': ('pygments.lexers.templates', 'CSS+Django', ('css+django',), ()),
     'CssErbLexer': ('pygments.lexers.templates', 'CSS+Ruby', ('css+erb', 'css+ruby'), ()),
+    'CssGenshiLexer': ('pygments.lexers.templates', 'CSS+Genshi Text', ('css+genshitext', 'css+genshi'), ()),
     'CssLexer': ('pygments.lexers.web', 'CSS', ('css',), ('*.css',)),
     'CssPhpLexer': ('pygments.lexers.templates', 'CSS+PHP', ('css+php',), ()),
     'CssSmartyLexer': ('pygments.lexers.templates', 'CSS+Smarty', ('css+smarty',), ()),
@@ -29,7 +30,7 @@ LEXERS = {
     'DjangoLexer': ('pygments.lexers.templates', 'django template', ('django',), ()),
     'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), ()),
     'GenshiLexer': ('pygments.lexers.templates', 'Genshi', ('genshi', 'kid', 'xml+genshi', 'xml+kid'), ('*.kid',)),
-    'GenshiTextLexer': ('pygments.lexers.templates', None, ('genshitext',), ()),
+    'GenshiTextLexer': ('pygments.lexers.templates', 'Genshi Text', ('genshitext',), ()),
     'HtmlDjangoLexer': ('pygments.lexers.templates', 'HTML+Django', ('html+django',), ()),
     'HtmlGenshiLexer': ('pygments.lexers.templates', 'HTML+Genshi', ('html+genshi', 'html+kid'), ()),
     'HtmlLexer': ('pygments.lexers.web', 'HTML', ('html',), ('*.html', '*.htm', '*.xhtml')),
@@ -40,6 +41,7 @@ LEXERS = {
     'JavaLexer': ('pygments.lexers.compiled', 'Java', ('java',), ('*.java',)),
     'JavascriptDjangoLexer': ('pygments.lexers.templates', 'JavaScript+Django', ('js+django', 'javascript+django'), ()),
     'JavascriptErbLexer': ('pygments.lexers.templates', 'JavaScript+Ruby', ('js+erb', 'javascript+erb', 'js+ruby', 'javascript+ruby'), ()),
+    'JavascriptGenshiLexer': ('pygments.lexers.templates', 'JavaScript+Genshi Text', ('js+genshitext', 'js+genshi', 'javascript+genshitext', 'javascript+genshi'), ()),
     'JavascriptLexer': ('pygments.lexers.web', 'JavaScript', ('js', 'javascript'), ('*.js',)),
     'JavascriptPhpLexer': ('pygments.lexers.templates', 'JavaScript+PHP', ('js+php', 'javascript+php'), ()),
     'JavascriptSmartyLexer': ('pygments.lexers.templates', 'JavaScript+Smarty', ('js+smarty', 'javascript+smarty'), ()),
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index 5f40bfeb..d2f17343 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -31,7 +31,7 @@ __all__ = ['HtmlPhpLexer', 'XmlPhpLexer', 'CssPhpLexer',
            'CssSmartyLexer', 'JavascriptSmartyLexer', 'DjangoLexer',
            'HtmlDjangoLexer', 'CssDjangoLexer', 'XmlDjangoLexer',
            'JavascriptDjangoLexer', 'GenshiLexer', 'HtmlGenshiLexer',
-           'GenshiTextLexer']
+           'GenshiTextLexer', 'CssGenshiLexer', 'JavascriptGenshiLexer']
 
 
 class ErbLexer(Lexer):
@@ -220,6 +220,10 @@ class DjangoLexer(RegexLexer):
 class GenshiTextLexer(RegexLexer):
     aliases = ['genshitext']
 
+class GenshiTextLexer(RegexLexer):
+    name = 'Genshi Text'
+    aliases = ['genshitext']
+
     tokens = {
         'root': [
             (r'[^#\$\s]+', Text),
@@ -244,6 +248,7 @@ class GenshiTextLexer(RegexLexer):
         ]
     }
 
+
 class GenshiMarkupLexer(RegexLexer):
     flags = re.DOTALL
 
@@ -338,6 +343,26 @@ class GenshiLexer(DelegatingLexer):
         return rv + XmlLexer.analyse_text(text) - 0.01
 
 
+class JavascriptGenshiLexer(DelegatingLexer):
+    name = 'JavaScript+Genshi Text'
+    aliases = ['js+genshitext', 'js+genshi', 'javascript+genshitext',
+               'javascript+genshi']
+
+    def __init__(self, **options):
+        super(JavascriptGenshiLexer, self).__init__(JavascriptLexer,
+                                                    GenshiTextLexer,
+                                                    **options)
+
+
+class CssGenshiLexer(DelegatingLexer):
+    name = 'CSS+Genshi Text'
+    aliases = ['css+genshitext', 'css+genshi']
+
+    def __init__(self, **options):
+        super(CssGenshiLexer, self).__init__(CssLexer, GenshiTextLexer,
+                                             **options)
+
+
 class RhtmlLexer(DelegatingLexer):
     name = 'RHTML'
     aliases = ['rhtml', 'html+erb', 'html+ruby']