diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-04-14 20:14:51 -0400 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 20:14:51 -0400 |
| commit | c75a752481251a0f2033a0db2466f293e73fa7e2 (patch) | |
| tree | 2fd7271a0e92112cb2c3c7dc04773379bd72dd07 /pygments/token.py | |
| parent | 11226c63db8ed714bf233e34d44141a4ad3df934 (diff) | |
| parent | c852aa1e65a7175a4d62d321b9b18f70e4e6b93a (diff) | |
| download | pygments-c75a752481251a0f2033a0db2466f293e73fa7e2.tar.gz | |
Merged in ssproessig/pygments-main (pull request #266)
Diffstat (limited to 'pygments/token.py')
| -rw-r--r-- | pygments/token.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pygments/token.py b/pygments/token.py index 19a83f2e..c40ffd33 100644 --- a/pygments/token.py +++ b/pygments/token.py @@ -5,7 +5,7 @@ Basic token types and the standard tokens. - :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -49,6 +49,7 @@ Token = _TokenType() # Special token types Text = Token.Text Whitespace = Text.Whitespace +Escape = Token.Escape Error = Token.Error # Text that doesn't belong to this lexer (e.g. HTML in PHP) Other = Token.Other @@ -116,6 +117,7 @@ STANDARD_TYPES = { Text: '', Whitespace: 'w', + Escape: 'esc', Error: 'err', Other: 'x', |