Update dist

Author: ioquatix

dist/base/jquery.syntax.core.css

@@ -1,3 +1,18 @@
+pre code.syntax-theme-base {
+  display: block; }
+  pre code.syntax-theme-base > span {
+    display: block;
+    white-space: pre-wrap; }
+  pre code.syntax-theme-base .indent {
+    display: block;
+    float: left; }
+  pre code.syntax-theme-base .text {
+    white-space: pre-wrap;
+    display: block;
+    overflow: hidden;
+    padding-left: 1rem;
+    text-indent: -1rem; }
+
 .syntax-theme-base {
   font-family: Menlo, Monaco, Consolas, monospace;
   line-height: 1.15em; }

dist/base/jquery.syntax.layout.editor.css renamed to dist/base/jquery.syntax.editor.css

@@ -1 +1 @@
-Syntax.themes["bright"] = ["grey", "base"]
+Syntax.themes["bright"] = ["base"]

dist/base/jquery.syntax.layout.fixed.css

@@ -56,16 +56,9 @@ Syntax.styles["jquery.syntax.brush.python"] = ["base/jquery.syntax.brush.python.
 Syntax.styles["jquery.syntax.brush.ruby"] = ["base/jquery.syntax.brush.ruby.css"];
 Syntax.styles["jquery.syntax.brush.xml"] = ["base/jquery.syntax.brush.xml.css"];
 Syntax.styles["jquery.syntax.core"] = ["base/jquery.syntax.core.css", "bright/jquery.syntax.core.css", "paper/jquery.syntax.core.css"];
-Syntax.styles["jquery.syntax.layout.editor"] = ["base/jquery.syntax.layout.editor.css", "grey/jquery.syntax.layout.editor.css", "modern/jquery.syntax.layout.editor.css"];
-Syntax.styles["jquery.syntax.layout.fixed"] = ["base/jquery.syntax.layout.fixed.css", "grey/jquery.syntax.layout.fixed.css", "modern/jquery.syntax.layout.fixed.css", "paper/jquery.syntax.layout.fixed.css"];
-Syntax.styles["jquery.syntax.layout.list"] = ["base/jquery.syntax.layout.list.css", "grey/jquery.syntax.layout.list.css"];
-Syntax.styles["jquery.syntax.layout.plain"] = ["base/jquery.syntax.layout.plain.css", "grey/jquery.syntax.layout.plain.css", "modern/jquery.syntax.layout.plain.css"];
-Syntax.styles["jquery.syntax.layout.table"] = ["base/jquery.syntax.layout.table.css", "grey/jquery.syntax.layout.table.css"];
-Syntax.styles["jquery.syntax.layout.inline"] = ["grey/jquery.syntax.layout.inline.css", "modern/jquery.syntax.layout.inline.css", "paper/jquery.syntax.layout.inline.css"];
+Syntax.styles["jquery.syntax.editor"] = ["base/jquery.syntax.editor.css"];
 
 // Theme Configuration
 Syntax.themes["base"] = []
-Syntax.themes["bright"] = ["grey", "base"]
-Syntax.themes["grey"] = ["base"]
-Syntax.themes["modern"] = ["base"]
+Syntax.themes["bright"] = ["base"]
 Syntax.themes["paper"] = ["base"]

dist/base/jquery.syntax.layout.list.css

@@ -79,73 +79,6 @@ Syntax.extractElementMatches = function (elems, offset) {
 	return matches;
 }
 
-// Basic layout doesn't do anything e.g. identity layout.
-Syntax.layouts.preformatted = function (options, html, container) {
-	return html;
-};
-
-
-// This function converts from a compressed set of offsets of the form:
-//	[
-//		[offset, width, totalOffset],
-//		...
-//	]
-// This means that at a $offset, a tab (single character) was expanded to $width
-// single space characters.
-// This function produces a lookup table of offsets, where a given character offset
-// is mapped to how far the character has been offset.
-Syntax.convertToLinearOffsets = function (offsets, length) {
-	var current = 0, changes = [];
-	
-	// Anything with offset after offset[current][0] but smaller than offset[current+1][0]
-	// has been shifted right by offset[current][2]
-	for (var i = 0; i < length; i++) {
-		if (offsets[current] && i > offsets[current][0]) {
-			// Is there a next offset?
-			if (offsets[current+1]) {
-				// Is the index less than the start of the next offset?
-				if (i <= offsets[current+1][0]) {
-					changes.push(offsets[current][2]);
-				} else {
-					// If so, move to the next offset.
-					current += 1;
-					i -= 1;
-				}
-			} else {
-				// If there is no next offset we assume this one to the end.
-				changes.push(offsets[current][2]);
-			}
-		} else {
-			changes.push(changes[changes.length-1] || 0);
-		}
-	}
-	
-	return changes;
-}
-
-// Used for tab expansion process, by shifting matches when tab charaters were converted to
-// spaces.
-Syntax.updateMatchesWithOffsets = function (matches, linearOffsets, text) {
-	(function (matches) {
-		for (var i = 0; i < matches.length; i++) {
-			var match = matches[i];
-			
-			// Calculate the new start and end points
-			var offset = match.offset + linearOffsets[match.offset];
-			var end = match.offset + match.length;
-			end += linearOffsets[end];
-			
-			// Start, Length, Text
-			match.adjust(linearOffsets[match.offset], end - offset, text);
-			
-			if (match.children.length > 0)
-				arguments.callee(match.children);
-		}
-	})(matches);
-	
-	return matches;
-};
-
 // A helper function which automatically matches expressions with capture groups from the regular expression match.
 // Each argument position corresponds to the same index regular expression group.
 // Or, override by providing rule.index
@@ -314,6 +247,11 @@ Syntax.Match.prototype.reduce = function (append, process) {
 		container.className += this.expression.klass;
 	}
 
+	if (this.className) {
+		container.className += ' ';
+		container.className += this.className;
+	}
+	
 	for (var i = 0; i < this.children.length; i += 1) {
 		var child = this.children[i], end = child.offset;
 
@@ -773,6 +711,31 @@ Syntax.Match.prototype.split = function(pattern) {
 	});
 };
 
+Syntax.Match.prototype.splitLines = function() {
+	var lines = this.split(/\n/g);
+	
+	for (var i = 0; i < lines.length; i += 1) {
+		var line = lines[i];
+		var indentOffset = line.value.search(/\S/);
+		
+		var top = new Syntax.Match(line.offset, line.length, line.expression, line.value);
+		
+		if (indentOffset > 0) {
+			var parts = line.bisectAtOffsets([line.offset + indentOffset]);
+			top.children = parts;
+			parts[0].expression = {klass: 'indent'};
+			parts[1].expression = {klass: 'text'};
+		} else {
+			line.expression = {klass: 'text'};
+			top.children = [line];
+		}
+		
+		lines[i] = top;
+	}
+	
+	return lines;
+}
+
 Syntax.Brush = function () {
 	// The primary class of this brush. Must be unique.
 	this.klass = null;
@@ -795,7 +758,7 @@ Syntax.Brush.prototype.derives = function (name) {
 			return Syntax.brushes[name].getMatches(text);
 		}
 	});
-}
+};
 
 // Return an array of all classes that the brush consists of.
 // A derivied brush is its own klass + the klass of any and all parents.
@@ -1003,7 +966,7 @@ Syntax.Brush.prototype.buildTree = function(text, offset, additionalMatches) {
 Syntax.Brush.prototype.process = function(text, matches, options) {
 	var top = this.buildTree(text, 0, matches);
 
-	var lines = top.split(/\n/g);
+	var lines = top.splitLines();
 
 	var html = document.createElement('code');
 	html.className = 'syntax';
@@ -1102,37 +1065,31 @@ Syntax.highlight = function (elements, options, callback) {
 		}
 
 		Syntax.highlightText(text, brush, matches, options, function(html, brush/*, text, options*/) {
-			Syntax.layouts.get(options.layout, function(layout) {
-				if (layout) {
-					html = layout(options, jQuery(html), container);
-				} else {
-					html = jQuery(html);
-				}
-				
-				// If there is a theme specified, ensure it is added to the top level class.
-				if (options.theme) {
-					// Load dependencies
-					var themes = Syntax.themes[options.theme];
-					for (var i = 0; i < themes.length; i += 1) {
-						html.addClass("syntax-theme-" + themes[i]);
-					}
+			html = jQuery(html);
 
-					// Add the base theme
-					html.addClass("syntax-theme-" + options.theme);
+			// If there is a theme specified, ensure it is added to the top level class.
+			if (options.theme) {
+				// Load dependencies
+				var themes = Syntax.themes[options.theme];
+				for (var i = 0; i < themes.length; i += 1) {
+					html.addClass("syntax-theme-" + themes[i]);
 				}
 
-				if (brush.postprocess) {
-					html = brush.postprocess(options, html, container);
-				}
+				// Add the base theme
+				html.addClass("syntax-theme-" + options.theme);
+			}
 
-				if (callback) {
-					html = callback(options, html, container);
-				}
+			if (brush.postprocess) {
+				html = brush.postprocess(options, html, container);
+			}
 
-				if (html && options.replace === true) {
-					container.replaceWith(html);
-				}
-			});
+			if (callback) {
+				html = callback(options, html, container);
+			}
+
+			if (html && options.replace === true) {
+				container.replaceWith(html);
+			}
 		});
 	});
 };

dist/base/jquery.syntax.layout.plain.css

@@ -129,10 +129,6 @@ var Syntax = {
 		Syntax.getResource('jquery.syntax.brush', name, callback);
 	}),
 
-	layouts: new ResourceLoader(function (name, callback) {
-		Syntax.getResource('jquery.syntax.layout', name, callback);
-	}),
-	
 	loader: new ResourceLoader(function (name, callback) {
 		Syntax.getResource('jquery.syntax', name, callback);
 	}),