Checked in 2.1.364

Scripts/shBrushBash.js

@@ -1,7 +1,7 @@
 SyntaxHighlighter.brushes.Bash = function()
 {
 	var keywords =	'if fi then elif else for do done until while break continue case function return in eq ne gt lt ge le';
-	var commands =  'alias apropos awk bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
+	var commands =  'alias apropos awk basename bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
 					'cksum clear cmp comm command cp cron crontab csplit cut date dc dd ddrescue declare df ' +
 					'diff diff3 dig dir dircolors dirname dirs du echo egrep eject enable env ethtool eval ' +
 					'exec exit expand export expr false fdformat fdisk fg fgrep file find fmt fold format ' +
@@ -16,15 +16,22 @@ SyntaxHighlighter.brushes.Bash = function()
 					'uname unexpand uniq units unset unshar useradd usermod users uuencode uudecode v vdir ' +
 					'vi watch wc whereis which who whoami Wget xargs yes'
 					;
-
+
+	this.findMatches = function(regexList, code)
+	{
+		code = code.replace(/&gt;/g, '>').replace(/&lt;/g, '<');
+		this.code = code;
+		return SyntaxHighlighter.Highlighter.prototype.findMatches.apply(this, [regexList, code]);
+	};
+
 	this.regexList = [
 		{ regex: SyntaxHighlighter.regexLib.singleLinePerlComments,		css: 'comments' },		// one line comments
 		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,			css: 'string' },		// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,			css: 'string' },		// single quoted strings
 		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),			css: 'keyword' },		// keywords
 		{ regex: new RegExp(this.getKeywords(commands), 'gm'),			css: 'functions' }		// commands
 		];
 }
 
 SyntaxHighlighter.brushes.Bash.prototype	= new SyntaxHighlighter.Highlighter();
 SyntaxHighlighter.brushes.Bash.aliases		= ['bash', 'shell'];
-

Scripts/shBrushCSharp.js

@@ -21,10 +21,13 @@ SyntaxHighlighter.brushes.CSharp = function()
 	this.regexList = [
 		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	func : fixComments },		// one line comments
 		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+		{ regex: /@"(?:[^"]|"")*"/g,								css: 'string' },			// @-quoted strings
 		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// strings
 		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// strings
 		{ regex: /^\s*#.*/gm,										css: 'preprocessor' },		// preprocessor tags like #region and #endregion
-		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// c# keyword
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' },			// c# keyword
+		{ regex: /\bpartial(?=\s+(?:class|interface|struct)\b)/g,	css: 'keyword' },			// contextual keyword: 'partial'
+		{ regex: /\byield(?=\s+(?:return|break)\b)/g,				css: 'keyword' }			// contextual keyword: 'yield'
 		];
 
 	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);

Scripts/shBrushColdFusion.js

@@ -0,0 +1,73 @@
+SyntaxHighlighter.brushes.ColdFusion = function()
+{
+	// Contributed by Jen
+	// http://www.jensbits.com/2009/05/14/coldfusion-brush-for-syntaxhighlighter-plus
+
+	var funcs	=	'Abs ACos AddSOAPRequestHeader AddSOAPResponseHeader AjaxLink AjaxOnLoad ArrayAppend ArrayAvg ArrayClear ArrayDeleteAt ' + 
+					'ArrayInsertAt ArrayIsDefined ArrayIsEmpty ArrayLen ArrayMax ArrayMin ArraySet ArraySort ArraySum ArraySwap ArrayToList ' + 
+					'Asc ASin Atn BinaryDecode BinaryEncode BitAnd BitMaskClear BitMaskRead BitMaskSet BitNot BitOr BitSHLN BitSHRN BitXor ' + 
+					'Ceiling CharsetDecode CharsetEncode Chr CJustify Compare CompareNoCase Cos CreateDate CreateDateTime CreateObject ' + 
+					'CreateODBCDate CreateODBCDateTime CreateODBCTime CreateTime CreateTimeSpan CreateUUID DateAdd DateCompare DateConvert ' + 
+					'DateDiff DateFormat DatePart Day DayOfWeek DayOfWeekAsString DayOfYear DaysInMonth DaysInYear DE DecimalFormat DecrementValue ' + 
+					'Decrypt DecryptBinary DeleteClientVariable DeserializeJSON DirectoryExists DollarFormat DotNetToCFType Duplicate Encrypt ' + 
+					'EncryptBinary Evaluate Exp ExpandPath FileClose FileCopy FileDelete FileExists FileIsEOF FileMove FileOpen FileRead ' + 
+					'FileReadBinary FileReadLine FileSetAccessMode FileSetAttribute FileSetLastModified FileWrite Find FindNoCase FindOneOf ' + 
+					'FirstDayOfMonth Fix FormatBaseN GenerateSecretKey GetAuthUser GetBaseTagData GetBaseTagList GetBaseTemplatePath ' + 
+					'GetClientVariablesList GetComponentMetaData GetContextRoot GetCurrentTemplatePath GetDirectoryFromPath GetEncoding ' + 
+					'GetException GetFileFromPath GetFileInfo GetFunctionList GetGatewayHelper GetHttpRequestData GetHttpTimeString ' + 
+					'GetK2ServerDocCount GetK2ServerDocCountLimit GetLocale GetLocaleDisplayName GetLocalHostIP GetMetaData GetMetricData ' + 
+					'GetPageContext GetPrinterInfo GetProfileSections GetProfileString GetReadableImageFormats GetSOAPRequest GetSOAPRequestHeader ' + 
+					'GetSOAPResponse GetSOAPResponseHeader GetTempDirectory GetTempFile GetTemplatePath GetTickCount GetTimeZoneInfo GetToken ' + 
+					'GetUserRoles GetWriteableImageFormats Hash Hour HTMLCodeFormat HTMLEditFormat IIf ImageAddBorder ImageBlur ImageClearRect ' + 
+					'ImageCopy ImageCrop ImageDrawArc ImageDrawBeveledRect ImageDrawCubicCurve ImageDrawLine ImageDrawLines ImageDrawOval ' + 
+					'ImageDrawPoint ImageDrawQuadraticCurve ImageDrawRect ImageDrawRoundRect ImageDrawText ImageFlip ImageGetBlob ImageGetBufferedImage ' + 
+					'ImageGetEXIFTag ImageGetHeight ImageGetIPTCTag ImageGetWidth ImageGrayscale ImageInfo ImageNegative ImageNew ImageOverlay ImagePaste ' + 
+					'ImageRead ImageReadBase64 ImageResize ImageRotate ImageRotateDrawingAxis ImageScaleToFit ImageSetAntialiasing ImageSetBackgroundColor ' + 
+					'ImageSetDrawingColor ImageSetDrawingStroke ImageSetDrawingTransparency ImageSharpen ImageShear ImageShearDrawingAxis ImageTranslate ' + 
+					'ImageTranslateDrawingAxis ImageWrite ImageWriteBase64 ImageXORDrawingMode IncrementValue InputBaseN Insert Int IsArray IsBinary ' + 
+					'IsBoolean IsCustomFunction IsDate IsDDX IsDebugMode IsDefined IsImage IsImageFile IsInstanceOf IsJSON IsLeapYear IsLocalHost ' + 
+					'IsNumeric IsNumericDate IsObject IsPDFFile IsPDFObject IsQuery IsSimpleValue IsSOAPRequest IsStruct IsUserInAnyRole IsUserInRole ' + 
+					'IsUserLoggedIn IsValid IsWDDX IsXML IsXmlAttribute IsXmlDoc IsXmlElem IsXmlNode IsXmlRoot JavaCast JSStringFormat LCase Left Len ' + 
+					'ListAppend ListChangeDelims ListContains ListContainsNoCase ListDeleteAt ListFind ListFindNoCase ListFirst ListGetAt ListInsertAt ' + 
+					'ListLast ListLen ListPrepend ListQualify ListRest ListSetAt ListSort ListToArray ListValueCount ListValueCountNoCase LJustify Log ' + 
+					'Log10 LSCurrencyFormat LSDateFormat LSEuroCurrencyFormat LSIsCurrency LSIsDate LSIsNumeric LSNumberFormat LSParseCurrency LSParseDateTime ' + 
+					'LSParseEuroCurrency LSParseNumber LSTimeFormat LTrim Max Mid Min Minute Month MonthAsString Now NumberFormat ParagraphFormat ParseDateTime ' + 
+					'Pi PrecisionEvaluate PreserveSingleQuotes Quarter QueryAddColumn QueryAddRow QueryConvertForGrid QueryNew QuerySetCell QuotedValueList Rand ' + 
+					'Randomize RandRange REFind REFindNoCase ReleaseComObject REMatch REMatchNoCase RemoveChars RepeatString Replace ReplaceList ReplaceNoCase ' + 
+					'REReplace REReplaceNoCase Reverse Right RJustify Round RTrim Second SendGatewayMessage SerializeJSON SetEncoding SetLocale SetProfileString ' + 
+					'SetVariable Sgn Sin Sleep SpanExcluding SpanIncluding Sqr StripCR StructAppend StructClear StructCopy StructCount StructDelete StructFind ' + 
+					'StructFindKey StructFindValue StructGet StructInsert StructIsEmpty StructKeyArray StructKeyExists StructKeyList StructKeyList StructNew ' + 
+					'StructSort StructUpdate Tan TimeFormat ToBase64 ToBinary ToScript ToString Trim UCase URLDecode URLEncodedFormat URLSessionFormat Val ' + 
+					'ValueList VerifyClient Week Wrap Wrap WriteOutput XmlChildPos XmlElemNew XmlFormat XmlGetNodeType XmlNew XmlParse XmlSearch XmlTransform ' + 
+					'XmlValidate Year YesNoFormat';
+
+	var keywords =	'cfabort cfajaximport cfajaxproxy cfapplet cfapplication cfargument cfassociate cfbreak cfcache cfcalendar ' + 
+					'cfcase cfcatch cfchart cfchartdata cfchartseries cfcol cfcollection cfcomponent cfcontent cfcookie cfdbinfo ' + 
+					'cfdefaultcase cfdirectory cfdiv cfdocument cfdocumentitem cfdocumentsection cfdump cfelse cfelseif cferror ' + 
+					'cfexchangecalendar cfexchangeconnection cfexchangecontact cfexchangefilter cfexchangemail cfexchangetask ' + 
+					'cfexecute cfexit cffeed cffile cfflush cfform cfformgroup cfformitem cfftp cffunction cfgrid cfgridcolumn ' + 
+					'cfgridrow cfgridupdate cfheader cfhtmlhead cfhttp cfhttpparam cfif cfimage cfimport cfinclude cfindex ' + 
+					'cfinput cfinsert cfinterface cfinvoke cfinvokeargument cflayout cflayoutarea cfldap cflocation cflock cflog ' + 
+					'cflogin cfloginuser cflogout cfloop cfmail cfmailparam cfmailpart cfmenu cfmenuitem cfmodule cfNTauthenticate ' + 
+					'cfobject cfobjectcache cfoutput cfparam cfpdf cfpdfform cfpdfformparam cfpdfparam cfpdfsubform cfpod cfpop ' + 
+					'cfpresentation cfpresentationslide cfpresenter cfprint cfprocessingdirective cfprocparam cfprocresult ' + 
+					'cfproperty cfquery cfqueryparam cfregistry cfreport cfreportparam cfrethrow cfreturn cfsavecontent cfschedule ' + 
+					'cfscript cfsearch cfselect cfset cfsetting cfsilent cfslider cfsprydataset cfstoredproc cfswitch cftable ' + 
+					'cftextarea cfthread cfthrow cftimer cftooltip cftrace cftransaction cftree cftreeitem cftry cfupdate cfwddx ' + 
+					'cfwindow cfxml cfzip cfzipparam';
+
+	var operators =	'all and any between cross in join like not null or outer some';
+
+	this.regexList = [
+		{ regex: new RegExp('--(.*)$', 'gm'),						css: 'comments' },  // one line and multiline comments
+		{ regex: SyntaxHighlighter.regexLib.xmlComments,			css: 'comments' },    // single quoted strings
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },    // double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },    // single quoted strings
+		{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),		css: 'functions' }, // functions
+		{ regex: new RegExp(this.getKeywords(operators), 'gmi'),	css: 'color1' },    // operators and such
+		{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),		css: 'keyword' }    // keyword
+		];
+}
+
+SyntaxHighlighter.brushes.ColdFusion.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.ColdFusion.aliases	= ['coldfusion','cf'];

Scripts/shBrushDelphi.js

@@ -20,9 +20,9 @@ SyntaxHighlighter.brushes.Delphi = function()
 		{ regex: /\{\$[a-zA-Z]+ .+\}/g,								css: 'color1' },		// compiler Directives and Region tags
 		{ regex: /\b[\d\.]+\b/g,									css: 'value' },			// numbers 12345
 		{ regex: /\$[a-zA-Z0-9]+\b/g,								css: 'value' },			// numbers $F5D3
-		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }		// keyword
+		{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),		css: 'keyword' }		// keyword
 		];
 };
 
 SyntaxHighlighter.brushes.Delphi.prototype	= new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Delphi.aliases	= ['delphi', 'pascal'];
+SyntaxHighlighter.brushes.Delphi.aliases	= ['delphi', 'pascal', 'pas'];

Scripts/shBrushErlang.js

@@ -0,0 +1,25 @@
+SyntaxHighlighter.brushes.Erlang = function()
+{
+	// Contributed by Jean-Lou Dupont
+	// http://jldupont.blogspot.com/2009/06/erlang-syntax-highlighter.html  
+
+	// According to: http://erlang.org/doc/reference_manual/introduction.html#1.5
+	var keywords = 'after and andalso band begin bnot bor bsl bsr bxor '+
+		'case catch cond div end fun if let not of or orelse '+
+		'query receive rem try when xor'+
+		// additional
+		' module export import define';
+
+	this.regexList = [
+		{ regex: new RegExp("[A-Z][A-Za-z0-9_]+", 'g'), 			css: 'constants' },
+		{ regex: new RegExp("\\%.+", 'gm'), 						css: 'comments' },
+		{ regex: new RegExp("\\?[A-Za-z0-9_]+", 'g'), 				css: 'preprocessor' },
+		{ regex: new RegExp("[a-z0-9_]+:[a-z0-9_]+", 'g'), 			css: 'functions' },
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },
+		{ regex: new RegExp(this.getKeywords(keywords),	'gm'),		css: 'keyword' }
+		];
+};
+
+SyntaxHighlighter.brushes.Erlang.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Erlang.aliases	= ['erl', 'erlang'];

Scripts/shBrushJava.js

@@ -10,7 +10,8 @@ SyntaxHighlighter.brushes.Java = function()
 
 	this.regexList = [
 		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },		// one line comments
-		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },		// multiline comments
+		{ regex: /\/\*([^\*][\s\S]*)?\*\//gm,						css: 'comments' },	 	// multiline comments
+		{ regex: /\/\*(?!\*\/)\*[\s\S]*?\*\//gm,					css: 'preprocessor' },	// documentation comments
 		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },		// strings
 		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// strings
 		{ regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi,				css: 'value' },			// numbers
@@ -19,7 +20,10 @@ SyntaxHighlighter.brushes.Java = function()
 		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }		// java keyword
 		];
 
-	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+	this.forHtmlScript({
+		left	: /(&lt;|<)%[@!=]?/g, 
+		right	: /%(&gt;|>)/g 
+	});
 };
 
 SyntaxHighlighter.brushes.Java.prototype	= new SyntaxHighlighter.Highlighter();

Scripts/shBrushPython.js

@@ -1,25 +1,35 @@
 SyntaxHighlighter.brushes.Python = function()
 {
-	// Contributed by Gheorghe Milas
+	// Contributed by Gheorghe Milas and Ahmad Sherif
 
-    var keywords =  'and assert break class continue def del elif else ' +
-                    'except exec finally for from global if import in is ' +
-                    'lambda not or pass print raise return try yield while';
+	var keywords =  'and assert break class continue def del elif else ' +
+					'except exec finally for from global if import in is ' +
+					'lambda not or pass print raise return try yield while';
 
-    var special =  'None True False self cls class_';
+	var funcs = '__import__ abs all any apply basestring bin bool buffer callable ' +
+				'chr classmethod cmp coerce compile complex delattr dict dir ' +
+				'divmod enumerate eval execfile file filter float format frozenset ' +
+				'getattr globals hasattr hash help hex id input int intern ' +
+				'isinstance issubclass iter len list locals long map max min next ' +
+				'object oct open ord pow print property range raw_input reduce ' +
+				'reload repr reversed round set setattr slice sorted staticmethod ' +
+				'str sum super tuple type type unichr unicode vars xrange zip';
 
-    this.regexList = [
-        { regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' },
-        { regex: /^\s*@\w+/gm, 										css: 'decorator' },
-        { regex: /(['\"]{3})([^\1])*?\1/gm, 						css: 'comments' },
-        { regex: /"(?!")(?:\.|\\\"|[^\""\n])*"/gm, 					css: 'string' },
-        { regex: /'(?!')(?:\.|(\\\')|[^\''\n])*'/gm, 				css: 'string' },
-        { regex: /\+|\-|\*|\/|\%|=|==/gm, 								css: 'keyword' },
-        { regex: /\b\d+\.?\w*/g, 									css: 'value' },
-        { regex: new RegExp(this.getKeywords(keywords), 'gm'), 		css: 'keyword' },
-        { regex: new RegExp(this.getKeywords(special), 'gm'), 		css: 'color1' }
-        ];
+	var special =  'None True False self cls class_';
 
+	this.regexList = [
+			{ regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' },
+			{ regex: /^\s*@\w+/gm, 										css: 'decorator' },
+			{ regex: /(['\"]{3})([^\1])*?\1/gm, 						css: 'comments' },
+			{ regex: /"(?!")(?:\.|\\\"|[^\""\n])*"/gm, 					css: 'string' },
+			{ regex: /'(?!')(?:\.|(\\\')|[^\''\n])*'/gm, 				css: 'string' },
+			{ regex: /\+|\-|\*|\/|\%|=|==/gm, 							css: 'keyword' },
+			{ regex: /\b\d+\.?\w*/g, 									css: 'value' },
+			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),		css: 'functions' },
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'), 		css: 'keyword' },
+			{ regex: new RegExp(this.getKeywords(special), 'gm'), 		css: 'color1' }
+			];
+
 	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
 };
 

Scripts/shBrushRuby.js

@@ -25,4 +25,4 @@ SyntaxHighlighter.brushes.Ruby = function()
 };
 
 SyntaxHighlighter.brushes.Ruby.prototype	= new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Ruby.aliases		= ['ruby', 'rails', 'ror'];
+SyntaxHighlighter.brushes.Ruby.aliases		= ['ruby', 'rails', 'ror', 'rb'];

Scripts/shBrushXml.js

@@ -33,10 +33,10 @@ SyntaxHighlighter.brushes.Xml = function()
 
 	this.regexList = [
 		{ regex: new XRegExp('(\\&lt;|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\&gt;|>)', 'gm'),			css: 'color2' },	// <![ ... [ ... ]]>
-		{ regex: new XRegExp('(\\&lt;|<)!--\\s*.*?\\s*--(\\&gt;|>)', 'gm'),								css: 'comments' },	// <!-- ... -->
+		{ regex: SyntaxHighlighter.regexLib.xmlComments,												css: 'comments' },	// <!-- ... -->
 		{ regex: new XRegExp('(&lt;|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(&gt;|>)', 'sg'), func: process }
 	];
 };
 
 SyntaxHighlighter.brushes.Xml.prototype	= new SyntaxHighlighter.Highlighter();
-SyntaxHighlighter.brushes.Xml.aliases	= ['xml', 'xhtml', 'xslt', 'html', 'xhtml'];
+SyntaxHighlighter.brushes.Xml.aliases	= ['xml', 'xhtml', 'xslt', 'html'];