Merge pull request #1 from LeaVerou/gh-pages

sync

.gitignore

@@ -1 +1,3 @@
-hide-*.js
+hide-*.js
+node_modules
+.idea/

bower.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "main": [
       "prism.js",
-      "prism.css"
+      "themes/prism.css"
   ],
   "homepage": "http://prismjs.com",
   "authors": "Lea Verou",

components.js

@@ -34,12 +34,18 @@ var components = {
 	"languages": {
 		"meta": {
 			"path": "components/prism-{id}",
-			"noCSS": true
+			"noCSS": true,
+			"examplesPath": "examples/prism-{id}"
 		},
 		"markup": {
 			"title": "Markup",
 			"option": "default"
 		},
+		"twig": {
+			"title": "Twig",
+			"require": "markup",
+			"owner": "brandonkelly"
+		},
 		"css": {
 			"title": "CSS",
 			"option": "default"
@@ -53,22 +59,26 @@ var components = {
 			"title": "C-like",
 			"option": "default"
 		},
+		"eiffel": {
+			"title": "Eiffel",
+			"owner": "Conaclos"
+		},
 		"javascript": {
 			"title": "JavaScript",
 			"option": "default",
 			"require": "clike"
 		},
-		"java" : {
+		"java": {
 			"title": "Java",
 			"require": "clike",
 			"owner": "sherblot"
 		},
-		"php" : {
+		"php": {
 			"title": "PHP",
 			"require": "clike",
 			"owner": "milesj"
 		},
-		"php-extras" : {
+		"php-extras": {
 			"title": "PHP Extras",
 			"require": "php",
 			"owner": "milesj"
@@ -83,7 +93,7 @@ var components = {
 			"require": "css",
 			"owner": "MoOx"
 		},
-		"bash" : {
+		"bash": {
 			"title": "Bash",
 			"require": "clike",
 			"owner": "zeitgeist87"
@@ -102,6 +112,10 @@ var components = {
 			"title": "Python",
 			"owner": "multipetros"
 		},
+		"julia": {
+			"title": "julia",
+			"owner": "cdagnino"
+		},
 		"sql": {
 			"title": "SQL",
 			"owner": "multipetros"
@@ -152,6 +166,10 @@ var components = {
 			"require": "java",
 			"owner": "jozic"
 		},
+		"haskell": {
+			"title": "Haskell",
+			"owner": "bholst"
+		},
 		"swift": {
 			"title": "Swift",
 			"require": "clike",
@@ -169,6 +187,121 @@ var components = {
 		"ini": {
 			"title": "Ini",
 			"owner": "aviaryan"
+		},
+		"latex": {
+			"title": "LaTeX",
+			"owner": "japborst"
+		},
+		"apacheconf": {
+			"title": "Apache Configuration",
+			"owner": "GuiTeK"
+		},
+		"git": {
+			"title": "Git",
+			"owner": "lgiraudel"
+		},
+		"scheme" : {
+			"title": "Scheme",
+			"owner" : "bacchus123"
+		},
+		"nasm": {
+			"title": "NASM",
+			"owner": "rbmj"
+		},
+		"perl": {
+			"title": "Perl",
+			"owner": "Golmote"
+		},
+		"handlebars": {
+			"title": "Handlebars",
+			"require": "markup",
+			"owner": "Golmote"
+		},
+		"matlab": {
+			"title": "MATLAB",
+			"owner": "Golmote"
+		},
+		"less": {
+			"title": "Less",
+			"require": "css",
+			"owner": "Golmote"
+		},
+		"r": {
+			"title": "R",
+			"owner": "Golmote"
+		},
+		"lolcode": {
+			"title": "LOLCODE",
+			"owner": "Golmote"
+		},
+		"fortran": {
+			"title": "Fortran",
+			"owner": "Golmote"
+		},
+		"erlang": {
+			"title": "Erlang",
+			"owner": "Golmote"
+		},
+		"haml": {
+			"title": "Haml",
+			"require": "ruby",
+			"owner": "Golmote"
+		},
+		"jade": {
+			"title": "Jade",
+			"require": "javascript",
+			"owner": "Golmote"
+		},
+		"pascal": {
+			"title": "Pascal",
+			"owner": "Golmote"
+		},
+		"applescript": {
+			"title": "AppleScript",
+			"owner": "Golmote"
+		},
+		"rust": {
+			"title": "Rust",
+			"owner": "Golmote"
+		},
+		"dart": {
+			"title": "Dart",
+			"require": "clike",
+			"owner": "Golmote"
+		},
+		"powershell": {
+			"title": "PowerShell",
+			"owner": "nauzilus"
+		},
+		"smarty": {
+			"title": "Smarty",
+			"require": "markup",
+			"owner": "Golmote"
+		},
+		"actionscript": {
+			"title": "ActionScript",
+			"require": "javascript",
+			"owner": "Golmote"
+		},
+		"markdown": {
+			"title": "Markdown",
+			"require": "markup",
+			"owner": "Golmote"
+		},
+		"jsx":{
+			"title": "React JSX",
+			"require": ["markup", "javascript"],
+			"owner": "vkbansal"
+		},
+		"typescript":{
+			"title": "TypeScript",
+			"require": "javascript",
+			"owner": "vkbansal"
+		},
+		"fsharp": {
+			"title": "F#",
+			"require": "clike",
+			"owner": "simonreynolds7"
 		}
 	},
 	"plugins": {
@@ -191,6 +324,11 @@ var components = {
 		"show-language": {
 			"title": "Show Language",
 			"owner": "nauzilus"
+		},
+		"highlight-keywords": {
+			"title": "Highlight Keywords",
+			"owner": "vkbansal",
+			"noCSS": true
 		}
 	}
 };

components/prism-actionscript.js

@@ -0,0 +1,20 @@
+/* TODO
+	Fix XML highlighting
+ */
+
+Prism.languages.actionscript = Prism.languages.extend('javascript',  {
+	'keyword': /\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,
+	'operator': /(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=)=?|[=~?@]/
+});
+Prism.languages.actionscript['class-name'].alias = 'function';
+
+if (Prism.languages.markup) {
+	Prism.languages.insertBefore('actionscript', 'operator', {
+		'xml': {
+			pattern: /(^|[^.])<[\s\S]*>(?=\s*($|[\r\n,.;\]})<]))/,
+			inside: {
+				rest: Prism.languages.markup
+			}
+		}
+	});
+}