From f5bb6804e82fc9632dee00cca7b5efd55eb36bf7 Mon Sep 17 00:00:00 2001 From: moculus Date: Wed, 2 Apr 2008 23:50:18 +0000 Subject: [PATCH] HTML/style fix --HG-- branch : pmacs2 --- mode/html.py | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/mode/html.py b/mode/html.py index 983da6a..8111032 100644 --- a/mode/html.py +++ b/mode/html.py @@ -1,16 +1,18 @@ import color, mode from lex import Grammar, PatternRule, RegionRule from mode.xml import TagGrammar -from mode.javascript import JavascriptGrammar, Javascript +from mode.javascript import JavascriptGrammar +from mode.css import CSSGrammar class HTMLGrammar(Grammar): rules = [ # TODO: how does cdata work again? RegionRule(r'comment', r''), - # BUG: not all scripts are javascript... but, dynamically choosing a - # grammar based on the 'type' attribute (which may be on a different - # line) could be pretty hairy. + # BUG: not all scripts are javascript and not all styles are CSS + # but, dynamically choosing a grammar based on the 'type' attribute + # (which may be on a different line) is impractical. RegionRule(r'script', r'<(?=script[^a-zA-Z0-9_])', TagGrammar, r'>', JavascriptGrammar, r')', TagGrammar, r'>'), + RegionRule(r'style', r'<(?=style[^a-zA-Z0-9_])', TagGrammar, r'>', CSSGrammar, r')', TagGrammar, r'>'), RegionRule(r'tag', r''), ] @@ -18,34 +20,27 @@ class HTML(mode.Fundamental): modename = 'HTML' extensions = ['.html', '.htm', '.shtml', '.shtm', '.xhtml'] grammar = HTMLGrammar - colors = { - #'comment.start': ('red', 'default'), - #'comment.null': ('red', 'default'), - #'comment.end': ('red', 'default'), + colors = {} - 'script.start': ('default', 'default'), - 'script.namespace': ('magenta', 'default'), - 'script.name': ('blue', 'default'), - 'script.attrname': ('cyan', 'default'), - 'script.string.start': ('green', 'default'), - 'script.string.null': ('green', 'default'), - 'script.string.end': ('green', 'default'), - 'script.end': ('default', 'default'), - - 'tag.start': ('default', 'default'), - 'tag.namespace': ('magenta', 'default'), - 'tag.name': ('blue', 'default'), - 'tag.attrname': ('cyan', 'default'), - 'tag.string.start': ('green', 'default'), - 'tag.string.null': ('green', 'default'), - 'tag.string.end': ('green', 'default'), - 'tag.end': ('default', 'default'), - } - #colors.update(Javascript.colors) def __init__(self, w): mode.Fundamental.__init__(self, w) self.add_bindings('close-paren', (')',)) self.add_bindings('close-brace', ('}',)) self.add_bindings('close-bracket', (']',)) +_colorbase = { + 'start': ('default', 'default'), + 'namespace': ('magenta', 'default'), + 'name': ('blue', 'default'), + 'attrname': ('cyan', 'default'), + 'string.start': ('green', 'default'), + 'string.null': ('green', 'default'), + 'string.end': ('green', 'default'), + 'end': ('default', 'default'), +} +for _name in _colorbase: + HTML.colors['script.%s' % _name] = _colorbase[_name] + HTML.colors['style.%s' % _name] = _colorbase[_name] + HTML.colors['tag.%s' % _name] = _colorbase[_name] + install = HTML.install