diff options
author | Georg Brandl <georg@python.org> | 2016-02-14 15:15:04 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2016-02-14 15:15:04 +0100 |
commit | be71a37c4b860a5247cf7f65ea8f3596cef11e9e (patch) | |
tree | 518bfd491c44e50b9298ea5948a460e584afe6d5 /pygments/token.py | |
parent | 1b8de7302a856a8046315758ae4ed51c775bc84f (diff) | |
parent | 6297dd482d0b0adcf8f9792da90f4543390cd154 (diff) | |
download | pygments-git-be71a37c4b860a5247cf7f65ea8f3596cef11e9e.tar.gz |
merge with stable
Diffstat (limited to 'pygments/token.py')
-rw-r--r-- | pygments/token.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pygments/token.py b/pygments/token.py index fa3b1e11..40c3214a 100644 --- a/pygments/token.py +++ b/pygments/token.py @@ -147,6 +147,7 @@ STANDARD_TYPES = { Name.Entity: 'ni', Name.Exception: 'ne', Name.Function: 'nf', + Name.Function.Magic: 'fm', Name.Property: 'py', Name.Label: 'nl', Name.Namespace: 'nn', @@ -156,13 +157,16 @@ STANDARD_TYPES = { Name.Variable.Class: 'vc', Name.Variable.Global: 'vg', Name.Variable.Instance: 'vi', + Name.Variable.Magic: 'vm', Literal: 'l', Literal.Date: 'ld', String: 's', + String.Affix: 'sa', String.Backtick: 'sb', String.Char: 'sc', + String.Delimiter: 'dl', String.Doc: 'sd', String.Double: 's2', String.Escape: 'se', |