pygments.rb 0.5.4 → 0.6.0

data/vendor/pygments-main/pygments/lexers/math.py

@@ -5,10 +5,12 @@
 
     Lexers for math languages.
 
-    :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.
 """
 
+from __future__ import print_function
+
 import re
 
 from pygments.util import shebang_matches
@@ -24,14 +26,14 @@ from pygments.lexers import _stan_builtins
 __all__ = ['JuliaLexer', 'JuliaConsoleLexer', 'MuPADLexer', 'MatlabLexer',
            'MatlabSessionLexer', 'OctaveLexer', 'ScilabLexer', 'NumPyLexer',
            'RConsoleLexer', 'SLexer', 'JagsLexer', 'BugsLexer', 'StanLexer',
-           'IDLLexer', 'RdLexer', 'IgorLexer']
+           'IDLLexer', 'RdLexer', 'IgorLexer', 'MathematicaLexer', 'GAPLexer']
 
 
 class JuliaLexer(RegexLexer):
     """
     For `Julia <http://julialang.org/>`_ source code.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
     name = 'Julia'
     aliases = ['julia','jl']
@@ -95,16 +97,16 @@ class JuliaLexer(RegexLexer):
             (r'[E]?"', String, combined('stringescape', 'string')),
 
             # names
-            (r'@[a-zA-Z0-9_.]+', Name.Decorator),
-            (r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            (r'@[\w.]+', Name.Decorator),
+            (r'[a-zA-Z_]\w*', Name),
 
             # numbers
             (r'(\d+(_\d+)+\.\d*|\d*\.\d+(_\d+)+)([eEf][+-]?[0-9]+)?', Number.Float),
             (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float),
             (r'\d+(_\d+)+[eEf][+-]?[0-9]+', Number.Float),
             (r'\d+[eEf][+-]?[0-9]+', Number.Float),
-            (r'0b[01]+(_[01]+)+', Number.Binary),
-            (r'0b[01]+', Number.Binary),
+            (r'0b[01]+(_[01]+)+', Number.Bin),
+            (r'0b[01]+', Number.Bin),
             (r'0o[0-7]+(_[0-7]+)+', Number.Oct),
             (r'0o[0-7]+', Number.Oct),
             (r'0x[a-fA-F0-9]+(_[a-fA-F0-9]+)+', Number.Hex),
@@ -114,13 +116,13 @@ class JuliaLexer(RegexLexer):
         ],
 
         'funcname': [
-            ('[a-zA-Z_][a-zA-Z0-9_]*', Name.Function, '#pop'),
+            ('[a-zA-Z_]\w*', Name.Function, '#pop'),
             ('\([^\s\w{]{1,2}\)', Operator, '#pop'),
             ('[^\s\w{]{1,2}', Operator, '#pop'),
         ],
 
         'typename': [
-            ('[a-zA-Z_][a-zA-Z0-9_]*', Name.Class, '#pop')
+            ('[a-zA-Z_]\w*', Name.Class, '#pop')
         ],
 
         'stringescape': [
@@ -131,7 +133,7 @@ class JuliaLexer(RegexLexer):
         'string': [
             (r'"', String, '#pop'),
             (r'\\\\|\\"|\\\n', String.Escape), # included here for raw strings
-            (r'\$(\([a-zA-Z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?',
+            (r'\$(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?',
                 String.Interpol),
             (r'[^\\"$]+', String),
             # quotes, dollar signs, and backslashes must be parsed one at a time
@@ -151,7 +153,7 @@ class JuliaConsoleLexer(Lexer):
     """
     For Julia console sessions. Modeled after MatlabSessionLexer.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
     name = 'Julia console'
     aliases = ['jlcon']
@@ -167,8 +169,8 @@ class JuliaConsoleLexer(Lexer):
 
             if line.startswith('julia>'):
                 insertions.append((len(curcode),
-                                   [(0, Generic.Prompt, line[:3])]))
-                curcode += line[3:]
+                                   [(0, Generic.Prompt, line[:6])]))
+                curcode += line[6:]
 
             elif line.startswith('      '):
 
@@ -200,7 +202,7 @@ class MuPADLexer(RegexLexer):
     A `MuPAD <http://www.mupad.com>`_ lexer.
     Contributed by Christopher Creutzig <christopher@creutzig.de>.
 
-    *New in Pygments 0.8.*
+    .. versionadded:: 0.8
     """
     name = 'MuPAD'
     aliases = ['mupad']
@@ -270,7 +272,7 @@ class MatlabLexer(RegexLexer):
     """
     For Matlab source code.
 
-    *New in Pygments 0.10.*
+    .. versionadded:: 0.10
     """
     name = 'Matlab'
     aliases = ['matlab']
@@ -348,14 +350,14 @@ class MatlabLexer(RegexLexer):
 
             # quote can be transpose, instead of string:
             # (not great, but handles common cases...)
-            (r'(?<=[\w\)\]])\'', Operator),
+            (r'(?<=[\w\)\].])\'+', Operator),
 
             (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float),
             (r'\d+[eEf][+-]?[0-9]+', Number.Float),
             (r'\d+', Number.Integer),
 
-            (r'(?<![\w\)\]])\'', String, 'string'),
-            ('[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            (r'(?<![\w\)\].])\'', String, 'string'),
+            ('[a-zA-Z_]\w*', Name),
             (r'.', Text),
         ],
         'string': [
@@ -376,10 +378,9 @@ class MatlabLexer(RegexLexer):
 
     def analyse_text(text):
         if re.match('^\s*%', text, re.M): # comment
-            return 0.9
+            return 0.2
         elif re.match('^!\w+', text, re.M): # system cmd
-            return 0.9
-        return 0.1
+            return 0.2
 
 
 line_re  = re.compile('.*?\n')
@@ -389,7 +390,7 @@ class MatlabSessionLexer(Lexer):
     For Matlab sessions.  Modeled after PythonConsoleLexer.
     Contributed by Ken Schutte <kschutte@csail.mit.edu>.
 
-    *New in Pygments 0.10.*
+    .. versionadded:: 0.10
     """
     name = 'Matlab session'
     aliases = ['matlabsession']
@@ -403,17 +404,22 @@ class MatlabSessionLexer(Lexer):
         for match in line_re.finditer(text):
             line = match.group()
 
-            if line.startswith('>>'):
+            if line.startswith('>> '):
                 insertions.append((len(curcode),
                                    [(0, Generic.Prompt, line[:3])]))
                 curcode += line[3:]
 
+            elif line.startswith('>>'):
+                insertions.append((len(curcode),
+                                   [(0, Generic.Prompt, line[:2])]))
+                curcode += line[2:]
+
             elif line.startswith('???'):
 
                 idx = len(curcode)
 
                 # without is showing error on same line as before...?
-                line = "\n" + line
+                #line = "\n" + line
                 token = (0, Generic.Traceback, line)
                 insertions.append((idx, [token]))
 
@@ -427,6 +433,7 @@ class MatlabSessionLexer(Lexer):
 
                 yield match.start(), Generic.Output, line
 
+        print(insertions)
         if curcode: # or item:
             for item in do_insertions(
                 insertions, mlexer.get_tokens_unprocessed(curcode)):
@@ -437,7 +444,7 @@ class OctaveLexer(RegexLexer):
     """
     For GNU Octave source code.
 
-    *New in Pygments 1.5.*
+    .. versionadded:: 1.5
     """
     name = 'Octave'
     aliases = ['octave']
@@ -806,10 +813,10 @@ class OctaveLexer(RegexLexer):
 
             # quote can be transpose, instead of string:
             # (not great, but handles common cases...)
-            (r'(?<=[\w\)\]])\'', Operator),
-            (r'(?<![\w\)\]])\'', String, 'string'),
+            (r'(?<=[\w\)\].])\'+', Operator),
+            (r'(?<![\w\)\].])\'', String, 'string'),
 
-            ('[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            ('[a-zA-Z_]\w*', Name),
             (r'.', Text),
         ],
         'string': [
@@ -823,16 +830,12 @@ class OctaveLexer(RegexLexer):
         ],
     }
 
-    def analyse_text(text):
-        if re.match('^\s*[%#]', text, re.M): #Comment
-            return 0.1
-
 
 class ScilabLexer(RegexLexer):
     """
     For Scilab source code.
 
-    *New in Pygments 1.5.*
+    .. versionadded:: 1.5
     """
     name = 'Scilab'
     aliases = ['scilab']
@@ -871,14 +874,14 @@ class ScilabLexer(RegexLexer):
 
             # quote can be transpose, instead of string:
             # (not great, but handles common cases...)
-            (r'(?<=[\w\)\]])\'', Operator),
-            (r'(?<![\w\)\]])\'', String, 'string'),
+            (r'(?<=[\w\)\].])\'+', Operator),
+            (r'(?<![\w\)\].])\'', String, 'string'),
 
             (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float),
             (r'\d+[eEf][+-]?[0-9]+', Number.Float),
             (r'\d+', Number.Integer),
 
-            ('[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            ('[a-zA-Z_]\w*', Name),
             (r'.', Text),
         ],
         'string': [
@@ -898,7 +901,7 @@ class NumPyLexer(PythonLexer):
     """
     A Python lexer recognizing Numerical Python builtins.
 
-    *New in Pygments 0.10.*
+    .. versionadded:: 0.10
     """
 
     name = 'NumPy'
@@ -1039,15 +1042,266 @@ class SLexer(RegexLexer):
     """
     For S, S-plus, and R source code.
 
-    *New in Pygments 0.10.*
+    .. versionadded:: 0.10
     """
 
     name = 'S'
     aliases = ['splus', 's', 'r']
-    filenames = ['*.S', '*.R', '.Rhistory', '.Rprofile']
+    filenames = ['*.S', '*.R', '.Rhistory', '.Rprofile', '.Renviron']
     mimetypes = ['text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r',
                  'text/x-R', 'text/x-r-history', 'text/x-r-profile']
 
+    builtins_base = [
+            'Arg', 'Conj', 'Cstack_info', 'Encoding', 'FALSE',
+            'Filter', 'Find', 'I', 'ISOdate', 'ISOdatetime', 'Im', 'Inf',
+            'La\.svd', 'Map', 'Math\.Date', 'Math\.POSIXt', 'Math\.data\.frame',
+            'Math\.difftime', 'Math\.factor', 'Mod', 'NA_character_',
+            'NA_complex_', 'NA_real_', 'NCOL', 'NROW', 'NULLNA_integer_', 'NaN',
+            'Negate', 'NextMethod', 'Ops\.Date', 'Ops\.POSIXt', 'Ops\.data\.frame',
+            'Ops\.difftime', 'Ops\.factor', 'Ops\.numeric_version', 'Ops\.ordered',
+            'Position', 'R\.Version', 'R\.home', 'R\.version', 'R\.version\.string',
+            'RNGkind', 'RNGversion', 'R_system_version', 'Re', 'Recall',
+            'Reduce', 'Summary\.Date', 'Summary\.POSIXct', 'Summary\.POSIXlt',
+            'Summary\.data\.frame', 'Summary\.difftime', 'Summary\.factor',
+            'Summary\.numeric_version', 'Summary\.ordered', 'Sys\.Date',
+            'Sys\.chmod', 'Sys\.getenv', 'Sys\.getlocale', 'Sys\.getpid',
+            'Sys\.glob', 'Sys\.info', 'Sys\.localeconv', 'Sys\.readlink',
+            'Sys\.setFileTime', 'Sys\.setenv', 'Sys\.setlocale', 'Sys\.sleep',
+            'Sys\.time', 'Sys\.timezone', 'Sys\.umask', 'Sys\.unsetenv',
+            'Sys\.which', 'TRUE', 'UseMethod', 'Vectorize', 'abbreviate', 'abs',
+            'acos', 'acosh', 'addNA', 'addTaskCallback', 'agrep', 'alist',
+            'all', 'all\.equal', 'all\.equal\.POSIXct', 'all\.equal\.character',
+            'all\.equal\.default', 'all\.equal\.factor', 'all\.equal\.formula',
+            'all\.equal\.language', 'all\.equal\.list', 'all\.equal\.numeric',
+            'all\.equal\.raw', 'all\.names', 'all\.vars', 'any', 'anyDuplicated',
+            'anyDuplicated\.array', 'anyDuplicated\.data\.frame',
+            'anyDuplicated\.default', 'anyDuplicated\.matrix', 'aperm',
+            'aperm\.default', 'aperm\.table', 'append', 'apply', 'args',
+            'arrayInd', 'as\.Date', 'as\.Date\.POSIXct', 'as\.Date\.POSIXlt',
+            'as\.Date\.character', 'as\.Date\.date', 'as\.Date\.dates',
+            'as\.Date\.default', 'as\.Date\.factor', 'as\.Date\.numeric',
+            'as\.POSIXct', 'as\.POSIXct\.Date', 'as\.POSIXct\.POSIXlt',
+            'as\.POSIXct\.date', 'as\.POSIXct\.dates', 'as\.POSIXct\.default',
+            'as\.POSIXct\.numeric', 'as\.POSIXlt', 'as\.POSIXlt\.Date',
+            'as\.POSIXlt\.POSIXct', 'as\.POSIXlt\.character', 'as\.POSIXlt\.date',
+            'as\.POSIXlt\.dates', 'as\.POSIXlt\.default', 'as\.POSIXlt\.factor',
+            'as\.POSIXlt\.numeric', 'as\.array', 'as\.array\.default', 'as\.call',
+            'as\.character', 'as\.character\.Date', 'as\.character\.POSIXt',
+            'as\.character\.condition', 'as\.character\.default',
+            'as\.character\.error', 'as\.character\.factor', 'as\.character\.hexmode',
+            'as\.character\.numeric_version', 'as\.character\.octmode',
+            'as\.character\.srcref', 'as\.complex', 'as\.data\.frame',
+            'as\.data\.frame\.AsIs', 'as\.data\.frame\.Date', 'as\.data\.frame\.POSIXct',
+            'as\.data\.frame\.POSIXlt', 'as\.data\.frame\.array',
+            'as\.data\.frame\.character', 'as\.data\.frame\.complex',
+            'as\.data\.frame\.data\.frame', 'as\.data\.frame\.default',
+            'as\.data\.frame\.difftime', 'as\.data\.frame\.factor',
+            'as\.data\.frame\.integer', 'as\.data\.frame\.list',
+            'as\.data\.frame\.logical', 'as\.data\.frame\.matrix',
+            'as\.data\.frame\.model\.matrix', 'as\.data\.frame\.numeric',
+            'as\.data\.frame\.numeric_version', 'as\.data\.frame\.ordered',
+            'as\.data\.frame\.raw', 'as\.data\.frame\.table', 'as\.data\.frame\.ts',
+            'as\.data\.frame\.vector', 'as\.difftime', 'as\.double',
+            'as\.double\.POSIXlt', 'as\.double\.difftime', 'as\.environment',
+            'as\.expression', 'as\.expression\.default', 'as\.factor',
+            'as\.function', 'as\.function\.default', 'as\.hexmode', 'as\.integer',
+            'as\.list', 'as\.list\.Date', 'as\.list\.POSIXct', 'as\.list\.data\.frame',
+            'as\.list\.default', 'as\.list\.environment', 'as\.list\.factor',
+            'as\.list\.function', 'as\.list\.numeric_version', 'as\.logical',
+            'as\.logical\.factor', 'as\.matrix', 'as\.matrix\.POSIXlt',
+            'as\.matrix\.data\.frame', 'as\.matrix\.default', 'as\.matrix\.noquote',
+            'as\.name', 'as\.null', 'as\.null\.default', 'as\.numeric',
+            'as\.numeric_version', 'as\.octmode', 'as\.ordered',
+            'as\.package_version', 'as\.pairlist', 'as\.qr', 'as\.raw', 'as\.single',
+            'as\.single\.default', 'as\.symbol', 'as\.table', 'as\.table\.default',
+            'as\.vector', 'as\.vector\.factor', 'asNamespace', 'asS3', 'asS4',
+            'asin', 'asinh', 'assign', 'atan', 'atan2', 'atanh',
+            'attachNamespace', 'attr', 'attr\.all\.equal', 'attributes',
+            'autoload', 'autoloader', 'backsolve', 'baseenv', 'basename',
+            'besselI', 'besselJ', 'besselK', 'besselY', 'beta',
+            'bindingIsActive', 'bindingIsLocked', 'bindtextdomain', 'bitwAnd',
+            'bitwNot', 'bitwOr', 'bitwShiftL', 'bitwShiftR', 'bitwXor', 'body',
+            'bquote', 'browser', 'browserCondition', 'browserSetDebug',
+            'browserText', 'builtins', 'by', 'by\.data\.frame', 'by\.default',
+            'bzfile', 'c\.Date', 'c\.POSIXct', 'c\.POSIXlt', 'c\.noquote',
+            'c\.numeric_version', 'call', 'callCC', 'capabilities', 'casefold',
+            'cat', 'category', 'cbind', 'cbind\.data\.frame', 'ceiling',
+            'char\.expand', 'charToRaw', 'charmatch', 'chartr', 'check_tzones',
+            'chol', 'chol\.default', 'chol2inv', 'choose', 'class',
+            'clearPushBack', 'close', 'close\.connection', 'close\.srcfile',
+            'close\.srcfilealias', 'closeAllConnections', 'col', 'colMeans',
+            'colSums', 'colnames', 'commandArgs', 'comment', 'computeRestarts',
+            'conditionCall', 'conditionCall\.condition', 'conditionMessage',
+            'conditionMessage\.condition', 'conflicts', 'contributors', 'cos',
+            'cosh', 'crossprod', 'cummax', 'cummin', 'cumprod', 'cumsum', 'cut',
+            'cut\.Date', 'cut\.POSIXt', 'cut\.default', 'dQuote', 'data\.class',
+            'data\.matrix', 'date', 'debug', 'debugonce',
+            'default\.stringsAsFactors', 'delayedAssign', 'deparse', 'det',
+            'determinant', 'determinant\.matrix', 'dget', 'diag', 'diff',
+            'diff\.Date', 'diff\.POSIXt', 'diff\.default', 'difftime', 'digamma',
+            'dim', 'dim\.data\.frame', 'dimnames', 'dimnames\.data\.frame', 'dir',
+            'dir\.create', 'dirname', 'do\.call', 'dput', 'drop', 'droplevels',
+            'droplevels\.data\.frame', 'droplevels\.factor', 'dump', 'duplicated',
+            'duplicated\.POSIXlt', 'duplicated\.array', 'duplicated\.data\.frame',
+            'duplicated\.default', 'duplicated\.matrix',
+            'duplicated\.numeric_version', 'dyn\.load', 'dyn\.unload', 'eapply',
+            'eigen', 'else', 'emptyenv', 'enc2native', 'enc2utf8',
+            'encodeString', 'enquote', 'env\.profile', 'environment',
+            'environmentIsLocked', 'environmentName', 'eval', 'eval\.parent',
+            'evalq', 'exists', 'exp', 'expand\.grid', 'expm1', 'expression',
+            'factor', 'factorial', 'fifo', 'file', 'file\.access', 'file\.append',
+            'file\.choose', 'file\.copy', 'file\.create', 'file\.exists',
+            'file\.info', 'file\.link', 'file\.path', 'file\.remove', 'file\.rename',
+            'file\.show', 'file\.symlink', 'find\.package', 'findInterval',
+            'findPackageEnv', 'findRestart', 'floor', 'flush',
+            'flush\.connection', 'force', 'formals', 'format',
+            'format\.AsIs', 'format\.Date', 'format\.POSIXct', 'format\.POSIXlt',
+            'format\.data\.frame', 'format\.default', 'format\.difftime',
+            'format\.factor', 'format\.hexmode', 'format\.info',
+            'format\.libraryIQR', 'format\.numeric_version', 'format\.octmode',
+            'format\.packageInfo', 'format\.pval', 'format\.summaryDefault',
+            'formatC', 'formatDL', 'forwardsolve', 'gamma', 'gc', 'gc\.time',
+            'gcinfo', 'gctorture', 'gctorture2', 'get', 'getAllConnections',
+            'getCallingDLL', 'getCallingDLLe', 'getConnection',
+            'getDLLRegisteredRoutines', 'getDLLRegisteredRoutines\.DLLInfo',
+            'getDLLRegisteredRoutines\.character', 'getElement',
+            'getExportedValue', 'getHook', 'getLoadedDLLs', 'getNamespace',
+            'getNamespaceExports', 'getNamespaceImports', 'getNamespaceInfo',
+            'getNamespaceName', 'getNamespaceUsers', 'getNamespaceVersion',
+            'getNativeSymbolInfo', 'getOption', 'getRversion', 'getSrcLines',
+            'getTaskCallbackNames', 'geterrmessage', 'gettext', 'gettextf',
+            'getwd', 'gl', 'globalenv', 'gregexpr', 'grep', 'grepRaw', 'grepl',
+            'gsub', 'gzcon', 'gzfile', 'head', 'iconv', 'iconvlist',
+            'icuSetCollate', 'identical', 'identity', 'ifelse', 'importIntoEnv',
+            'in', 'inherits', 'intToBits', 'intToUtf8', 'interaction', 'interactive',
+            'intersect', 'inverse\.rle', 'invisible', 'invokeRestart',
+            'invokeRestartInteractively', 'is\.R', 'is\.array', 'is\.atomic',
+            'is\.call', 'is\.character', 'is\.complex', 'is\.data\.frame',
+            'is\.double', 'is\.element', 'is\.environment', 'is\.expression',
+            'is\.factor', 'is\.finite', 'is\.function', 'is\.infinite',
+            'is\.integer', 'is\.language', 'is\.list', 'is\.loaded', 'is\.logical',
+            'is\.matrix', 'is\.na', 'is\.na\.POSIXlt', 'is\.na\.data\.frame',
+            'is\.na\.numeric_version', 'is\.name', 'is\.nan', 'is\.null',
+            'is\.numeric', 'is\.numeric\.Date', 'is\.numeric\.POSIXt',
+            'is\.numeric\.difftime', 'is\.numeric_version', 'is\.object',
+            'is\.ordered', 'is\.package_version', 'is\.pairlist', 'is\.primitive',
+            'is\.qr', 'is\.raw', 'is\.recursive', 'is\.single', 'is\.symbol',
+            'is\.table', 'is\.unsorted', 'is\.vector', 'isBaseNamespace',
+            'isIncomplete', 'isNamespace', 'isOpen', 'isRestart', 'isS4',
+            'isSeekable', 'isSymmetric', 'isSymmetric\.matrix', 'isTRUE',
+            'isatty', 'isdebugged', 'jitter', 'julian', 'julian\.Date',
+            'julian\.POSIXt', 'kappa', 'kappa\.default', 'kappa\.lm', 'kappa\.qr',
+            'kronecker', 'l10n_info', 'labels', 'labels\.default', 'lapply',
+            'lazyLoad', 'lazyLoadDBexec', 'lazyLoadDBfetch', 'lbeta', 'lchoose',
+            'length', 'length\.POSIXlt', 'letters', 'levels', 'levels\.default',
+            'lfactorial', 'lgamma', 'library\.dynam', 'library\.dynam\.unload',
+            'licence', 'license', 'list\.dirs', 'list\.files', 'list2env', 'load',
+            'loadNamespace', 'loadedNamespaces', 'loadingNamespaceInfo',
+            'local', 'lockBinding', 'lockEnvironment', 'log', 'log10', 'log1p',
+            'log2', 'logb', 'lower\.tri', 'ls', 'make\.names', 'make\.unique',
+            'makeActiveBinding', 'mapply', 'margin\.table', 'mat\.or\.vec',
+            'match', 'match\.arg', 'match\.call', 'match\.fun', 'max', 'max\.col',
+            'mean', 'mean\.Date', 'mean\.POSIXct', 'mean\.POSIXlt', 'mean\.default',
+            'mean\.difftime', 'mem\.limits', 'memCompress', 'memDecompress',
+            'memory\.profile', 'merge', 'merge\.data\.frame', 'merge\.default',
+            'message', 'mget', 'min', 'missing', 'mode', 'month\.abb',
+            'month\.name', 'months', 'months\.Date', 'months\.POSIXt',
+            'months\.abb', 'months\.nameletters', 'names', 'names\.POSIXlt',
+            'namespaceExport', 'namespaceImport', 'namespaceImportClasses',
+            'namespaceImportFrom', 'namespaceImportMethods', 'nargs', 'nchar',
+            'ncol', 'new\.env', 'ngettext', 'nlevels', 'noquote', 'norm',
+            'normalizePath', 'nrow', 'numeric_version', 'nzchar', 'objects',
+            'oldClass', 'on\.exit', 'open', 'open\.connection', 'open\.srcfile',
+            'open\.srcfilealias', 'open\.srcfilecopy', 'options', 'order',
+            'ordered', 'outer', 'packBits', 'packageEvent',
+            'packageHasNamespace', 'packageStartupMessage', 'package_version',
+            'pairlist', 'parent\.env', 'parent\.frame', 'parse',
+            'parseNamespaceFile', 'paste', 'paste0', 'path\.expand',
+            'path\.package', 'pipe', 'pmatch', 'pmax', 'pmax\.int', 'pmin',
+            'pmin\.int', 'polyroot', 'pos\.to\.env', 'pretty', 'pretty\.default',
+            'prettyNum', 'print', 'print\.AsIs', 'print\.DLLInfo',
+            'print\.DLLInfoList', 'print\.DLLRegisteredRoutines', 'print\.Date',
+            'print\.NativeRoutineList', 'print\.POSIXct', 'print\.POSIXlt',
+            'print\.by', 'print\.condition', 'print\.connection',
+            'print\.data\.frame', 'print\.default', 'print\.difftime',
+            'print\.factor', 'print\.function', 'print\.hexmode',
+            'print\.libraryIQR', 'print\.listof', 'print\.noquote',
+            'print\.numeric_version', 'print\.octmode', 'print\.packageInfo',
+            'print\.proc_time', 'print\.restart', 'print\.rle',
+            'print\.simple\.list', 'print\.srcfile', 'print\.srcref',
+            'print\.summary\.table', 'print\.summaryDefault', 'print\.table',
+            'print\.warnings', 'prmatrix', 'proc\.time', 'prod', 'prop\.table',
+            'provideDimnames', 'psigamma', 'pushBack', 'pushBackLength', 'q',
+            'qr', 'qr\.Q', 'qr\.R', 'qr\.X', 'qr\.coef', 'qr\.default', 'qr\.fitted',
+            'qr\.qty', 'qr\.qy', 'qr\.resid', 'qr\.solve', 'quarters',
+            'quarters\.Date', 'quarters\.POSIXt', 'quit', 'quote', 'range',
+            'range\.default', 'rank', 'rapply', 'raw', 'rawConnection',
+            'rawConnectionValue', 'rawShift', 'rawToBits', 'rawToChar', 'rbind',
+            'rbind\.data\.frame', 'rcond', 'read\.dcf', 'readBin', 'readChar',
+            'readLines', 'readRDS', 'readRenviron', 'readline', 'reg\.finalizer',
+            'regexec', 'regexpr', 'registerS3method', 'registerS3methods',
+            'regmatches', 'remove', 'removeTaskCallback', 'rep', 'rep\.Date',
+            'rep\.POSIXct', 'rep\.POSIXlt', 'rep\.factor', 'rep\.int',
+            'rep\.numeric_version', 'rep_len', 'replace', 'replicate',
+            'requireNamespace', 'restartDescription', 'restartFormals',
+            'retracemem', 'rev', 'rev\.default', 'rle', 'rm', 'round',
+            'round\.Date', 'round\.POSIXt', 'row', 'row\.names',
+            'row\.names\.data\.frame', 'row\.names\.default', 'rowMeans', 'rowSums',
+            'rownames', 'rowsum', 'rowsum\.data\.frame', 'rowsum\.default',
+            'sQuote', 'sample', 'sample\.int', 'sapply', 'save', 'save\.image',
+            'saveRDS', 'scale', 'scale\.default', 'scan', 'search',
+            'searchpaths', 'seek', 'seek\.connection', 'seq', 'seq\.Date',
+            'seq\.POSIXt', 'seq\.default', 'seq\.int', 'seq_along', 'seq_len',
+            'sequence', 'serialize', 'set\.seed', 'setHook', 'setNamespaceInfo',
+            'setSessionTimeLimit', 'setTimeLimit', 'setdiff', 'setequal',
+            'setwd', 'shQuote', 'showConnections', 'sign', 'signalCondition',
+            'signif', 'simpleCondition', 'simpleError', 'simpleMessage',
+            'simpleWarning', 'simplify2array', 'sin', 'single',
+            'sinh', 'sink', 'sink\.number', 'slice\.index', 'socketConnection',
+            'socketSelect', 'solve', 'solve\.default', 'solve\.qr', 'sort',
+            'sort\.POSIXlt', 'sort\.default', 'sort\.int', 'sort\.list', 'split',
+            'split\.Date', 'split\.POSIXct', 'split\.data\.frame', 'split\.default',
+            'sprintf', 'sqrt', 'srcfile', 'srcfilealias', 'srcfilecopy',
+            'srcref', 'standardGeneric', 'stderr', 'stdin', 'stdout', 'stop',
+            'stopifnot', 'storage\.mode', 'strftime', 'strptime', 'strsplit',
+            'strtoi', 'strtrim', 'structure', 'strwrap', 'sub', 'subset',
+            'subset\.data\.frame', 'subset\.default', 'subset\.matrix',
+            'substitute', 'substr', 'substring', 'sum', 'summary',
+            'summary\.Date', 'summary\.POSIXct', 'summary\.POSIXlt',
+            'summary\.connection', 'summary\.data\.frame', 'summary\.default',
+            'summary\.factor', 'summary\.matrix', 'summary\.proc_time',
+            'summary\.srcfile', 'summary\.srcref', 'summary\.table',
+            'suppressMessages', 'suppressPackageStartupMessages',
+            'suppressWarnings', 'svd', 'sweep', 'sys\.call', 'sys\.calls',
+            'sys\.frame', 'sys\.frames', 'sys\.function', 'sys\.load\.image',
+            'sys\.nframe', 'sys\.on\.exit', 'sys\.parent', 'sys\.parents',
+            'sys\.save\.image', 'sys\.source', 'sys\.status', 'system',
+            'system\.file', 'system\.time', 'system2', 't', 't\.data\.frame',
+            't\.default', 'table', 'tabulate', 'tail', 'tan', 'tanh', 'tapply',
+            'taskCallbackManager', 'tcrossprod', 'tempdir', 'tempfile',
+            'testPlatformEquivalence', 'textConnection', 'textConnectionValue',
+            'toString', 'toString\.default', 'tolower', 'topenv', 'toupper',
+            'trace', 'traceback', 'tracemem', 'tracingState', 'transform',
+            'transform\.data\.frame', 'transform\.default', 'trigamma', 'trunc',
+            'trunc\.Date', 'trunc\.POSIXt', 'truncate', 'truncate\.connection',
+            'try', 'tryCatch', 'typeof', 'unclass', 'undebug', 'union',
+            'unique', 'unique\.POSIXlt', 'unique\.array', 'unique\.data\.frame',
+            'unique\.default', 'unique\.matrix', 'unique\.numeric_version',
+            'units', 'units\.difftime', 'unix\.time', 'unlink', 'unlist',
+            'unloadNamespace', 'unlockBinding', 'unname', 'unserialize',
+            'unsplit', 'untrace', 'untracemem', 'unz', 'upper\.tri', 'url',
+            'utf8ToInt', 'vapply', 'version', 'warning', 'warnings', 'weekdays',
+            'weekdays\.Date', 'weekdays\.POSIXt', 'which', 'which\.max',
+            'which\.min', 'with', 'with\.default', 'withCallingHandlers',
+            'withRestarts', 'withVisible', 'within', 'within\.data\.frame',
+            'within\.list', 'write', 'write\.dcf', 'writeBin', 'writeChar',
+            'writeLines', 'xor', 'xor\.hexmode', 'xor\.octmode',
+            'xpdrows\.data\.frame', 'xtfrm', 'xtfrm\.AsIs', 'xtfrm\.Date',
+            'xtfrm\.POSIXct', 'xtfrm\.POSIXlt', 'xtfrm\.Surv', 'xtfrm\.default',
+            'xtfrm\.difftime', 'xtfrm\.factor', 'xtfrm\.numeric_version', 'xzfile',
+            'zapsmall'
+        ]
+
     tokens = {
         'comments': [
             (r'#.*$', Comment.Single),
@@ -1061,9 +1315,19 @@ class SLexer(RegexLexer):
             (r'\[{1,2}|\]{1,2}|\(|\)|;|,', Punctuation),
         ],
         'keywords': [
+            (r'(' + r'|'.join(builtins_base) + r')'
+             r'(?![\w\. =])',
+             Keyword.Pseudo),
             (r'(if|else|for|while|repeat|in|next|break|return|switch|function)'
-             r'(?![0-9a-zA-Z\._])',
-             Keyword.Reserved)
+             r'(?![\w\.])',
+             Keyword.Reserved),
+            (r'(array|category|character|complex|double|function|integer|list|'
+             r'logical|matrix|numeric|vector|data.frame|c)'
+             r'(?![\w\.])',
+             Keyword.Type),
+            (r'(library|require|attach|detach|source)'
+             r'(?![\w\.])',
+             Keyword.Namespace)
         ],
         'operators': [
             (r'<<?-|->>?|-|==|<=|>=|<|>|&&?|!=|\|\|?|\?', Operator),
@@ -1071,16 +1335,16 @@ class SLexer(RegexLexer):
         ],
         'builtin_symbols': [
             (r'(NULL|NA(_(integer|real|complex|character)_)?|'
-             r'Inf|TRUE|FALSE|NaN|\.\.(\.|[0-9]+))'
+             r'letters|LETTERS|Inf|TRUE|FALSE|NaN|pi|\.\.(\.|[0-9]+))'
              r'(?![0-9a-zA-Z\._])',
              Keyword.Constant),
-            (r'(T|F)\b', Keyword.Variable),
+            (r'(T|F)\b', Name.Builtin.Pseudo),
         ],
         'numbers': [
             # hex number
             (r'0[xX][a-fA-F0-9]+([pP][0-9]+)?[Li]?', Number.Hex),
             # decimal number
-            (r'[+-]?([0-9]+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?[Li]?',
+            (r'[+-]?([0-9]+(\.[0-9]+)?|\.[0-9]+|\.)([eE][+-]?[0-9]+)?[Li]?',
              Number),
         ],
         'statements': [
@@ -1127,7 +1391,7 @@ class BugsLexer(RegexLexer):
     Pygments Lexer for `OpenBugs <http://www.openbugs.info/w/>`_ and WinBugs
     models.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
 
     name = 'BUGS'
@@ -1197,7 +1461,7 @@ class BugsLexer(RegexLexer):
              % r'|'.join(_FUNCTIONS + _DISTRIBUTIONS),
              Name.Builtin),
             # Regular variable names
-            (r'[A-Za-z][A-Za-z0-9_.]*', Name),
+            (r'[A-Za-z][\w.]*', Name),
             # Number Literals
             (r'[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?', Number),
             # Punctuation
@@ -1222,7 +1486,7 @@ class JagsLexer(RegexLexer):
     """
     Pygments Lexer for JAGS.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
 
     name = 'JAGS'
@@ -1257,7 +1521,7 @@ class JagsLexer(RegexLexer):
             ],
         'names' : [
             # Regular variable names
-            (r'[a-zA-Z][a-zA-Z0-9_.]*\b', Name),
+            (r'[a-zA-Z][\w.]*\b', Name),
             ],
         'comments' : [
             # do not use stateful comments
@@ -1308,11 +1572,10 @@ class JagsLexer(RegexLexer):
 class StanLexer(RegexLexer):
     """Pygments Lexer for Stan models.
 
-    The Stan modeling language is specified in the *Stan 1.3.0
-    Modeling Language Manual* `pdf
-    <http://code.google.com/p/stan/downloads/detail?name=stan-reference-1.3.0.pdf>`_.
+    The Stan modeling language is specified in the *Stan Modeling Language User's Guide and Reference Manual, v2.2.0*,
+    `pdf <https://github.com/stan-dev/stan/releases/download/v2.2.0/stan-reference-2.2.0.pdf>`__.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
 
     name = 'Stan'
@@ -1355,10 +1618,10 @@ class StanLexer(RegexLexer):
                          + _stan_builtins.DISTRIBUTIONS),
              Name.Builtin),
             # Special names ending in __, like lp__
-            (r'[A-Za-z][A-Za-z0-9_]*__\b', Name.Builtin.Pseudo),
+            (r'[A-Za-z]\w*__\b', Name.Builtin.Pseudo),
             (r'(%s)\b' % r'|'.join(_stan_builtins.RESERVED), Keyword.Reserved),
             # Regular variable names
-            (r'[A-Za-z][A-Za-z0-9_]*\b', Name),
+            (r'[A-Za-z]\w*\b', Name),
             # Real Literals
             (r'-?[0-9]+(\.[0-9]+)?[eE]-?[0-9]+', Number.Float),
             (r'-?[0-9]*\.[0-9]*', Number.Float),
@@ -1385,13 +1648,15 @@ class IDLLexer(RegexLexer):
     """
     Pygments Lexer for IDL (Interactive Data Language).
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
     name = 'IDL'
     aliases = ['idl']
     filenames = ['*.pro']
     mimetypes = ['text/idl']
 
+    flags = re.IGNORECASE | re.MULTILINE
+
     _RESERVED = ['and', 'begin', 'break', 'case', 'common', 'compile_opt',
                  'continue', 'do', 'else', 'end', 'endcase', 'elseelse',
                  'endfor', 'endforeach', 'endif', 'endrep', 'endswitch',
@@ -1413,7 +1678,7 @@ class IDLLexer(RegexLexer):
                     'broyden', 'butterworth', 'bytarr', 'byte', 'byteorder',
                     'bytscl', 'caldat', 'calendar', 'call_external',
                     'call_function', 'call_method', 'call_procedure', 'canny',
-                    'catch', 'cd', 'cdf_[0-9a-za-z_]*', 'ceil', 'chebyshev',
+                    'catch', 'cd', 'cdf_\w*', 'ceil', 'chebyshev',
                     'check_math',
                     'chisqr_cvf', 'chisqr_pdf', 'choldc', 'cholsol', 'cindgen',
                     'cir_3pnt', 'close', 'cluster', 'cluster_tree', 'clust_wts',
@@ -1447,7 +1712,7 @@ class IDLLexer(RegexLexer):
                     'dlm_load', 'dlm_register', 'doc_library', 'double',
                     'draw_roi', 'edge_dog', 'efont', 'eigenql', 'eigenvec',
                     'ellipse', 'elmhes', 'emboss', 'empty', 'enable_sysrtn',
-                    'eof', 'eos_[0-9a-za-z_]*', 'erase', 'erf', 'erfc', 'erfcx',
+                    'eof', 'eos_\w*', 'erase', 'erf', 'erfc', 'erfcx',
                     'erode', 'errorplot', 'errplot', 'estimator_filter',
                     'execute', 'exit', 'exp', 'expand', 'expand_path', 'expint',
                     'extrac', 'extract_slice', 'factorial', 'fft', 'filepath',
@@ -1464,11 +1729,11 @@ class IDLLexer(RegexLexer):
                     'gauss_cvf', 'gauss_pdf', 'gauss_smooth', 'getenv',
                     'getwindows', 'get_drive_list', 'get_dxf_objects',
                     'get_kbrd', 'get_login_info', 'get_lun', 'get_screen_size',
-                    'greg2jul', 'grib_[0-9a-za-z_]*', 'grid3', 'griddata',
+                    'greg2jul', 'grib_\w*', 'grid3', 'griddata',
                     'grid_input', 'grid_tps', 'gs_iter',
-                    'h5[adfgirst]_[0-9a-za-z_]*', 'h5_browser', 'h5_close',
+                    'h5[adfgirst]_\w*', 'h5_browser', 'h5_close',
                     'h5_create', 'h5_get_libversion', 'h5_open', 'h5_parse',
-                    'hanning', 'hash', 'hdf_[0-9a-za-z_]*', 'heap_free',
+                    'hanning', 'hash', 'hdf_\w*', 'heap_free',
                     'heap_gc', 'heap_nosave', 'heap_refcount', 'heap_save',
                     'help', 'hilbert', 'histogram', 'hist_2d', 'hist_equal',
                     'hls', 'hough', 'hqr', 'hsv', 'h_eq_ct', 'h_eq_int',
@@ -1516,7 +1781,7 @@ class IDLLexer(RegexLexer):
                     'modifyct', 'moment', 'morph_close', 'morph_distance',
                     'morph_gradient', 'morph_hitormiss', 'morph_open',
                     'morph_thin', 'morph_tophat', 'multi', 'm_correlate',
-                    'ncdf_[0-9a-za-z_]*', 'newton', 'noise_hurl', 'noise_pick',
+                    'ncdf_\w*', 'newton', 'noise_hurl', 'noise_pick',
                     'noise_scatter', 'noise_slur', 'norm', 'n_elements',
                     'n_params', 'n_tags', 'objarr', 'obj_class', 'obj_destroy',
                     'obj_hasmethod', 'obj_isa', 'obj_new', 'obj_valid',
@@ -1631,7 +1896,7 @@ class RdLexer(RegexLexer):
     Extensions <http://cran.r-project.org/doc/manuals/R-exts.html>`_
     and `Parsing Rd files <developer.r-project.org/parseRd.pdf>`_.
 
-    *New in Pygments 1.6.*
+    .. versionadded:: 1.6
     """
     name = 'Rd'
     aliases = ['rd']
@@ -1666,7 +1931,7 @@ class IgorLexer(RegexLexer):
     Pygments Lexer for Igor Pro procedure files (.ipf).
     See http://www.wavemetrics.com/ and http://www.igorexchange.com/.
 
-    *New in Pygments 1.7.*
+    .. versionadded:: 2.0
     """
 
     name = 'Igor'
@@ -1674,18 +1939,22 @@ class IgorLexer(RegexLexer):
     filenames = ['*.ipf']
     mimetypes = ['text/ipf']
 
-    flags = re.IGNORECASE
+    flags = re.IGNORECASE | re.MULTILINE
 
     flowControl = [
         'if', 'else', 'elseif', 'endif', 'for', 'endfor', 'strswitch', 'switch',
-        'case', 'endswitch', 'do', 'while', 'try', 'catch', 'endtry', 'break',
-        'continue', 'return',
+        'case', 'default', 'endswitch', 'do', 'while', 'try', 'catch', 'endtry',
+        'break', 'continue', 'return',
     ]
     types = [
         'variable', 'string', 'constant', 'strconstant', 'NVAR', 'SVAR', 'WAVE',
-        'STRUCT', 'ThreadSafe', 'function', 'end', 'static', 'macro', 'window',
-        'graph', 'Structure', 'EndStructure', 'EndMacro', 'FuncFit', 'Proc',
-        'Picture', 'Menu', 'SubMenu', 'Prompt', 'DoPrompt',
+        'STRUCT', 'dfref'
+    ]
+    keywords = [
+        'override', 'ThreadSafe', 'static',  'FuncFit', 'Proc', 'Picture',
+        'Prompt', 'DoPrompt', 'macro', 'window', 'graph', 'function', 'end',
+        'Structure', 'EndStructure', 'EndMacro', 'Menu', 'SubMenu', 'Prompt',
+        'DoPrompt',
     ]
     operations = [
         'Abort', 'AddFIFOData', 'AddFIFOVectData', 'AddMovieAudio',
@@ -1905,6 +2174,8 @@ class IgorLexer(RegexLexer):
             (r'\b(%s)\b' % '|'.join(flowControl), Keyword),
             # Types.
             (r'\b(%s)\b' % '|'.join(types), Keyword.Type),
+            # Keywords.
+            (r'\b(%s)\b' % '|'.join(keywords), Keyword.Reserved),
             # Built-in operations.
             (r'\b(%s)\b' % '|'.join(operations), Name.Class),
             # Built-in functions.
@@ -1912,7 +2183,104 @@ class IgorLexer(RegexLexer):
             # Compiler directives.
             (r'^#(include|pragma|define|ifdef|ifndef|endif)',
              Name.Decorator),
-            (r'[^a-zA-Z"/]+', Text),
+            (r'[^a-z"/]+$', Text),
             (r'.', Text),
         ],
     }
+
+
+class MathematicaLexer(RegexLexer):
+    """
+    Lexer for `Mathematica <http://www.wolfram.com/mathematica/>`_ source code.
+
+    .. versionadded:: 2.0
+    """
+    name = 'Mathematica'
+    aliases = ['mathematica', 'mma', 'nb']
+    filenames = ['*.nb', '*.cdf', '*.nbp', '*.ma']
+    mimetypes = ['application/mathematica',
+                 'application/vnd.wolfram.mathematica',
+                 'application/vnd.wolfram.mathematica.package',
+                 'application/vnd.wolfram.cdf']
+
+    # http://reference.wolfram.com/mathematica/guide/Syntax.html
+    operators = [
+        ";;", "=", "=.", "!=" "==", ":=", "->", ":>", "/.", "+", "-", "*", "/",
+        "^", "&&", "||", "!", "<>", "|", "/;", "?", "@", "//", "/@", "@@",
+        "@@@", "~~", "===", "&"]
+    operators.sort(reverse=True)
+
+    punctuation = [",", ";", "(", ")", "[", "]", "{", "}"]
+
+    def _multi_escape(entries):
+        return '(%s)' % ('|'.join(re.escape(entry) for entry in entries))
+
+    tokens = {
+        'root': [
+            (r'(?s)\(\*.*?\*\)', Comment),
+
+            (r'([a-zA-Z]+[A-Za-z0-9]*`)', Name.Namespace),
+            (r'([A-Za-z0-9]*_+[A-Za-z0-9]*)', Name.Variable),
+            (r'#\d*', Name.Variable),
+            (r'([a-zA-Z]+[a-zA-Z0-9]*)', Name),
+
+            (r'-?[0-9]+\.[0-9]*', Number.Float),
+            (r'-?[0-9]*\.[0-9]+', Number.Float),
+            (r'-?[0-9]+', Number.Integer),
+
+            (_multi_escape(operators), Operator),
+            (_multi_escape(punctuation), Punctuation),
+            (r'".*?"', String),
+            (r'\s+', Text.Whitespace),
+        ],
+    }
+
+class GAPLexer(RegexLexer):
+    """
+    For `GAP <http://www.gap-system.org>`_ source code.
+
+    .. versionadded:: 2.0
+    """
+    name = 'GAP'
+    aliases = ['gap']
+    filenames = ['*.g', '*.gd', '*.gi', '*.gap']
+
+    tokens = {
+      'root' : [
+        (r'#.*$', Comment.Single),
+        (r'"(?:[^"\\]|\\.)*"', String),
+        (r'\(|\)|\[|\]|\{|\}', Punctuation),
+        (r'''(?x)\b(?:
+            if|then|elif|else|fi|
+            for|while|do|od|
+            repeat|until|
+            break|continue|
+            function|local|return|end|
+            rec|
+            quit|QUIT|
+            IsBound|Unbind|
+            TryNextMethod|
+            Info|Assert
+          )\b''', Keyword),
+        (r'''(?x)\b(?:
+            true|false|fail|infinity
+          )\b''',
+          Name.Constant),
+        (r'''(?x)\b(?:
+            (Declare|Install)([A-Z][A-Za-z]+)|
+               BindGlobal|BIND_GLOBAL
+          )\b''',
+          Name.Builtin),
+        (r'\.|,|:=|;|=|\+|-|\*|/|\^|>|<', Operator),
+        (r'''(?x)\b(?:
+            and|or|not|mod|in
+          )\b''',
+          Operator.Word),
+        (r'''(?x)
+          (?:[a-zA-Z_0-9]+|`[^`]*`)
+          (?:::[a-zA-Z_0-9]+|`[^`]*`)*''', Name.Variable),
+        (r'[0-9]+(?:\.[0-9]*)?(?:e[0-9]+)?', Number),
+        (r'\.[0-9]+(?:e[0-9]+)?', Number),
+        (r'.', Text)
+      ]
+    }