Commits

Anonymous committed 4279a07

Add an Octave lexer, change Matlab's lexer description to not suggest it as an Octave lexer

  • Participants
  • Parent commits 2f2a9d7

Comments (0)

Files changed (2)

pygments/lexers/_mapping.py

     'MakoXmlLexer': ('pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
     'MaqlLexer': ('pygments.lexers.other', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
     'MasonLexer': ('pygments.lexers.templates', 'Mason', ('mason',), ('*.m', '*.mhtml', '*.mc', '*.mi', 'autohandler', 'dhandler'), ('application/x-mason',)),
-    'MatlabLexer': ('pygments.lexers.math', 'Matlab', ('matlab', 'octave'), ('*.m',), ('text/matlab',)),
+    'MatlabLexer': ('pygments.lexers.math', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
     'MatlabSessionLexer': ('pygments.lexers.math', 'Matlab session', ('matlabsession',), (), ()),
     'MiniDLexer': ('pygments.lexers.agile', 'MiniD', ('minid',), ('*.md',), ('text/x-minidsrc',)),
     'ModelicaLexer': ('pygments.lexers.other', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
     'ObjectiveJLexer': ('pygments.lexers.web', 'Objective-J', ('objective-j', 'objectivej', 'obj-j', 'objj'), ('*.j',), ('text/x-objective-j',)),
     'OcamlLexer': ('pygments.lexers.compiled', 'OCaml', ('ocaml',), ('*.ml', '*.mli', '*.mll', '*.mly'), ('text/x-ocaml',)),
     'OcamlLexer': ('pygments.lexers.functional', 'OCaml', ('ocaml',), ('*.ml', '*.mli', '*.mll', '*.mly'), ('text/x-ocaml',)),
+    'OctaveLexer': ('pygments.lexers.math', 'Octave', ('octave',), ('*.m',), ('text/octave',)),
     'OocLexer': ('pygments.lexers.compiled', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
     'PerlLexer': ('pygments.lexers.agile', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm'), ('text/x-perl', 'application/x-perl')),
     'PhpLexer': ('pygments.lexers.web', 'PHP', ('php', 'php3', 'php4', 'php5'), ('*.php', '*.php[345]'), ('text/x-php',)),

pygments/lexers/math.py

 
 from pygments.lexers.agile import PythonLexer
 
-__all__ = ['MuPADLexer', 'MatlabLexer', 'MatlabSessionLexer', 'NumPyLexer',
-           'RConsoleLexer', 'SLexer']
+__all__ = ['MuPADLexer', 'MatlabLexer', 'MatlabSessionLexer', 'OctaveLexer',
+           'NumPyLexer', 'RConsoleLexer', 'SLexer']
 
 
 class MuPADLexer(RegexLexer):
 
 class MatlabLexer(RegexLexer):
     """
-    For Matlab (or GNU Octave) source code.
+    For Matlab source code.
     Contributed by Ken Schutte <kschutte@csail.mit.edu>.
 
     *New in Pygments 0.10.*
     """
     name = 'Matlab'
-    aliases = ['matlab', 'octave']
+    aliases = ['matlab']
     filenames = ['*.m']
     mimetypes = ['text/matlab']
 
 
 class MatlabSessionLexer(Lexer):
     """
-    For Matlab (or GNU Octave) sessions.  Modeled after PythonConsoleLexer.
+    For Matlab sessions.  Modeled after PythonConsoleLexer.
     Contributed by Ken Schutte <kschutte@csail.mit.edu>.
 
     *New in Pygments 0.10.*
                 insertions, mlexer.get_tokens_unprocessed(curcode)):
                 yield item
 
+class OctaveLexer(RegexLexer):
+    """
+    For GNU Octave source code.
+    Contributed by Jordi Gutiérrez Hermoso <jordigh@gmail.com>.
+    Modeled on MatlabLexer
+
+    .. versionadded:: 1.5
+    """
+    name = 'Octave'
+    aliases = ['octave']
+    filenames = ['*.m']
+    mimetypes = ['text/octave']
+
+    # These lists are generated automatically.
+    # Run the following in bash shell:
+    #
+    # First dump all of the Octave manual into a plain text file:
+    #
+    #   $ info octave --subnodes -o octave-manual
+    #
+    # Now grep through it:
+
+    # for i in \
+    #     "Built-in Function" "Command" "Function File" \
+    #     "Loadable Function" "Mapping Function" "Method";
+    # do
+    #     perl -e '@name = qw('"$i"');
+    #              print lc($name[0]),"_kw = [\n"';
+    #
+    #     perl -n -e 'print "\"$1\",\n" if /-- '"$i"': .* (\w*) \(/;' \
+    #         octave-manual | sort | uniq ;
+    #     echo "]" ;
+    #     echo;
+    # done
+
+    # taken from Octave Mercurial changeset 8cc154f45e37
+
+    builtin_kw = [ "addlistener", "addpath", "addproperty", "all",
+                   "and", "any", "argnames", "argv", "assignin",
+                   "atexit", "autoload",
+                   "available_graphics_toolkits", "beep_on_error",
+                   "bitand", "bitmax", "bitor", "bitshift", "bitxor",
+                   "cat", "cell", "cellstr", "char", "class", "clc",
+                   "columns", "command_line_path",
+                   "completion_append_char", "completion_matches",
+                   "complex", "confirm_recursive_rmdir", "cputime",
+                   "crash_dumps_octave_core", "ctranspose", "cumprod",
+                   "cumsum", "debug_on_error", "debug_on_interrupt",
+                   "debug_on_warning", "default_save_options",
+                   "dellistener", "diag", "diff", "disp",
+                   "doc_cache_file", "do_string_escapes", "double",
+                   "drawnow", "e", "echo_executing_commands", "eps",
+                   "eq", "errno", "errno_list", "error", "eval",
+                   "evalin", "exec", "exist", "exit", "eye", "false",
+                   "fclear", "fclose", "fcntl", "fdisp", "feof",
+                   "ferror", "feval", "fflush", "fgetl", "fgets",
+                   "fieldnames", "file_in_loadpath", "file_in_path",
+                   "filemarker", "filesep", "find_dir_in_path",
+                   "fixed_point_format", "fnmatch", "fopen", "fork",
+                   "formula", "fprintf", "fputs", "fread", "freport",
+                   "frewind", "fscanf", "fseek", "fskipl", "ftell",
+                   "functions", "fwrite", "ge", "genpath", "get",
+                   "getegid", "getenv", "geteuid", "getgid",
+                   "getpgrp", "getpid", "getppid", "getuid", "glob",
+                   "gt", "gui_mode", "history_control",
+                   "history_file", "history_size",
+                   "history_timestamp_format_string", "home",
+                   "horzcat", "hypot", "ifelse",
+                   "ignore_function_time_stamp", "inferiorto",
+                   "info_file", "info_program", "inline", "input",
+                   "intmax", "intmin", "ipermute",
+                   "is_absolute_filename", "isargout", "isbool",
+                   "iscell", "iscellstr", "ischar", "iscomplex",
+                   "isempty", "isfield", "isfloat", "isglobal",
+                   "ishandle", "isieee", "isindex", "isinteger",
+                   "islogical", "ismatrix", "ismethod", "isnull",
+                   "isnumeric", "isobject", "isreal",
+                   "is_rooted_relative_filename", "issorted",
+                   "isstruct", "isvarname", "kbhit", "keyboard",
+                   "kill", "lasterr", "lasterror", "lastwarn",
+                   "ldivide", "le", "length", "link", "linspace",
+                   "logical", "lstat", "lt", "make_absolute_filename",
+                   "makeinfo_program", "max_recursion_depth", "merge",
+                   "methods", "mfilename", "minus", "mislocked",
+                   "mkdir", "mkfifo", "mkstemp", "mldivide", "mlock",
+                   "mouse_wheel_zoom", "mpower", "mrdivide", "mtimes",
+                   "munlock", "nargin", "nargout",
+                   "native_float_format", "ndims", "ne", "nfields",
+                   "nnz", "norm", "not", "numel", "nzmax",
+                   "octave_config_info", "octave_core_file_limit",
+                   "octave_core_file_name",
+                   "octave_core_file_options", "ones", "or",
+                   "output_max_field_width", "output_precision",
+                   "page_output_immediately", "page_screen_output",
+                   "path", "pathsep", "pause", "pclose", "permute",
+                   "pi", "pipe", "plus", "popen", "power",
+                   "print_empty_dimensions", "printf",
+                   "print_struct_array_contents", "prod",
+                   "program_invocation_name", "program_name",
+                   "putenv", "puts", "pwd", "quit", "rats", "rdivide",
+                   "readdir", "readlink", "read_readline_init_file",
+                   "realmax", "realmin", "rehash", "rename",
+                   "repelems", "re_read_readline_init_file", "reset",
+                   "reshape", "resize", "restoredefaultpath",
+                   "rethrow", "rmdir", "rmfield", "rmpath", "rows",
+                   "save_header_format_string", "save_precision",
+                   "saving_history", "scanf", "set", "setenv",
+                   "shell_cmd", "sighup_dumps_octave_core",
+                   "sigterm_dumps_octave_core", "silent_functions",
+                   "single", "size", "size_equal", "sizemax",
+                   "sizeof", "sleep", "source", "sparse_auto_mutate",
+                   "split_long_rows", "sprintf", "squeeze", "sscanf",
+                   "stat", "stderr", "stdin", "stdout", "strcmp",
+                   "strcmpi", "string_fill_char", "strncmp",
+                   "strncmpi", "struct", "struct_levels_to_print",
+                   "strvcat", "subsasgn", "subsref", "sum", "sumsq",
+                   "superiorto", "suppress_verbose_help_message",
+                   "symlink", "system", "tic", "tilde_expand",
+                   "times", "tmpfile", "tmpnam", "toc", "toupper",
+                   "transpose", "true", "typeinfo", "umask", "uminus",
+                   "uname", "undo_string_escapes", "unlink", "uplus",
+                   "upper", "usage", "usleep", "vec", "vectorize",
+                   "vertcat", "waitpid", "warning", "warranty",
+                   "whos_line_format", "yes_or_no", "zeros", ]
+
+    command_kw = [ "close", "load", "who", "whos", ]
+
+    function_kw = [ "accumarray", "accumdim", "acosd", "acotd",
+                   "acscd", "addtodate", "allchild", "ancestor",
+                   "anova", "arch_fit", "arch_rnd", "arch_test",
+                   "area", "arma_rnd", "arrayfun", "ascii", "asctime",
+                   "asecd", "asind", "assert", "atand",
+                   "autoreg_matrix", "autumn", "axes", "axis", "bar",
+                   "barh", "bartlett", "bartlett_test", "beep",
+                   "betacdf", "betainv", "betapdf", "betarnd",
+                   "bicgstab", "bicubic", "binary", "binocdf",
+                   "binoinv", "binopdf", "binornd", "bitcmp",
+                   "bitget", "bitset", "blackman", "blanks",
+                   "blkdiag", "bone", "box", "brighten", "calendar",
+                   "cast", "cauchy_cdf", "cauchy_inv", "cauchy_pdf",
+                   "cauchy_rnd", "caxis", "celldisp", "center", "cgs",
+                   "chisquare_test_homogeneity",
+                   "chisquare_test_independence", "circshift", "cla",
+                   "clabel", "clf", "clock", "cloglog", "closereq",
+                   "colon", "colorbar", "colormap", "colperm",
+                   "comet", "common_size", "commutation_matrix",
+                   "compan", "compare_versions", "compass",
+                   "computer", "cond", "condest", "contour",
+                   "contourc", "contourf", "contrast", "conv",
+                   "convhull", "cool", "copper", "copyfile", "cor",
+                   "corrcoef", "cor_test", "cosd", "cotd", "cov",
+                   "cplxpair", "cross", "cscd", "cstrcat", "csvread",
+                   "csvwrite", "ctime", "cumtrapz", "curl", "cut",
+                   "cylinder", "date", "datenum", "datestr",
+                   "datetick", "datevec", "dblquad", "deal",
+                   "deblank", "deconv", "delaunay", "delaunayn",
+                   "delete", "demo", "detrend", "diffpara", "diffuse",
+                   "dir", "discrete_cdf", "discrete_inv",
+                   "discrete_pdf", "discrete_rnd", "display",
+                   "divergence", "dlmwrite", "dos", "dsearch",
+                   "dsearchn", "duplication_matrix", "durbinlevinson",
+                   "ellipsoid", "empirical_cdf", "empirical_inv",
+                   "empirical_pdf", "empirical_rnd", "eomday",
+                   "errorbar", "etime", "etreeplot", "example",
+                   "expcdf", "expinv", "expm", "exppdf", "exprnd",
+                   "ezcontour", "ezcontourf", "ezmesh", "ezmeshc",
+                   "ezplot", "ezpolar", "ezsurf", "ezsurfc", "factor",
+                   "factorial", "fail", "fcdf", "feather", "fftconv",
+                   "fftfilt", "fftshift", "figure", "fileattrib",
+                   "fileparts", "fill", "findall", "findobj",
+                   "findstr", "finv", "flag", "flipdim", "fliplr",
+                   "flipud", "fpdf", "fplot", "fractdiff", "freqz",
+                   "freqz_plot", "frnd", "fsolve",
+                   "f_test_regression", "ftp", "fullfile", "fzero",
+                   "gamcdf", "gaminv", "gampdf", "gamrnd", "gca",
+                   "gcbf", "gcbo", "gcf", "genvarname", "geocdf",
+                   "geoinv", "geopdf", "geornd", "getfield", "ginput",
+                   "glpk", "gls", "gplot", "gradient",
+                   "graphics_toolkit", "gray", "grid", "griddata",
+                   "griddatan", "gtext", "gunzip", "gzip", "hadamard",
+                   "hamming", "hankel", "hanning", "hggroup",
+                   "hidden", "hilb", "hist", "histc", "hold", "hot",
+                   "hotelling_test", "housh", "hsv", "hurst",
+                   "hygecdf", "hygeinv", "hygepdf", "hygernd",
+                   "idivide", "ifftshift", "image", "imagesc",
+                   "imfinfo", "imread", "imshow", "imwrite", "index",
+                   "info", "inpolygon", "inputname", "interpft",
+                   "interpn", "intersect", "invhilb", "iqr", "isa",
+                   "isdefinite", "isdir", "is_duplicate_entry",
+                   "isequal", "isequalwithequalnans", "isfigure",
+                   "ishermitian", "ishghandle", "is_leap_year",
+                   "isletter", "ismac", "ismember", "ispc", "isprime",
+                   "isprop", "isscalar", "issquare", "isstrprop",
+                   "issymmetric", "isunix", "is_valid_file_id",
+                   "isvector", "jet", "kendall",
+                   "kolmogorov_smirnov_cdf",
+                   "kolmogorov_smirnov_test", "kruskal_wallis_test",
+                   "krylov", "kurtosis", "laplace_cdf", "laplace_inv",
+                   "laplace_pdf", "laplace_rnd", "legend", "legendre",
+                   "license", "line", "linkprop", "list_primes",
+                   "loadaudio", "loadobj", "logistic_cdf",
+                   "logistic_inv", "logistic_pdf", "logistic_rnd",
+                   "logit", "loglog", "loglogerr", "logm", "logncdf",
+                   "logninv", "lognpdf", "lognrnd", "logspace",
+                   "lookfor", "ls_command", "lsqnonneg", "magic",
+                   "mahalanobis", "manova", "matlabroot",
+                   "mcnemar_test", "mean", "meansq", "median", "menu",
+                   "mesh", "meshc", "meshgrid", "meshz", "mexext",
+                   "mget", "mkpp", "mode", "moment", "movefile",
+                   "mpoles", "mput", "namelengthmax", "nargchk",
+                   "nargoutchk", "nbincdf", "nbininv", "nbinpdf",
+                   "nbinrnd", "nchoosek", "ndgrid", "newplot", "news",
+                   "nonzeros", "normcdf", "normest", "norminv",
+                   "normpdf", "normrnd", "now", "nthroot", "null",
+                   "ocean", "ols", "onenormest", "optimget",
+                   "optimset", "orderfields", "orient", "orth",
+                   "pack", "pareto", "parseparams", "pascal", "patch",
+                   "pathdef", "pcg", "pchip", "pcolor", "pcr",
+                   "peaks", "periodogram", "perl", "perms", "pie",
+                   "pink", "planerot", "playaudio", "plot",
+                   "plotmatrix", "plotyy", "poisscdf", "poissinv",
+                   "poisspdf", "poissrnd", "polar", "poly",
+                   "polyaffine", "polyarea", "polyderiv", "polyfit",
+                   "polygcd", "polyint", "polyout", "polyreduce",
+                   "polyval", "polyvalm", "postpad", "powerset",
+                   "ppder", "ppint", "ppjumps", "ppplot", "ppval",
+                   "pqpnonneg", "prepad", "primes", "print",
+                   "print_usage", "prism", "probit", "qp", "qqplot",
+                   "quadcc", "quadgk", "quadl", "quadv", "quiver",
+                   "qzhess", "rainbow", "randi", "range", "rank",
+                   "ranks", "rat", "reallog", "realpow", "realsqrt",
+                   "record", "rectangle_lw", "rectangle_sw",
+                   "rectint", "refresh", "refreshdata",
+                   "regexptranslate", "repmat", "residue", "ribbon",
+                   "rindex", "roots", "rose", "rosser", "rotdim",
+                   "rref", "run", "run_count", "rundemos", "run_test",
+                   "runtests", "saveas", "saveaudio", "saveobj",
+                   "savepath", "scatter", "secd", "semilogx",
+                   "semilogxerr", "semilogy", "semilogyerr",
+                   "setaudio", "setdiff", "setfield", "setxor",
+                   "shading", "shift", "shiftdim", "sign_test",
+                   "sinc", "sind", "sinetone", "sinewave", "skewness",
+                   "slice", "sombrero", "sortrows", "spaugment",
+                   "spconvert", "spdiags", "spearman", "spectral_adf",
+                   "spectral_xdf", "specular", "speed", "spencer",
+                   "speye", "spfun", "sphere", "spinmap", "spline",
+                   "spones", "sprand", "sprandn", "sprandsym",
+                   "spring", "spstats", "spy", "sqp", "stairs",
+                   "statistics", "std", "stdnormal_cdf",
+                   "stdnormal_inv", "stdnormal_pdf", "stdnormal_rnd",
+                   "stem", "stft", "strcat", "strchr", "strjust",
+                   "strmatch", "strread", "strsplit", "strtok",
+                   "strtrim", "strtrunc", "structfun", "studentize",
+                   "subplot", "subsindex", "subspace", "substr",
+                   "substruct", "summer", "surf", "surface", "surfc",
+                   "surfl", "surfnorm", "svds", "swapbytes",
+                   "sylvester_matrix", "symvar", "synthesis", "table",
+                   "tand", "tar", "tcdf", "tempdir", "tempname",
+                   "test", "text", "textread", "textscan", "tinv",
+                   "title", "toeplitz", "tpdf", "trace", "trapz",
+                   "treelayout", "treeplot", "triangle_lw",
+                   "triangle_sw", "tril", "trimesh", "triplequad",
+                   "triplot", "trisurf", "triu", "trnd", "tsearchn",
+                   "t_test", "t_test_regression", "type", "unidcdf",
+                   "unidinv", "unidpdf", "unidrnd", "unifcdf",
+                   "unifinv", "unifpdf", "unifrnd", "union", "unique",
+                   "unix", "unmkpp", "unpack", "untabify", "untar",
+                   "unwrap", "unzip", "u_test", "validatestring",
+                   "vander", "var", "var_test", "vech", "ver",
+                   "version", "view", "voronoi", "voronoin",
+                   "waitforbuttonpress", "wavread", "wavwrite",
+                   "wblcdf", "wblinv", "wblpdf", "wblrnd", "weekday",
+                   "welch_test", "what", "white", "whitebg",
+                   "wienrnd", "wilcoxon_test", "wilkinson", "winter",
+                   "xlabel", "xlim", "ylabel", "yulewalker", "zip",
+                   "zlabel", "z_test", ]
+
+    loadable_kw = [ "airy", "amd", "balance", "besselh", "besseli",
+                   "besselj", "besselk", "bessely", "bitpack",
+                   "bsxfun", "builtin", "ccolamd", "cellfun",
+                   "cellslices", "chol", "choldelete", "cholinsert",
+                   "cholinv", "cholshift", "cholupdate", "colamd",
+                   "colloc", "convhulln", "convn", "csymamd",
+                   "cummax", "cummin", "daspk", "daspk_options",
+                   "dasrt", "dasrt_options", "dassl", "dassl_options",
+                   "dbclear", "dbdown", "dbstack", "dbstatus",
+                   "dbstop", "dbtype", "dbup", "dbwhere", "det",
+                   "dlmread", "dmperm", "dot", "eig", "eigs",
+                   "endgrent", "endpwent", "etree", "fft", "fftn",
+                   "fftw", "filter", "find", "full", "gcd",
+                   "getgrent", "getgrgid", "getgrnam", "getpwent",
+                   "getpwnam", "getpwuid", "getrusage", "givens",
+                   "gmtime", "gnuplot_binary", "hess", "ifft",
+                   "ifftn", "inv", "isdebugmode", "issparse", "kron",
+                   "localtime", "lookup", "lsode", "lsode_options",
+                   "lu", "luinc", "luupdate", "matrix_type", "max",
+                   "min", "mktime", "pinv", "qr", "qrdelete",
+                   "qrinsert", "qrshift", "qrupdate", "quad",
+                   "quad_options", "qz", "rand", "rande", "randg",
+                   "randn", "randp", "randperm", "rcond", "regexp",
+                   "regexpi", "regexprep", "schur", "setgrent",
+                   "setpwent", "sort", "spalloc", "sparse", "spparms",
+                   "sprank", "sqrtm", "strfind", "strftime",
+                   "strptime", "strrep", "svd", "svd_driver", "syl",
+                   "symamd", "symbfact", "symrcm", "time", "tsearch",
+                   "typecast", "urlread", "urlwrite", ]
+
+    mapping_kw = [ "abs", "acos", "acosh", "acot", "acoth", "acsc",
+                  "acsch", "angle", "arg", "asec", "asech", "asin",
+                  "asinh", "atan", "atanh", "beta", "betainc",
+                  "betaln", "bincoeff", "cbrt", "ceil", "conj", "cos",
+                  "cosh", "cot", "coth", "csc", "csch", "erf", "erfc",
+                  "erfcx", "erfinv", "exp", "finite", "fix", "floor",
+                  "fmod", "gamma", "gammainc", "gammaln", "imag",
+                  "isalnum", "isalpha", "isascii", "iscntrl",
+                  "isdigit", "isfinite", "isgraph", "isinf",
+                  "islower", "isna", "isnan", "isprint", "ispunct",
+                  "isspace", "isupper", "isxdigit", "lcm", "lgamma",
+                  "log", "lower", "mod", "real", "rem", "round",
+                  "roundb", "sec", "sech", "sign", "sin", "sinh",
+                  "sqrt", "tan", "tanh", "toascii", "tolower", "xor",
+                  ]
+
+    method_kw = [ "byte_size", "dims", "elem", "fortran_vec", "nelem", "operator", 
+                 "resize", ]
+
+
+    tokens = {
+        'root': [
+            #We should look into multiline comments
+            (r'[%#].*$', Comment),
+            (r'^\s*function', Keyword, 'deffunc'),
+
+            # from 'iskeyword' on hg changeset 8cc154f45e37
+            (r'(__FILE__|__LINE__|break|case|catch|classdef|continue|do|else|'
+             r'elseif|end|end_try_catch|end_unwind_protect|endclassdef|'
+             r'endevents|endfor|endfunction|endif|endmethods|endproperties|'
+             r'endswitch|endwhile|events|for|function|get|global|if|methods|'
+             r'otherwise|persistent|properties|return|set|static|switch|try|'
+             r'until|unwind_protect|unwind_protect_cleanup|while)\b', Keyword),
+
+            ("(" + "|".join(  builtin_kw + command_kw
+                            + function_kw + loadable_kw
+                            + mapping_kw + method_kw) + r')\b',  Name.Builtin),
+
+            # operators in Octave but not Matlab:
+            (r'-=|!=|!|/=|--', Operator),
+            # operators:
+            (r'-|==|~=|<|>|<=|>=|&&|&|~|\|\|?', Operator),
+            # operators in Octave but not Matlab requiring escape for re:
+            (r'\*=|\+=|\^=|\/=|\\=|\*\*|\+\+|\.\*\*',Operator),
+            # operators requiring escape for re:
+            (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator),
+
+
+            # punctuation:
+            (r'\[|\]|\(|\)|\{|\}|:|@|\.|,', Punctuation),
+            (r'=|:|;', Punctuation),
+
+            # quote can be transpose, instead of string:
+            # (not great, but handles common cases...)
+            (r'(?<=[\w\)\]])\'', Operator),
+            
+            (r'(?<![\w\)\]])\'', String, 'string'),
+            (r'"', String, 'string'),
+            ('[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            (r'.', Text),
+        ],
+        'string': [
+            (r'[^\']*\'', String, '#pop'),
+            (r'[^"]*"', String, '#pop'),
+        ],
+        'deffunc': [
+            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',
+             bygroups(Text.Whitespace, Text, Text.Whitespace, Punctuation,
+                      Text.Whitespace, Name.Function, Punctuation, Text,
+                      Punctuation, Text.Whitespace), '#pop'),
+        ],
+    }
+
+    def analyse_text(text):
+        if re.match('^\s*[%#]', text, re.M): #Comment
+            return 0.9
+        return 0.1
+
 
 class NumPyLexer(PythonLexer):
     '''