Merge branch 'gh-pages' into prism-keep-markup

Conflicts:
	components.js

components.js

@@ -501,6 +501,11 @@ var components = {
 			"require": "previewer-base",
 			"owner": "Golmote"
 		},
+		"autoloader": {
+			"title": "Autoloader",
+			"owner": "Golmote",
+			"noCSS": true
+		},
 		"keep-markup": {
 			"title": "Keep Markup",
 			"owner": "Golmote",

components/prism-clike.js

@@ -9,7 +9,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
+	'string': /(["'])(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
 		pattern: /((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,

components/prism-handlebars.js

@@ -73,7 +73,8 @@
 		}
 
 		for (var i = 0, t; t = env.tokenStack[i]; i++) {
-			env.highlightedCode = env.highlightedCode.replace('___HANDLEBARS' + (i + 1) + '___', Prism.highlight(t, env.grammar, 'handlebars'));
+			// The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
+			env.highlightedCode = env.highlightedCode.replace('___HANDLEBARS' + (i + 1) + '___', Prism.highlight(t, env.grammar, 'handlebars').replace(/\$/g, '$$$$'));
 		}
 
 		env.element.innerHTML = env.highlightedCode;

components/prism-php.js

@@ -85,7 +85,8 @@ if (Prism.languages.markup) {
 		}
 
 		for (var i = 0, t; t = env.tokenStack[i]; i++) {
-			env.highlightedCode = env.highlightedCode.replace('{{{PHP' + (i + 1) + '}}}', Prism.highlight(t, env.grammar, 'php'));
+			// The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
+			env.highlightedCode = env.highlightedCode.replace('{{{PHP' + (i + 1) + '}}}', Prism.highlight(t, env.grammar, 'php').replace(/\$/g, '$$$$'));
 		}
 
 		env.element.innerHTML = env.highlightedCode;

components/prism-sass.js

@@ -21,7 +21,13 @@
 
 
 	var variable = /((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i;
-	var operator = /[-+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/;
+	var operator = [
+		/[+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/,
+		{
+			pattern: /(\s+)-(?=\s)/,
+			lookbehind: true
+		}
+	];
 
 	Prism.languages.insertBefore('sass', 'property', {
 		// We want to consume the whole line

components/prism-smarty.js

@@ -117,7 +117,8 @@
 		}
 
 		for (var i = 0, t; t = env.tokenStack[i]; i++) {
-			env.highlightedCode = env.highlightedCode.replace('___SMARTY' + (i + 1) + '___', Prism.highlight(t, env.grammar, 'smarty'));
+			// The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
+			env.highlightedCode = env.highlightedCode.replace('___SMARTY' + (i + 1) + '___', Prism.highlight(t, env.grammar, 'smarty').replace(/\$/g, '$$$$'));
 		}
 
 		env.element.innerHTML = env.highlightedCode;

gulpfile.js

@@ -18,7 +18,8 @@ var gulp   = require('gulp'),
 			'plugins/file-highlight/prism-file-highlight.js'
 		],
 		plugins: ['plugins/**/*.js', '!plugins/**/*.min.js'],
-		showLanguagePlugin: 'plugins/show-language/prism-show-language.js'
+		showLanguagePlugin: 'plugins/show-language/prism-show-language.js',
+		autoloaderPlugin: 'plugins/autoloader/prism-autoloader.js'
 	};
 
 gulp.task('components', function() {
@@ -37,7 +38,7 @@ gulp.task('build', function() {
 		.pipe(gulp.dest('./'));
 });
 
-gulp.task('plugins', ['show-language-plugin'], function() {
+gulp.task('plugins', ['languages-plugins'], function() {
 	return gulp.src(paths.plugins)
 		.pipe(uglify())
 		.pipe(rename({ suffix: '.min' }))
@@ -49,7 +50,7 @@ gulp.task('watch', function() {
 	gulp.watch(paths.plugins, ['plugins', 'build']);
 });
 
-gulp.task('show-language-plugin', function (cb) {
+gulp.task('languages-plugins', function (cb) {
 	fs.readFile(paths.componentsFile, {
 		encoding: 'utf-8'
 	}, function (err, data) {
@@ -59,25 +60,49 @@ gulp.task('show-language-plugin', function (cb) {
 				data = JSON.parse(data);
 
 				var languagesMap = {};
+				var dependenciesMap = {};
 				for (var p in data.languages) {
 					if (p !== 'meta') {
 						var title = data.languages[p].displayTitle || data.languages[p].title;
 						var ucfirst = p.substring(0, 1).toUpperCase() + p.substring(1);
 						if (title !== ucfirst) {
 							languagesMap[p] = title;
 						}
+
+						if(data.languages[p].require) {
+							dependenciesMap[p] = data.languages[p].require;
+						}
 					}
 				}
 
-				var jsonLanguages = JSON.stringify(languagesMap);
-				var stream = gulp.src(paths.showLanguagePlugin)
-					.pipe(replace(
-						/\/\*languages_placeholder\[\*\/[\s\S]*?\/\*\]\*\//,
-						'/*languages_placeholder[*/' + jsonLanguages + '/*]*/'
-					))
-					.pipe(gulp.dest(paths.showLanguagePlugin.substring(0, paths.showLanguagePlugin.lastIndexOf('/'))));
-				stream.on('error', cb);
-				stream.on('end', cb);
+				var jsonLanguagesMap = JSON.stringify(languagesMap);
+				var jsonDependenciesMap = JSON.stringify(dependenciesMap);
+
+				var tasks = [
+					{plugin: paths.showLanguagePlugin, map: jsonLanguagesMap},
+					{plugin: paths.autoloaderPlugin, map: jsonDependenciesMap}
+				];
+
+				var cpt = 0;
+				var l = tasks.length;
+				var done = function() {
+					cpt++;
+					if(cpt === l) {
+						cb && cb();
+					}
+				};
+
+				tasks.forEach(function(task) {
+					var stream = gulp.src(task.plugin)
+						.pipe(replace(
+							/\/\*languages_placeholder\[\*\/[\s\S]*?\/\*\]\*\//,
+							'/*languages_placeholder[*/' + task.map + '/*]*/'
+						))
+						.pipe(gulp.dest(task.plugin.substring(0, task.plugin.lastIndexOf('/'))));
+
+					stream.on('error', done);
+					stream.on('end', done);
+				});
 
 			} catch (e) {
 				cb(e);