kmx.io/prism.js

diff --git a/components/prism-css.js b/components/prism-css.js
index 77f94d4..4d75068 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -2,10 +2,18 @@ Prism.languages.css = {
 	'comment': /\/\*[\w\W]*?\*\//g,
 	'atrule': /@[\w-]+?(\s+[^;{]+)?(?=\s*{|\s*;)/gi,
 	'url': /url\((["']?).*?\1\)/gi,
-	'selector': /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
-	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
+	'selector': {
+		pattern: /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
+		inside: {
+			'pseudo': /:[-a-z0-9]+/g
+		}
+	},
 	'string': /("|')(\\?.)*?\1/g,
+	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
 	'important': /\B!important\b/gi,
+	'hexcode': /#[0-9a-f]{3,6}/gi,
+	'number': /[0-9%\.]+/g,
+	'function': /(attr|calc|cross-fade|cycle|element|hsl|hsla|image|lang|linear-gradient|matrix|matrix3d|perspective|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|rgb|rgba|rotate|rotatex|rotatey|rotatez|rotate3d|scale|scalex|scaley|scalez|scale3d|skew|skewx|skewy|steps|translate|translatex|translatey|translatez|translate3d|url|var)/ig,
 	'ignore': /&(lt|gt|amp);/gi,
 	'punctuation': /[\{\};:]/g
 };
diff --git a/examples.html b/examples.html
index 4797e90..3aa0589 100644
--- a/examples.html
+++ b/examples.html
@@ -156,6 +156,21 @@ ol {}</code></pre>
 
 	<h2>URL</h2>
 	<pre><code>content: url(foo.png);</code></pre>
+
+	<h2>Full Example</h2>
+	<pre><code>@media all {
+	div {
+		display: block;
+		*display: inline;
+		width: 100%;
+		height: 25px;
+		color: #000;
+	}
+
+	div:after {
+		content: attr(title);
+	}
+}</code></pre>
 </pre>
 </section>
 
diff --git a/prism.js b/prism.js
index 062e0b6..c280adc 100644
--- a/prism.js
+++ b/prism.js
@@ -17,10 +17,10 @@ var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
 
 var _ = self.Prism = {
 	util: {
-		type: function (o) { 
+		type: function (o) {
 			return Object.prototype.toString.call(o).match(/\[object (\w+)\]/)[1];
 		},
-		
+
 		// Deep clone a language definition (e.g. to extend it)
 		clone: function (o) {
 			var type = _.util.type(o);
@@ -28,66 +28,66 @@ var _ = self.Prism = {
 			switch (type) {
 				case 'Object':
 					var clone = {};
-					
+
 					for (var key in o) {
 						if (o.hasOwnProperty(key)) {
 							clone[key] = _.util.clone(o[key]);
 						}
 					}
-					
+
 					return clone;
-					
+
 				case 'Array':
 					return o.slice();
 			}
-			
+
 			return o;
 		}
 	},
-	
+
 	languages: {
 		extend: function (id, redef) {
 			var lang = _.util.clone(_.languages[id]);
-			
+
 			for (var key in redef) {
 				lang[key] = redef[key];
 			}
-			
+
 			return lang;
 		},
-		
+
 		// Insert a token before another token in a language literal
 		insertBefore: function (inside, before, insert, root) {
 			root = root || _.languages;
 			var grammar = root[inside];
 			var ret = {};
-				
+
 			for (var token in grammar) {
-			
+
 				if (grammar.hasOwnProperty(token)) {
-					
+
 					if (token == before) {
-					
+
 						for (var newToken in insert) {
-						
+
 							if (insert.hasOwnProperty(newToken)) {
 								ret[newToken] = insert[newToken];
 							}
 						}
 					}
-					
+
 					ret[token] = grammar[token];
 				}
 			}
-			
+
 			return root[inside] = ret;
 		},
-		
+
 		// Traverse a language definition with Depth First Search
 		DFS: function(o, callback) {
 			for (var i in o) {
 				callback.call(o, i, o[i]);
-				
+
 				if (_.util.type(o) === 'Object') {
 					_.languages.DFS(o[i], callback);
 				}
@@ -102,15 +102,15 @@ var _ = self.Prism = {
 			_.highlightElement(element, async === true, callback);
 		}
 	},
-		
+
 	highlightElement: function(element, async, callback) {
 		// Find language
 		var language, grammar, parent = element;
-		
+
 		while (parent && !lang.test(parent.className)) {
 			parent = parent.parentNode;
 		}
-		
+
 		if (parent) {
 			language = (parent.className.match(lang) || [,''])[1];
 			grammar = _.languages[language];
@@ -119,48 +119,48 @@ var _ = self.Prism = {
 		if (!grammar) {
 			return;
 		}
-		
+
 		// Set language on the element, if not present
 		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
-		
+
 		// Set language on the parent, for styling
 		parent = element.parentNode;
-		
+
 		if (/pre/i.test(parent.nodeName)) {
-			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language; 
+			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
 		var code = element.textContent;
-		
+
 		if(!code) {
 			return;
 		}
-		
+
 		code = code.replace(/&/g, '&amp;').replace(/</g, '&lt;')
 		           .replace(/>/g, '&gt;').replace(/\u00a0/g, ' ');
 		//console.time(code.slice(0,50));
-		
+
 		var env = {
 			element: element,
 			language: language,
 			grammar: grammar,
 			code: code
 		};
-		
+
 		_.hooks.run('before-highlight', env);
-		
+
 		if (async && self.Worker) {
-			var worker = new Worker(_.filename);	
-			
+			var worker = new Worker(_.filename);
+
 			worker.onmessage = function(evt) {
 				env.highlightedCode = Token.stringify(JSON.parse(evt.data), language);
 				env.element.innerHTML = env.highlightedCode;
-				
+
 				callback && callback.call(env.element);
 				//console.timeEnd(code.slice(0,50));
 				_.hooks.run('after-highlight', env);
 			};
-			
+
 			worker.postMessage(JSON.stringify({
 				language: env.language,
 				code: env.code
@@ -169,61 +169,61 @@ var _ = self.Prism = {
 		else {
 			env.highlightedCode = _.highlight(env.code, env.grammar, env.language)
 			env.element.innerHTML = env.highlightedCode;
-			
+
 			callback && callback.call(element);
-			
+
 			_.hooks.run('after-highlight', env);
 			//console.timeEnd(code.slice(0,50));
 		}
 	},
-	
+
 	highlight: function (text, grammar, language) {
 		return Token.stringify(_.tokenize(text, grammar), language);
 	},
-	
+
 	tokenize: function(text, grammar, language) {
 		var Token = _.Token;
-		
+
 		var strarr = [text];
-		
+
 		var rest = grammar.rest;
-		
+
 		if (rest) {
 			for (var token in rest) {
 				grammar[token] = rest[token];
 			}
-			
+
 			delete grammar.rest;
 		}
-								
+
 		tokenloop: for (var token in grammar) {
 			if(!grammar.hasOwnProperty(token) || !grammar[token]) {
 				continue;
 			}
-			
-			var pattern = grammar[token], 
+
+			var pattern = grammar[token],
 				inside = pattern.inside,
 				lookbehind = !!pattern.lookbehind || 0;
-			
+
 			pattern = pattern.pattern || pattern;
-			
+
 			for (var i=0; i<strarr.length; i++) { // Don’t cache length as it changes during the loop
-				
+
 				var str = strarr[i];
-				
+
 				if (strarr.length > text.length) {
 					// Something went terribly wrong, ABORT, ABORT!
 					break tokenloop;
 				}
-				
+
 				if (str instanceof Token) {
 					continue;
 				}
-				
+
 				pattern.lastIndex = 0;
-				
+
 				var match = pattern.exec(str);
-				
+
 				if (match) {
 					if(lookbehind) {
 						lookbehind = match[1].length;
@@ -234,22 +234,22 @@ var _ = self.Prism = {
 					    len = match.length,
 					    to = from + len,
 						before = str.slice(0, from + 1),
-						after = str.slice(to + 1); 
+						after = str.slice(to + 1);
 
 					var args = [i, 1];
-					
+
 					if (before) {
 						args.push(before);
 					}
-					
+
 					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match);
-					
+
 					args.push(wrapped);
-					
+
 					if (after) {
 						args.push(after);
 					}
-					
+
 					Array.prototype.splice.apply(strarr, args);
 				}
 			}
@@ -257,25 +257,25 @@ var _ = self.Prism = {
 
 		return strarr;
 	},
-	
+
 	hooks: {
 		all: {},
-		
+
 		add: function (name, callback) {
 			var hooks = _.hooks.all;
-			
+
 			hooks[name] = hooks[name] || [];
-			
+
 			hooks[name].push(callback);
 		},
-		
+
 		run: function (name, env) {
 			var callbacks = _.hooks.all[name];
-			
+
 			if (!callbacks || !callbacks.length) {
 				return;
 			}
-			
+
 			for (var i=0, callback; callback = callbacks[i++];) {
 				callback(env);
 			}
@@ -298,7 +298,7 @@ Token.stringify = function(o, language, parent) {
 			return Token.stringify(element, language, o);
 		}).join('');
 	}
-	
+
 	var env = {
 		type: o.type,
 		content: Token.stringify(o.content, language, parent),
@@ -308,21 +308,21 @@ Token.stringify = function(o, language, parent) {
 		language: language,
 		parent: parent
 	};
-	
+
 	if (env.type == 'comment') {
 		env.attributes['spellcheck'] = 'true';
 	}
-	
+
 	_.hooks.run('wrap', env);
-	
+
 	var attributes = '';
-	
+
 	for (var name in env.attributes) {
 		attributes += name + '="' + (env.attributes[name] || '') + '"';
 	}
-	
+
 	return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.tag + '>';
-	
+
 };
 
 if (!self.document) {
@@ -331,11 +331,11 @@ if (!self.document) {
 		var message = JSON.parse(evt.data),
 		    lang = message.language,
 		    code = message.code;
-		
+
 		self.postMessage(JSON.stringify(_.tokenize(code, _.languages[lang])));
 		self.close();
 	}, false);
-	
+
 	return;
 }
 
@@ -346,7 +346,7 @@ script = script[script.length - 1];
 
 if (script) {
 	_.filename = script.src;
-	
+
 	if (document.addEventListener && !script.hasAttribute('data-manual')) {
 		document.addEventListener('DOMContentLoaded', _.highlightAll);
 	}
@@ -386,7 +386,7 @@ Prism.languages.markup = {
 					'namespace': /^[\w-]+?:/
 				}
 			}
-			
+
 		}
 	},
 	'entity': /&amp;#?[\da-z]{1,8};/gi
@@ -408,10 +408,18 @@ Prism.languages.css = {
 	'comment': /\/\*[\w\W]*?\*\//g,
 	'atrule': /@[\w-]+?(\s+[^;{]+)?(?=\s*{|\s*;)/gi,
 	'url': /url\((["']?).*?\1\)/gi,
-	'selector': /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
-	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
+	'selector': {
+		pattern: /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
+		inside: {
+			'pseudo': /:[-a-z0-9]+/g
+		}
+	},
 	'string': /("|')(\\?.)*?\1/g,
+	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
 	'important': /\B!important\b/gi,
+	'hexcode': /#[0-9a-f]{3,6}/gi,
+	'number': /[0-9%\.]+/g,
+	'function': /(attr|calc|cross-fade|cycle|element|hsl|hsla|image|lang|linear-gradient|matrix|matrix3d|perspective|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|rgb|rgba|rotate|rotatex|rotatey|rotatez|rotate3d|scale|scalex|scaley|scalez|scale3d|skew|skewx|skewy|steps|translate|translatex|translatey|translatez|translate3d|url|var)/ig,
 	'ignore': /&(lt|gt|amp);/gi,
 	'punctuation': /[\{\};:]/g
 };