--- a/QScintilla/Lexers/LexerPygments.py Sat Apr 26 10:06:49 2014 +0200 +++ b/QScintilla/Lexers/LexerPygments.py Sat Apr 26 10:36:09 2014 +0200 @@ -69,70 +69,70 @@ #-----------------------------------------------------------------------------# TOKEN_MAP = { - Token.Comment: PYGMENTS_COMMENT, - Token.Comment.Preproc: PYGMENTS_PREPROCESSOR, - Token.Comment.Multiline: PYGMENTS_MULTILINECOMMENT, - Token.Comment.Single: PYGMENTS_COMMENT, - Token.Comment.Special: PYGMENTS_COMMENT, + Token.Comment: PYGMENTS_COMMENT, + Token.Comment.Preproc: PYGMENTS_PREPROCESSOR, + Token.Comment.Multiline: PYGMENTS_MULTILINECOMMENT, + Token.Comment.Single: PYGMENTS_COMMENT, + Token.Comment.Special: PYGMENTS_COMMENT, - Token.Keyword: PYGMENTS_KEYWORD, - Token.Keyword.Pseudo: PYGMENTS_PSEUDOKEYWORD, - Token.Keyword.Type: PYGMENTS_TYPEKEYWORD, - Token.Keyword.Namespace: PYGMENTS_KEYWORD, + Token.Keyword: PYGMENTS_KEYWORD, + Token.Keyword.Pseudo: PYGMENTS_PSEUDOKEYWORD, + Token.Keyword.Type: PYGMENTS_TYPEKEYWORD, + Token.Keyword.Namespace: PYGMENTS_KEYWORD, - Token.Operator: PYGMENTS_OPERATOR, - Token.Operator.Word: PYGMENTS_WORD, + Token.Operator: PYGMENTS_OPERATOR, + Token.Operator.Word: PYGMENTS_WORD, - Token.Name: PYGMENTS_DEFAULT, - Token.Name.Builtin: PYGMENTS_BUILTIN, - Token.Name.Builtin.Pseudo: PYGMENTS_BUILTIN, - Token.Name.Function: PYGMENTS_FUNCTION, - Token.Name.Class: PYGMENTS_CLASS, - Token.Name.Namespace: PYGMENTS_NAMESPACE, - Token.Name.Exception: PYGMENTS_EXCEPTION, - Token.Name.Variable: PYGMENTS_VARIABLE, - Token.Name.Variable.Class: PYGMENTS_VARIABLE, - Token.Name.Variable.Global: PYGMENTS_VARIABLE, - Token.Name.Variable.Instance: PYGMENTS_VARIABLE, - Token.Name.Constant: PYGMENTS_CONSTANT, - Token.Name.Label: PYGMENTS_LABEL, - Token.Name.Entity: PYGMENTS_ENTITY, - Token.Name.Attribute: PYGMENTS_ATTRIBUTE, - Token.Name.Tag: PYGMENTS_TAG, - Token.Name.Decorator: PYGMENTS_DECORATOR, - Token.Name.Property: PYGMENTS_PROPERTY, + Token.Name: PYGMENTS_DEFAULT, + Token.Name.Builtin: PYGMENTS_BUILTIN, + Token.Name.Builtin.Pseudo: PYGMENTS_BUILTIN, + Token.Name.Function: PYGMENTS_FUNCTION, + Token.Name.Class: PYGMENTS_CLASS, + Token.Name.Namespace: PYGMENTS_NAMESPACE, + Token.Name.Exception: PYGMENTS_EXCEPTION, + Token.Name.Variable: PYGMENTS_VARIABLE, + Token.Name.Variable.Class: PYGMENTS_VARIABLE, + Token.Name.Variable.Global: PYGMENTS_VARIABLE, + Token.Name.Variable.Instance: PYGMENTS_VARIABLE, + Token.Name.Constant: PYGMENTS_CONSTANT, + Token.Name.Label: PYGMENTS_LABEL, + Token.Name.Entity: PYGMENTS_ENTITY, + Token.Name.Attribute: PYGMENTS_ATTRIBUTE, + Token.Name.Tag: PYGMENTS_TAG, + Token.Name.Decorator: PYGMENTS_DECORATOR, + Token.Name.Property: PYGMENTS_PROPERTY, - Token.String: PYGMENTS_STRING, - Token.String.Char: PYGMENTS_CHAR, - Token.String.Doc: PYGMENTS_DOCSTRING, - Token.String.Interpol: PYGMENTS_SCALAR, - Token.String.Escape: PYGMENTS_ESCAPE, - Token.String.Regex: PYGMENTS_REGEX, - Token.String.Symbol: PYGMENTS_SYMBOL, - Token.String.Other: PYGMENTS_OTHER, - Token.String.Heredoc: PYGMENTS_HEREDOC, + Token.String: PYGMENTS_STRING, + Token.String.Char: PYGMENTS_CHAR, + Token.String.Doc: PYGMENTS_DOCSTRING, + Token.String.Interpol: PYGMENTS_SCALAR, + Token.String.Escape: PYGMENTS_ESCAPE, + Token.String.Regex: PYGMENTS_REGEX, + Token.String.Symbol: PYGMENTS_SYMBOL, + Token.String.Other: PYGMENTS_OTHER, + Token.String.Heredoc: PYGMENTS_HEREDOC, - Token.Number: PYGMENTS_NUMBER, - Token.Number.Float: PYGMENTS_NUMBER, - Token.Number.Hex: PYGMENTS_NUMBER, - Token.Number.Integer: PYGMENTS_NUMBER, - Token.Number.Integer.Long: PYGMENTS_NUMBER, - Token.Number.Oct: PYGMENTS_NUMBER, + Token.Number: PYGMENTS_NUMBER, + Token.Number.Float: PYGMENTS_NUMBER, + Token.Number.Hex: PYGMENTS_NUMBER, + Token.Number.Integer: PYGMENTS_NUMBER, + Token.Number.Integer.Long: PYGMENTS_NUMBER, + Token.Number.Oct: PYGMENTS_NUMBER, - Token.Punctuation: PYGMENTS_PUNCTUATION, + Token.Punctuation: PYGMENTS_PUNCTUATION, - Token.Generic.Heading: PYGMENTS_HEADING, - Token.Generic.Subheading: PYGMENTS_SUBHEADING, - Token.Generic.Deleted: PYGMENTS_DELETED, - Token.Generic.Inserted: PYGMENTS_INSERTED, - Token.Generic.Error: PYGMENTS_GENERIC_ERROR, - Token.Generic.Emph: PYGMENTS_EMPHASIZE, - Token.Generic.Strong: PYGMENTS_STRONG, - Token.Generic.Prompt: PYGMENTS_PROMPT, - Token.Generic.Output: PYGMENTS_OUTPUT, - Token.Generic.Traceback: PYGMENTS_TRACEBACK, + Token.Generic.Heading: PYGMENTS_HEADING, + Token.Generic.Subheading: PYGMENTS_SUBHEADING, + Token.Generic.Deleted: PYGMENTS_DELETED, + Token.Generic.Inserted: PYGMENTS_INSERTED, + Token.Generic.Error: PYGMENTS_GENERIC_ERROR, + Token.Generic.Emph: PYGMENTS_EMPHASIZE, + Token.Generic.Strong: PYGMENTS_STRONG, + Token.Generic.Prompt: PYGMENTS_PROMPT, + Token.Generic.Output: PYGMENTS_OUTPUT, + Token.Generic.Traceback: PYGMENTS_TRACEBACK, - Token.Error: PYGMENTS_ERROR, + Token.Error: PYGMENTS_ERROR, } #-----------------------------------------------------------------------------#