Merge pull request #2786 from EricDunsworth/v3.0-build-spacing

Additional fixes for spacing/tabbing issues when building.

src/js/dependencies/prettify.js

@@ -491,7 +491,7 @@ var prettyPrint;
    * (Element	"p"
    *   (Element "b"
    *	 (Text	"print "))		 ; #1
-   *   (Text	"'Hello '") 	 ; #2
+   *   (Text	"'Hello '")	 ; #2
    *   (Element "br")			 ; #3
    *   (Text	"  + 'World';")) ; #4
    * </pre>
@@ -504,7 +504,7 @@ var prettyPrint;
    * <pre>
    * {
    *   sourceCode: "print 'Hello '\n  + 'World';",
-   *   //					  1 		 2
+   *   //					  1		 2
    *   //			012345678901234 5678901234567
    *   spans: [0, #1, 6, #2, 14, #3, 15, #4]
    * }
@@ -879,7 +879,7 @@ var prettyPrint;
 		  +    '|\\x5C' + regexAny
 		  // or non-nesting character sets (\x5B\x5D);
 		  +    '|\\x5B(?:[^\\x5C\\x5D' + regexExcls + ']'
-		  + 			'|\\x5C' + regexAny + ')*(?:\\x5D|$))+'
+		  +			'|\\x5C' + regexAny + ')*(?:\\x5D|$))+'
 		  // finally closed by a /.
 		  + '/');
 	  fallthroughStylePatterns.push(
@@ -1280,7 +1280,7 @@ var prettyPrint;
 		  [
 		   [PR_PLAIN,		/^[^<?]+/],
 		   [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
-		   [PR_COMMENT, 	/^<\!--[\s\S]*?(?:-\->|$)/],
+		   [PR_COMMENT,	/^<\!--[\s\S]*?(?:-\->|$)/],
 		   // Unescaped content in an unknown language
 		   ['lang-',		/^<\?([\s\S]+?)(?:\?>|$)/],
 		   ['lang-',		/^<%([\s\S]+?)(?:%>|$)/],
@@ -1289,7 +1289,7 @@ var prettyPrint;
 		   // Unescaped content in javascript.	(Or possibly vbscript).
 		   ['lang-js',		/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
 		   // Contains unescaped stylesheet content
-		   ['lang-css', 	/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
+		   ['lang-css',	/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
 		   ['lang-in.tag',	/^(<\/?[a-z][^<>]*>)/i]
 		  ]),
 	  ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
@@ -1300,16 +1300,16 @@ var prettyPrint;
 		   [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
 		   ],
 		  [
-		   [PR_TAG, 		 /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
+		   [PR_TAG,		 /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
 		   [PR_ATTRIB_NAME,  /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
 		   ['lang-uq.val',	 /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
 		   [PR_PUNCTUATION,  /^[=<>\/]+/],
 		   ['lang-js',		 /^on\w+\s*=\s*\"([^\"]+)\"/i],
 		   ['lang-js',		 /^on\w+\s*=\s*\'([^\']+)\'/i],
 		   ['lang-js',		 /^on\w+\s*=\s*([^\"\'>\s]+)/i],
-		   ['lang-css', 	 /^style\s*=\s*\"([^\"]+)\"/i],
-		   ['lang-css', 	 /^style\s*=\s*\'([^\']+)\'/i],
-		   ['lang-css', 	 /^style\s*=\s*([^\"\'>\s]+)/i]
+		   ['lang-css',	 /^style\s*=\s*\"([^\"]+)\"/i],
+		   ['lang-css',	 /^style\s*=\s*\'([^\']+)\'/i],
+		   ['lang-css',	 /^style\s*=\s*([^\"\'>\s]+)/i]
 		   ]),
 	  ['in.tag']);
   registerLangHandler(

src/js/dependencies/prettify/lang-apollo.js

@@ -30,7 +30,7 @@ PR['registerLangHandler'](
 	PR['createSimpleLexer'](
 		[
 		 // A line comment that starts with ;
-		 [PR['PR_COMMENT'], 	/^#[^\r\n]*/, null, '#'],
+		 [PR['PR_COMMENT'],	/^#[^\r\n]*/, null, '#'],
 		 // Whitespace
 		 [PR['PR_PLAIN'],		/^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'],
 		 // A double quoted, possibly multi-line, string.

src/js/dependencies/prettify/lang-basic.js

@@ -19,13 +19,13 @@ PR.registerLangHandler(
 		  // "single-line-string"
 		  [PR.PR_STRING,		/^(?:"(?:[^\\"\r\n]|\\.)*(?:"|$))/, null, '"'],
 		  // Whitespace
-		  [PR.PR_PLAIN, 		/^\s+/, null, ' \r\n\t\xA0']
+		  [PR.PR_PLAIN,		/^\s+/, null, ' \r\n\t\xA0']
 		],
 		[ // fallthroughStylePatterns
 		  // A line comment that starts with REM
 		  [PR.PR_COMMENT,		/^REM[^\r\n]*/, null],
 		  [PR.PR_KEYWORD,		/^\b(?:AND|CLOSE|CLR|CMD|CONT|DATA|DEF ?FN|DIM|END|FOR|GET|GOSUB|GOTO|IF|INPUT|LET|LIST|LOAD|NEW|NEXT|NOT|ON|OPEN|OR|POKE|PRINT|READ|RESTORE|RETURN|RUN|SAVE|STEP|STOP|SYS|THEN|TO|VERIFY|WAIT)\b/, null],
-		  [PR.PR_PLAIN, 		/^[A-Z][A-Z0-9]?(?:\$|%)?/i, null],
+		  [PR.PR_PLAIN,		/^[A-Z][A-Z0-9]?(?:\$|%)?/i, null],
 		  // Literals .0, 0, 0.0 0E13
 		  [PR.PR_LITERAL,		/^(?:\d+(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?/i,  null, '0123456789'],
 		  [PR.PR_PUNCTUATION,	/^.[^\s\w\.$%"]*/, null]

src/js/dependencies/prettify/lang-clj.js

@@ -50,15 +50,15 @@ PR['registerLangHandler'](
 		 ['opn',			 /^[\(\{\[]+/, null, '([{'],
 		 ['clo',			 /^[\)\}\]]+/, null, ')]}'],
 		 // A line comment that starts with ;
-		 [PR['PR_COMMENT'], 	/^;[^\r\n]*/, null, ';'],
+		 [PR['PR_COMMENT'],	/^;[^\r\n]*/, null, ';'],
 		 // Whitespace
 		 [PR['PR_PLAIN'],		/^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'],
 		 // A double quoted, possibly multi-line, string.
 		 [PR['PR_STRING'],		/^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"']
 		],
 		[
 		 // clojure has a much larger set of keywords
-		 [PR['PR_KEYWORD'], 	/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/, null],
+		 [PR['PR_KEYWORD'],	/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/, null],
 		 [PR['PR_TYPE'], /^:[0-9a-zA-Z\-]+/]
 		]),
 	['clj']);

src/js/dependencies/prettify/lang-erlang.js

@@ -29,33 +29,33 @@ PR['registerLangHandler'](
 		[
 		 // Whitespace
 		 // whitechar	 ->    newline | vertab | space | tab | uniWhite
-		 // newline 	 ->    return linefeed | return | linefeed | formfeed
+		 // newline	 ->    return linefeed | return | linefeed | formfeed
 		 [PR['PR_PLAIN'],		/^[\t\n\x0B\x0C\r ]+/, null, '\t\n\x0B\x0C\r '],
 		 // Single line double-quoted strings.
 		 [PR['PR_STRING'],		/^\"(?:[^\"\\\n\x0C\r]|\\[\s\S])*(?:\"|$)/,
 		  null, '"'],
 
 		 // Handle atoms
-		 [PR['PR_LITERAL'], 	 /^[a-z][a-zA-Z0-9_]*/],
+		 [PR['PR_LITERAL'],	 /^[a-z][a-zA-Z0-9_]*/],
 		 // Handle single quoted atoms
-		 [PR['PR_LITERAL'], 	 /^\'(?:[^\'\\\n\x0C\r]|\\[^&])+\'?/,
+		 [PR['PR_LITERAL'],	 /^\'(?:[^\'\\\n\x0C\r]|\\[^&])+\'?/,
 		  null, "'"],
 
 		 // Handle macros. Just to be extra clear on this one, it detects the ?
 		 // then uses the regexp to end it so be very careful about matching
 		 // all the terminal elements
-		 [PR['PR_LITERAL'], 	 /^\?[^ \t\n({]+/, null, "?"],
+		 [PR['PR_LITERAL'],	 /^\?[^ \t\n({]+/, null, "?"],
 
 
 
-		 // decimal 	 ->    digit{digit}
+		 // decimal	 ->    digit{digit}
 		 // octal		 ->    octit{octit}
 		 // hexadecimal  ->    hexit{hexit}
-		 // integer 	 ->    decimal
-		 // 			  |    0o octal | 0O octal
-		 // 			  |    0x hexadecimal | 0X hexadecimal
+		 // integer	 ->    decimal
+		 //			  |    0o octal | 0O octal
+		 //			  |    0x hexadecimal | 0X hexadecimal
 		 // float		 ->    decimal . decimal [exponent]
-		 // 			  |    decimal exponent
+		 //			  |    decimal exponent
 		 // exponent	 ->    (e | E) [+ | -] decimal
 		 [PR['PR_LITERAL'],
 		  /^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+\-]?\d+)?)/i,

src/js/dependencies/prettify/lang-go.js

@@ -53,7 +53,7 @@ PR['registerLangHandler'](
 		[
 		 // Block comments are delimited by /* and */.
 		 // Single-line comments begin with // and extend to the end of a line.
-		 [PR['PR_COMMENT'], 	/^(?:\/\/[^\r\n]*|\/\*[\s\S]*?\*\/)/],
+		 [PR['PR_COMMENT'],	/^(?:\/\/[^\r\n]*|\/\*[\s\S]*?\*\/)/],
 		 [PR['PR_PLAIN'],		/^(?:[^\/\"\'`]|\/(?![\/\*]))+/i]
 		]),
 	['go']);

src/js/dependencies/prettify/lang-lisp.js

@@ -72,14 +72,14 @@ PR['registerLangHandler'](
 		 ['opn',			 /^\(+/, null, '('],
 		 ['clo',			 /^\)+/, null, ')'],
 		 // A line comment that starts with ;
-		 [PR['PR_COMMENT'], 	/^;[^\r\n]*/, null, ';'],
+		 [PR['PR_COMMENT'],	/^;[^\r\n]*/, null, ';'],
 		 // Whitespace
 		 [PR['PR_PLAIN'],		/^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'],
 		 // A double quoted, possibly multi-line, string.
 		 [PR['PR_STRING'],		/^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"']
 		],
 		[
-		 [PR['PR_KEYWORD'], 	/^(?:block|c[ad]+r|catch|con[ds]|def(?:ine|un)|do|eq|eql|equal|equalp|eval-when|flet|format|go|if|labels|lambda|let|load-time-value|locally|macrolet|multiple-value-call|nil|progn|progv|quote|require|return-from|setq|symbol-macrolet|t|tagbody|the|throw|unwind)\b/, null],
+		 [PR['PR_KEYWORD'],	/^(?:block|c[ad]+r|catch|con[ds]|def(?:ine|un)|do|eq|eql|equal|equalp|eval-when|flet|format|go|if|labels|lambda|let|load-time-value|locally|macrolet|multiple-value-call|nil|progn|progv|quote|require|return-from|setq|symbol-macrolet|t|tagbody|the|throw|unwind)\b/, null],
 		 [PR['PR_LITERAL'],
 		  /^[+\-]?(?:[0#]x[0-9a-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[ed][+\-]?\d+)?)/i],
 		 // A single quote possibly followed by a word that optionally ends with

src/js/dependencies/prettify/lang-llvm.js

@@ -40,21 +40,21 @@ PR['registerLangHandler'](
 		 // A double quoted, possibly multi-line, string.
 		 [PR['PR_STRING'],		/^!?\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"'],
 		 // comment.llvm
-		 [PR['PR_COMMENT'], 	/^;[^\r\n]*/, null, ';']
+		 [PR['PR_COMMENT'],	/^;[^\r\n]*/, null, ';']
 		],
 		[
 		 // variable.llvm
 		 [PR['PR_PLAIN'],		/^[%@!](?:[-a-zA-Z$._][-a-zA-Z$._0-9]*|\d+)/],
 
 		 // According to http://llvm.org/docs/LangRef.html#well-formedness
 		 // These reserved words cannot conflict with variable names, because none of them start with a prefix character ('%' or '@').
-		 [PR['PR_KEYWORD'], 	/^[A-Za-z_][0-9A-Za-z_]*/, null],
+		 [PR['PR_KEYWORD'],	/^[A-Za-z_][0-9A-Za-z_]*/, null],
 
 		 // constant.numeric.float.llvm
-		 [PR['PR_LITERAL'], 	/^\d+\.\d+/],
+		 [PR['PR_LITERAL'],	/^\d+\.\d+/],
 
 		 // constant.numeric.integer.llvm
-		 [PR['PR_LITERAL'], 	/^(?:\d+|0[xX][a-fA-F0-9]+)/],
+		 [PR['PR_LITERAL'],	/^(?:\d+|0[xX][a-fA-F0-9]+)/],
 
 		 // punctuation
 		 [PR['PR_PUNCTUATION'], /^[()\[\]{},=*<>:]|\.\.\.$/]

src/js/dependencies/prettify/lang-ml.js

@@ -44,8 +44,8 @@ PR['registerLangHandler'](
 		 // nested. Single-line comments begin with // and extend to
 		 // the end of a line.
 		 // TODO: (*...*) comments can be nested.  This does not handle that.
-		 [PR['PR_COMMENT'], 	/^(?:\/\/[^\r\n]*|\(\*[\s\S]*?\*\))/],
-		 [PR['PR_KEYWORD'], 	/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],
+		 [PR['PR_COMMENT'],	/^(?:\/\/[^\r\n]*|\(\*[\s\S]*?\*\))/],
+		 [PR['PR_KEYWORD'],	/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],
 		 // A number is a hex integer literal, a decimal real literal, or in
 		 // scientific notation.
 		 [PR['PR_LITERAL'],

src/js/dependencies/prettify/lang-mumps.js

@@ -42,25 +42,25 @@ var commands = 'B|BREAK|'		+
 			   'C|CLOSE|'		+
 			   'D|DO|'			+
 			   'E|ELSE|'		+
-			   'F|FOR|' 		+
+			   'F|FOR|'		+
 			   'G|GOTO|'		+
 			   'H|HALT|'		+
 			   'H|HANG|'		+
 			   'I|IF|'			+
-			   'J|JOB|' 		+
+			   'J|JOB|'		+
 			   'K|KILL|'		+
 			   'L|LOCK|'		+
 			   'M|MERGE|'		+
-			   'N|NEW|' 		+
+			   'N|NEW|'		+
 			   'O|OPEN|'		+	  
 			   'Q|QUIT|'		+
 			   'R|READ|'		+
-			   'S|SET|' 		+
+			   'S|SET|'		+
 			   'TC|TCOMMIT|'	+
 			   'TRE|TRESTART|'	+
 			   'TRO|TROLLBACK|' +
-			   'TS|TSTART|' 	+
-			   'U|USE|' 		+
+			   'TS|TSTART|'	+
+			   'U|USE|'		+
 			   'V|VIEW|'		+  
 			   'W|WRITE|'		+
 			   'X|XECUTE';
@@ -85,7 +85,7 @@ var intrinsicVariables = 'D|DEVICE|'	   +
 						 'Y|'			   +
 						 'Z[A-Z]*|';	
 
-var intrinsicFunctions = 'A|ASCII|' 	   +
+var intrinsicFunctions = 'A|ASCII|'	   +
 						 'C|CHAR|'		   +
 						 'D|DATA|'		   +
 						 'E|EXTRACT|'	   +
@@ -94,12 +94,12 @@ var intrinsicFunctions = 'A|ASCII|' 	   +
 						 'G|GET|'		   +
 						 'J|JUSTIFY|'	   +
 						 'L|LENGTH|'	   +
-						 'NA|NAME|' 	   +
-						 'O|ORDER|' 	   +
-						 'P|PIECE|' 	   +
+						 'NA|NAME|'	   +
+						 'O|ORDER|'	   +
+						 'P|PIECE|'	   +
 						 'QL|QLENGTH|'	   +
 						 'QS|QSUBSCRIPT|'  +
-						 'Q|QUERY|' 	   +
+						 'Q|QUERY|'	   +
 						 'R|RANDOM|'	   +
 						 'RE|REVERSE|'	   +
 						 'S|SELECT|'	   +
@@ -121,7 +121,7 @@ var shortcutStylePatterns = [
 
 var fallthroughStylePatterns = [
 		 // A line comment that starts with ;
-		 [PR['PR_COMMENT'], 	/^;[^\r\n]*/, null, ';'],
+		 [PR['PR_COMMENT'],	/^;[^\r\n]*/, null, ';'],
 		 // Add intrinsic variables and functions as declarations, there not really but it mean
 		 // they will hilighted differently from commands.
 		 [PR['PR_DECLARATION'], new RegExp('^(?:\\$(?:' + intrinsic + '))\\b', 'i'), null],

src/js/dependencies/prettify/lang-pascal.js

@@ -19,14 +19,14 @@ PR.registerLangHandler(
 		  // 'single-line-string'
 		  [PR.PR_STRING,		/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$))/, null, '\''],
 		  // Whitespace
-		  [PR.PR_PLAIN, 		/^\s+/, null, ' \r\n\t\xA0']
+		  [PR.PR_PLAIN,		/^\s+/, null, ' \r\n\t\xA0']
 		],
 		[ // fallthroughStylePatterns
 		  // A cStyleComments comment (* *) or {}
 		  [PR.PR_COMMENT,		/^\(\*[\s\S]*?(?:\*\)|$)|^\{[\s\S]*?(?:\}|$)/, null],
 		  [PR.PR_KEYWORD,		/^(?:ABSOLUTE|AND|ARRAY|ASM|ASSEMBLER|BEGIN|CASE|CONST|CONSTRUCTOR|DESTRUCTOR|DIV|DO|DOWNTO|ELSE|END|EXTERNAL|FOR|FORWARD|FUNCTION|GOTO|IF|IMPLEMENTATION|IN|INLINE|INTERFACE|INTERRUPT|LABEL|MOD|NOT|OBJECT|OF|OR|PACKED|PROCEDURE|PROGRAM|RECORD|REPEAT|SET|SHL|SHR|THEN|TO|TYPE|UNIT|UNTIL|USES|VAR|VIRTUAL|WHILE|WITH|XOR)\b/i, null],
 		  [PR.PR_LITERAL,		/^(?:true|false|self|nil)/i, null],
-		  [PR.PR_PLAIN, 		/^[a-z][a-z0-9]*/i, null],
+		  [PR.PR_PLAIN,		/^[a-z][a-z0-9]*/i, null],
 		  // Literals .0, 0, 0.0 0E13
 		  [PR.PR_LITERAL,		/^(?:\$[a-f0-9]+|(?:\d+(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?)/i,  null, '0123456789'],
 		  [PR.PR_PUNCTUATION,	/^.[^\s\w\.$@\'\/]*/, null]

src/js/dependencies/prettify/lang-scala.js

@@ -33,7 +33,7 @@ PR['registerLangHandler'](
 		 [PR['PR_STRING'],
 		  /^(?:"(?:(?:""(?:""?(?!")|[^\\"]|\\.)*"{0,3})|(?:[^"\r\n\\]|\\.)*"?))/,
 		  null, '"'],
-		 [PR['PR_LITERAL'], 	/^`(?:[^\r\n\\`]|\\.)*`?/, null, '`'],
+		 [PR['PR_LITERAL'],	/^`(?:[^\r\n\\`]|\\.)*`?/, null, '`'],
 		 [PR['PR_PUNCTUATION'], /^[!#%&()*+,\-:;<=>?@\[\\\]^{|}~]+/, null,
 		  '!#%&()*+,-:;<=>?@[\\]^{|}~']
 		],
@@ -42,14 +42,14 @@ PR['registerLangHandler'](
 		 // single quote following
 		 // A character literal has single quotes on either side
 		 [PR['PR_STRING'],		/^'(?:[^\r\n\\']|\\(?:'|[^\r\n']+))'/],
-		 [PR['PR_LITERAL'], 	/^'[a-zA-Z_$][\w$]*(?!['$\w])/],
-		 [PR['PR_KEYWORD'], 	/^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/],
-		 [PR['PR_LITERAL'], 	/^(?:true|false|null|this)\b/],
-		 [PR['PR_LITERAL'], 	/^(?:(?:0(?:[0-7]+|X[0-9A-F]+))L?|(?:(?:0|[1-9][0-9]*)(?:(?:\.[0-9]+)?(?:E[+\-]?[0-9]+)?F?|L?))|\\.[0-9]+(?:E[+\-]?[0-9]+)?F?)/i],
+		 [PR['PR_LITERAL'],	/^'[a-zA-Z_$][\w$]*(?!['$\w])/],
+		 [PR['PR_KEYWORD'],	/^(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|object|override|package|private|protected|requires|return|sealed|super|throw|trait|try|type|val|var|while|with|yield)\b/],
+		 [PR['PR_LITERAL'],	/^(?:true|false|null|this)\b/],
+		 [PR['PR_LITERAL'],	/^(?:(?:0(?:[0-7]+|X[0-9A-F]+))L?|(?:(?:0|[1-9][0-9]*)(?:(?:\.[0-9]+)?(?:E[+\-]?[0-9]+)?F?|L?))|\\.[0-9]+(?:E[+\-]?[0-9]+)?F?)/i],
 		 // Treat upper camel case identifiers as types.
 		 [PR['PR_TYPE'],		/^[$_]*[A-Z][_$A-Z0-9]*[a-z][\w$]*/],
 		 [PR['PR_PLAIN'],		/^[$a-zA-Z_][\w$]*/],
-		 [PR['PR_COMMENT'], 	/^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/],
+		 [PR['PR_COMMENT'],	/^\/(?:\/.*|\*(?:\/|\**[^*/])*(?:\*+\/?)?)/],
 		 [PR['PR_PUNCTUATION'], /^(?:\.+|\/)/]
 		]),
 	['scala']);

src/js/dependencies/prettify/lang-tcl.js

@@ -40,14 +40,14 @@ PR['registerLangHandler'](
 		 ['opn',			 /^\{+/, null, '{'],
 		 ['clo',			 /^\}+/, null, '}'],
 		 // A line comment that starts with ;
-		 [PR['PR_COMMENT'], 	/^#[^\r\n]*/, null, '#'],
+		 [PR['PR_COMMENT'],	/^#[^\r\n]*/, null, '#'],
 		 // Whitespace
 		 [PR['PR_PLAIN'],		/^[\t\n\r \xA0]+/, null, '\t\n\r \xA0'],
 		 // A double quoted, possibly multi-line, string.
 		 [PR['PR_STRING'],		/^\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)/, null, '"']
 		],
 		[
-		 [PR['PR_KEYWORD'], 	/^(?:after|append|apply|array|break|case|catch|continue|error|eval|exec|exit|expr|for|foreach|if|incr|info|proc|return|set|switch|trace|uplevel|upvar|while)\b/, null],
+		 [PR['PR_KEYWORD'],	/^(?:after|append|apply|array|break|case|catch|continue|error|eval|exec|exit|expr|for|foreach|if|incr|info|proc|return|set|switch|trace|uplevel|upvar|while)\b/, null],
 		 [PR['PR_LITERAL'],
 		  /^[+\-]?(?:[0#]x[0-9a-f]+|\d+\/\d+|(?:\.\d+|\d+(?:\.\d*)?)(?:[ed][+\-]?\d+)?)/i],
 		 // A single quote possibly followed by a word that optionally ends with

src/js/dependencies/prettify/lang-vb.js

@@ -45,7 +45,7 @@ PR['registerLangHandler'](
 		 // VB6 apparently allows _ as an escape sequence for newlines though
 		 // this is not a documented feature of VB.net.
 		 // http://meta.stackoverflow.com/q/121497/137403
-		 [PR['PR_COMMENT'], 	/^[\'\u2018\u2019](?:_(?:\r\n?|[^\r]?)|[^\r\n_\u2028\u2029])*/, null, '\'\u2018\u2019']
+		 [PR['PR_COMMENT'],	/^[\'\u2018\u2019](?:_(?:\r\n?|[^\r]?)|[^\r\n_\u2028\u2029])*/, null, '\'\u2018\u2019']
 		],
 		[
 		 [PR['PR_KEYWORD'], /^(?:AddHandler|AddressOf|Alias|And|AndAlso|Ansi|As|Assembly|Auto|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|CShort|CSng|CStr|CType|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|Finally|For|Friend|Function|Get|GetType|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|New|Next|Not|NotInheritable|NotOverridable|Object|On|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Preserve|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|RemoveHandler|Resume|Return|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|Try|TypeOf|Unicode|Until|Variant|Wend|When|While|With|WithEvents|WriteOnly|Xor|EndIf|GoSub|Let|Variant|Wend)\b/i, null],

src/js/dependencies/prettify/lang-wiki.js

@@ -36,7 +36,7 @@ PR['registerLangHandler'](
 		 // Meta-info like #summary, #labels, etc.
 		 ['lang-wiki.meta',  /(?:^^|\r\n?|\n)(#[a-z]+)\b/],
 		 // A WikiWord
-		 [PR['PR_LITERAL'], 	/^(?:[A-Z][a-z][a-z0-9]+[A-Z][a-z][a-zA-Z0-9]+)\b/
+		 [PR['PR_LITERAL'],	/^(?:[A-Z][a-z][a-z0-9]+[A-Z][a-z][a-zA-Z0-9]+)\b/
 		  ],
 		 // A preformatted block in an unknown language
 		 ['lang-',			 /^\{\{\{([\s\S]+?)\}\}\}/],