GeSHi 1.0.8.3 update

Ignore-this: d204f804a634d5a537737dc4a50c3c13

darcs-hash:20090323094253-7ad00-003ea6c7b9cb1306ad0623274917bbfc042a0103.gz

1 files changed, 104 insertions, 109 deletions

diff --git a/inc/geshi/matlab.php b/inc/geshi/matlab.php
index d90fe557a..d3963ef80 100644
--- a/inc/geshi/matlab.php
+++ b/inc/geshi/matlab.php
@@ -4,7 +4,7 @@
  * -----------
  * Author: Florian Knorn (floz@gmx.de)
  * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.3
  * Date Started: 2005/02/09
  *
  * Matlab M-file language file for GeSHi.
@@ -45,7 +45,9 @@ $language_data = array (
     'COMMENT_SINGLE' => array(1 => '%'),
     'COMMENT_MULTI' => array(),
     //Matlab Strings
-    'COMMENT_REGEXP' => array(2 => "/(?<!\\w)('[^\\n\\r']*?')/"),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<![\\w\\)\\]\\}\\.])('[^\\n']*?')/"
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
@@ -56,113 +58,105 @@ $language_data = array (
             'switch', 'try', 'while'
             ),
         2 => array(
-            'all','any','exist','find','is','isa','logical','mislocked',
+            'all','any','exist','is','logical','mislocked',
 
-            'builtin','eval','evalc','evalin','feval','function','global',
-            'nargchk','persistent','script','break','case','catch','else',
-            'elseif','end','error','for','if','otherwise','return','switch',
-            'try','warning','while','input','keyboard','menu','pause','class',
-            'double','inferiorto','inline','int8','int16','int32','isa',
-            'loadobj','saveobj','single','superiorto','uint8','int16','uint32',
-            'dbclear','dbcont','dbdown','dbmex','dbquit','dbstack','dbstatus',
-            'dbstep','dbstop','dbtype','dbup','blkdiag','eye','linspace',
-            'logspace','ones','rand','randn','zeros','ans','computer','eps',
-            'flops','i','Inf','inputname','j','NaN','nargin','nargout','pi',
-            'realmax','realmin','varargin','varargout','calendar','clock',
-            'cputime','date','datenum','datestr','datevec','eomday','etime',
-            'now','tic','toc','weekday','cat','diag','fliplr','flipud','repmat',
-            'reshape','rot90','tril','triu','compan','gallery','hadamard',
-            'hankel','hilb','invhilb','magic','pascal','toeplitz','wilkinson',
-            'abs','acos','acosh','acot','acoth','acsc','acsch','angle','asec',
-            'asech','asin','asinh','atan','atanh','atan2','ceil','complex',
-            'conj','cos','cosh','cot','coth','csc','csch','exp','fix','floor',
-            'gcd','imag','lcm','log','log2','log10','mod','nchoosek','real',
-            'rem','round','sec','sech','sign','sin','sinh','sqrt','tan','tanh',
-            'airy','besselh','besseli','besselk','besselj','Bessely','beta',
-            'betainc','betaln','ellipj','ellipke','erf','erfc','erfcx','erfiny',
-            'expint','factorial','gamma','gammainc','gammaln','legendre','pow2',
-            'rat','rats','cart2pol','cart2sph','pol2cart','sph2cart','abs',
-            'eval','real','strings','deblank','findstr','lower','strcat',
-            'strcmp','strcmpi','strjust','strmatch','strncmp','strrep','strtok',
-            'strvcat','symvar','texlabel','upper','char','int2str','mat2str',
-            'num2str','sprintf','sscanf','str2double','str2num','bin2dec',
-            'dec2bin','dec2hex','hex2dec','hex2num','fclose','fopen','fread',
-            'fwrite','fgetl','fgets','fprintf','fscanf','feof','ferror',
-            'frewind','fseek','ftell','sprintf','sscanf','dlmread','dlmwrite',
-            'hdf','imfinfo','imread','imwrite','textread','wk1read','wk1write',
-            'bitand','bitcmp','bitor','bitmax','bitset','bitshift','bitget',
-            'bitxor','fieldnames','getfield','rmfield','setfield','struct',
-            'struct2cell','class','isa','cell','cellfun','cellstr',
-            'cell2struct','celldisp','cellplot','num2cell','cat','flipdim',
-            'ind2sub','ipermute','ndgrid','ndims','permute','reshape',
-            'shiftdim','squeeze','sub2ind','cond','condeig','det','norm','null',
-            'orth','rank','rcond','rref','rrefmovie','subspace','trace','chol',
-            'inv','lscov','lu','nnls','pinv','qr','balance','cdf2rdf','eig',
-            'gsvd','hess','poly','qz','rsf2csf','schur','svd','expm','funm',
-            'logm','sqrtm','qrdelete','qrinsert','bar','barh','hist','hold',
-            'loglog','pie','plot','polar','semilogx','semilogy','subplot',
-            'bar3','bar3h','comet3','cylinder','fill3','plot3','quiver3',
-            'slice','sphere','stem3','waterfall','clabel','datetick','grid',
-            'gtext','legend','plotyy','title','xlabel','ylabel','zlabel',
-            'contour','contourc','contourf','hidden','meshc','mesh','peaks',
-            'surf','surface','surfc','surfl','trimesh','trisurf','coneplot',
-            'contourslice','isocaps','isonormals','isosurface','reducepatch',
-            'reducevolume','shrinkfaces','smooth3','stream2','stream3',
-            'streamline','surf2patch','subvolume','griddata','meshgrid','area',
-            'box','comet','compass','errorbar','ezcontour','ezcontourf',
+            'abs','acos','acosh','acot','acoth','acsc','acsch','airy','angle',
+            'ans','area','asec','asech','asin','asinh','atan','atan2','atanh',
+            'auread','autumn','auwrite','axes','axis','balance','bar','bar3',
+            'bar3h','barh','besselh','besseli','besselj','besselk','Bessely',
+            'beta','betainc','betaln','bicg','bicgstab','bin2dec','bitand',
+            'bitcmp','bitget','bitmax','bitor','bitset','bitshift','bitxor',
+            'blkdiag','bone','box','brighten','builtin','bwcontr','calendar',
+            'camdolly','camlight','camlookat','camorbit','campan','campos',
+            'camproj','camroll','camtarget','camup','camva','camzoom','capture',
+            'cart2pol','cart2sph','cat','caxis','cdf2rdf','ceil','cell',
+            'cell2struct','celldisp','cellfun','cellplot','cellstr','cgs',
+            'char','chol','cholinc','cholupdate','cla','clabel','class','clc',
+            'clf','clg','clock','close','colmmd','colorbar','colorcube',
+            'colordef','colormap','colperm','comet','comet3','compan','compass',
+            'complex','computer','cond','condeig','condest','coneplot','conj',
+            'contour','contourc','contourf','contourslice','contrast','conv',
+            'conv2','convhull','cool','copper','copyobj','corrcoef','cos',
+            'cosh','cot','coth','cov','cplxpair','cputime','cross','csc','csch',
+            'cumprod','cumsum','cumtrapz','cylinder','daspect','date','datenum',
+            'datestr','datetick','datevec','dbclear','dbcont','dbdown',
+            'dblquad','dbmex','dbquit','dbstack','dbstatus','dbstep','dbstop',
+            'dbtype','dbup','deblank','dec2bin','dec2hex','deconv','del2',
+            'delaunay','det','diag','dialog','diff','diffuse','dlmread',
+            'dlmwrite','dmperm','double','dragrect','drawnow','dsearch','eig',
+            'eigs','ellipj','ellipke','eomday','eps','erf','erfc','erfcx',
+            'erfiny','error','errorbar','errordlg','etime','eval','evalc',
+            'evalin','exp','expint','expm','eye','ezcontour','ezcontourf',
             'ezmesh','ezmeshc','ezplot','ezplot3','ezpolar','ezsurf','ezsurfc',
-            'feather','fill','fplot','pareto','pie3','plotmatrix','pcolor',
-            'rose','quiver','ribbon','stairs','scatter','scatter3','stem',
-            'convhull','delaunay','dsearch','inpolygon','polyarea','tsearch',
-            'voronoi','camdolly','camlookat','camorbit','campan','campos',
-            'camproj','camroll','camtarget','camup','camva','camzoom','daspect',
-            'pbaspect','view','viewmtx','xlim','ylim','zlim','camlight',
-            'diffuse','lighting','lightingangle','material','specular',
-            'brighten','bwcontr','caxis','colorbar','colorcube','colordef',
-            'colormap','graymon','hsv2rgb','rgb2hsv','rgbplot','shading',
-            'spinmap','surfnorm','whitebg','autumn','bone','contrast','cool',
-            'copper','flag','gray','hot','hsv','jet','lines','prism','spring',
-            'summer','winter','orient','print','printopt','saveas','copyobj',
-            'findobj','gcbo','gco','get','rotate','ishandle','set','axes',
-            'figure','image','light','line','patch','rectangle','surface',
-            'text Create','uicontext Create','capture','clc','clf','clg',
-            'close','gcf','newplot','refresh','saveas','axis','cla','gca',
-            'propedit','reset','rotate3d','selectmoveresize','shg','ginput',
-            'zoom','dragrect','drawnow','rbbox','dialog','errordlg','helpdlg',
-            'inputdlg','listdlg','msgbox','pagedlg','printdlg','questdlg',
-            'uigetfile','uiputfile','uisetcolor','uisetfont','warndlg','menu',
-            'menuedit','uicontextmenu','uicontrol','uimenu','dragrect',
-            'findfigs','gcbo','rbbox','selectmoveresize','textwrap','uiresume',
-            'uiwait Used','waitbar','waitforbuttonpress','convhull','cumprod',
-            'cumsum','cumtrapz','delaunay','dsearch','factor','inpolygon','max',
-            'mean','median','min','perms','polyarea','primes','prod','sort',
-            'sortrows','std','sum','trapz','tsearch','var','voronoi','del2',
-            'diff','gradient','corrcoef','cov','conv','conv2','deconv','filter',
-            'filter2','abs','angle','cplxpair','fft','fft2','fftshift','ifft',
-            'ifft2','ifftn','ifftshift','nextpow2','unwrap','cross','intersect',
-            'ismember','setdiff','setxor','union','unique','conv','deconv',
-            'poly','polyder','polyeig','polyfit','polyval','polyvalm','residue',
-            'roots','griddata','interp1','interp2','interp3','interpft',
-            'interpn','meshgrid','ndgrid','spline','dblquad','fmin','fmins',
-            'fzero','ode45,','ode113,','ode15s,','ode23s,','ode23t,','ode23tb',
-            'odefile','odeget','odeset','quad,','vectorize','spdiags','speye',
-            'sprand','sprandn','sprandsym','find','full','sparse','spconvert',
-            'nnz','nonzeros','nzmax','spalloc','spfun','spones','colmmd',
-            'colperm','dmperm','randperm','symmmd','symrcm','condest','normest',
-            'bicg','bicgstab','cgs','cholinc','cholupdate','gmres','luinc',
-            'pcg','qmr','qr','qrdelete','qrinsert','qrupdate','eigs','svds',
-            'spparms','lin2mu','mu2lin','sound','soundsc','auread','auwrite',
-            'wavread','wavwrite',
+            'factor','factorial','fclose','feather','feof','ferror','feval',
+            'fft','fft2','fftshift','fgetl','fgets','fieldnames','figure',
+            'fill','fill3','filter','filter2','find','findfigs','findobj',
+            'findstr','fix','flag','flipdim','fliplr','flipud','floor','flops',
+            'fmin','fmins','fopen','fplot','fprintf','fread','frewind','fscanf',
+            'fseek','ftell','full','funm','fwrite','fzero','gallery','gamma',
+            'gammainc','gammaln','gca','gcbo','gcd','gcf','gco','get',
+            'getfield','ginput','gmres','gradient','gray','graymon','grid',
+            'griddata','gsvd','gtext','hadamard','hankel','hdf','helpdlg',
+            'hess','hex2dec','hex2num','hidden','hilb','hist','hold','hot',
+            'hsv','hsv2rgb','i','ifft','ifft2','ifftn','ifftshift','imag',
+            'image','imfinfo','imread','imwrite','ind2sub','Inf','inferiorto',
+            'inline','inpolygon','input','inputdlg','inputname','int16',
+            'int2str','int32','int8','interp1','interp2','interp3','interpft',
+            'interpn','intersect','inv','invhilb','ipermute','isa','ishandle',
+            'ismember','isocaps','isonormals','isosurface','j','jet','keyboard',
+            'lcm','legend','legendre','light','lighting','lightingangle',
+            'lin2mu','line','lines','linspace','listdlg','loadobj','log',
+            'log10','log2','loglog','logm','logspace','lower','lscov','lu',
+            'luinc','magic','mat2str','material','max','mean','median','menu',
+            'menuedit','mesh','meshc','meshgrid','min','mod','msgbox','mu2lin',
+            'NaN','nargchk','nargin','nargout','nchoosek','ndgrid','ndims',
+            'newplot','nextpow2','nnls','nnz','nonzeros','norm','normest','now',
+            'null','num2cell','num2str','nzmax','ode113,','ode15s,','ode23s,',
+            'ode23t,','ode23tb','ode45,','odefile','odeget','odeset','ones',
+            'orient','orth','pagedlg','pareto','pascal','patch','pause',
+            'pbaspect','pcg','pcolor','peaks','perms','permute','pi','pie',
+            'pie3','pinv','plot','plot3','plotmatrix','plotyy','pol2cart',
+            'polar','poly','polyarea','polyder','polyeig','polyfit','polyval',
+            'polyvalm','pow2','primes','print','printdlg','printopt','prism',
+            'prod','propedit','qmr','qr','qrdelete','qrinsert','qrupdate',
+            'quad','questdlg','quiver','quiver3','qz','rand','randn','randperm',
+            'rank','rat','rats','rbbox','rcond','real','realmax','realmin',
+            'rectangle','reducepatch','reducevolume','refresh','rem','repmat',
+            'reset','reshape','residue','rgb2hsv','rgbplot','ribbon','rmfield',
+            'roots','rose','rot90','rotate','rotate3d','round','rref',
+            'rrefmovie','rsf2csf','saveobj','scatter','scatter3','schur',
+            'script','sec','sech','selectmoveresize','semilogx','semilogy',
+            'set','setdiff','setfield','setxor','shading','shg','shiftdim',
+            'shrinkfaces','sign','sin','single','sinh','slice','smooth3','sort',
+            'sortrows','sound','soundsc','spalloc','sparse','spconvert',
+            'spdiags','specular','speye','spfun','sph2cart','sphere','spinmap',
+            'spline','spones','spparms','sprand','sprandn','sprandsym','spring',
+            'sprintf','sqrt','sqrtm','squeeze','sscanf','stairs','std','stem',
+            'stem3','str2double','str2num','strcat','strcmp','strcmpi',
+            'stream2','stream3','streamline','strings','strjust','strmatch',
+            'strncmp','strrep','strtok','struct','struct2cell','strvcat',
+            'sub2ind','subplot','subspace','subvolume','sum','summer',
+            'superiorto','surf','surf2patch','surface','surfc','surfl',
+            'surfnorm','svd','svds','symmmd','symrcm','symvar','tan','tanh',
+            'texlabel','text Create','textread','textwrap','tic','title','toc',
+            'toeplitz','trace','trapz','tril','trimesh','trisurf','triu',
+            'tsearch','uicontext Create','uicontextmenu','uicontrol',
+            'uigetfile','uimenu','uint32','uint8','uiputfile','uiresume',
+            'uisetcolor','uisetfont','uiwait Used','union','unique','unwrap',
+            'upper','var','varargin','varargout','vectorize','view','viewmtx',
+            'voronoi','waitbar','waitforbuttonpress','warndlg','warning',
+            'waterfall','wavread','wavwrite','weekday','whitebg','wilkinson',
+            'winter','wk1read','wk1write','xlabel','xlim','ylabel','ylim',
+            'zeros','zlabel','zlim','zoom',
             //'[Keywords 6]',
-            'addpath','doc','docopt','help','helpdesk','helpwin','lasterr',
-            'lastwarn','lookfor','partialpath','path','pathtool','profile',
-            'profreport','rmpath','type','ver','version','web','what',
-            'whatsnew','which','clear','disp','length','load','mlock',
-            'munlock','openvar','pack','save','saveas','size','who','whos',
-            'workspace','clc','echo','format','home','more','cd','copyfile',
-            'delete','diary','dir','edit','fileparts','fullfile','inmem','ls',
-            'matlabroot','mkdir','open','pwd','tempdir','tempname','matlabrc',
-            'quit'
+            'addpath','cd','clear','copyfile','delete','diary','dir','disp',
+            'doc','docopt','echo','edit','fileparts','format','fullfile','help',
+            'helpdesk','helpwin','home','inmem','lasterr','lastwarn','length',
+            'load','lookfor','ls','matlabrc','matlabroot','mkdir','mlock',
+            'more','munlock','open','openvar','pack','partialpath','path',
+            'pathtool','profile','profreport','pwd','quit','rmpath','save',
+            'saveas','size','tempdir','tempname','type','ver','version','web',
+            'what','whatsnew','which','who','whos','workspace'
             )
         ),
     'SYMBOLS' => array(
@@ -204,6 +198,7 @@ $language_data = array (
             0 => 'color: #080;'
             ),
         'REGEXPS' => array(
+            0 => 'color: #33f;'
             ),
         'SCRIPT' => array(
             0 => ''
@@ -211,9 +206,7 @@ $language_data = array (
         ),
     'URLS' => array(
         1 => '',
-        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html',
-        3 => '',
-        4 => ''
+        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
@@ -221,6 +214,8 @@ $language_data = array (
         2 => '::'
         ),
     'REGEXPS' => array(
+        //Complex numbers
+        0 => '(?<![\\w])[+-]?[\\d]*([\\d]\\.|\\.[\\d])?[\\d]*[ij](?![\\w])'
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(