diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-04-23 16:48:10 -0400 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-04-23 16:48:10 -0400 |
| commit | 690a2bdfa924f76fd374e25bd9772c2090cf6414 (patch) | |
| tree | 576991298817f1055da24857df6982dc2bd37d5a /pygments/token.py | |
| parent | 1d9f7f4f19c49a22ecd119f58580f9bc5ccd5080 (diff) | |
| parent | b69477dc22e228cde4c1d39bf11b292b88d95fe1 (diff) | |
| download | pygments-690a2bdfa924f76fd374e25bd9772c2090cf6414.tar.gz | |
Merged in lefticus/pygments-main (pull request #24)
Conflicts:
pygments/lexers/_mapping.py
pygments/lexers/agile.py
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 1f513923..c40ffd33 100644 --- a/pygments/token.py +++ b/pygments/token.py @@ -5,7 +5,7 @@ Basic token types and the standard tokens. - :copyright: Copyright 2006-2010 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', |