Merge branch 'master' into sk-plans-tidy

services/web/app/coffee/Features/User/UserController.coffee

@@ -143,7 +143,7 @@ module.exports = UserController =
 									type:'success'
 									text:'Your password has been changed'
 			else
-				logger.log user: user, "current password wrong"
+				logger.log user_id: user_id, "current password wrong"
 				res.send
 					message:
 					  type:'error'

services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -39,7 +39,7 @@ pathList = [
 	["#{jsPath}ide.js"]
 	["#{jsPath}main.js"]
 	["#{jsPath}libs.js"]
-	["#{jsPath}#{ace}/ace.js","#{jsPath}#{ace}/mode-latex.js", "#{jsPath}#{ace}/snippets/latex.js"]
+	["#{jsPath}#{ace}/ace.js","#{jsPath}#{ace}/mode-latex.js","#{jsPath}#{ace}/worker-latex.js","#{jsPath}#{ace}/snippets/latex.js"]
 	["#{jsPath}libs/#{pdfjs}/pdf.js"]
 	["#{jsPath}libs/#{pdfjs}/pdf.worker.js"]
 	["#{jsPath}libs/#{pdfjs}/compatibility.js"]

services/web/app/coffee/infrastructure/LoggerSerializers.coffee

@@ -1,5 +1,7 @@
 module.exports =
 	user: (user) ->
+		if !user?
+			return null
 		if !user._id?
 			user = {_id : user}
 		return {
@@ -10,6 +12,8 @@ module.exports =
 		}
 	
 	project: (project) ->
+		if !project?
+			return null
 		if !project._id?
 			project = {_id: project}
 		return {

services/web/app/views/project/editor.jade

@@ -118,6 +118,9 @@ block requirejs
 				"ace/ext-searchbox": {
 					"deps": ["ace/ace"]
 				},
+				"ace/ext-modelist": {
+					"deps": ["ace/ace"]
+				},
 				"ace/ext-language_tools": {
 					"deps": ["ace/ace"]
 				}

services/web/app/views/project/editor/editor.jade

@@ -35,7 +35,8 @@ div.full-size(
 			resize-on="layout:main:resize,layout:pdf:resize",
 			annotations="pdf.logEntryAnnotations[editor.open_doc_id]",
 			read-only="!permissions.write",
-			on-ctrl-enter="recompileViaKey"
+			file-name="editor.open_doc_name",
+			on-ctrl-enter="recompileViaKey",
 			syntax-validation="settings.syntaxValidation"
 		)
 

services/web/public/coffee/ide/connection/ConnectionManager.coffee

@@ -27,6 +27,7 @@ define [], () ->
 
 			@connected = false
 			@userIsInactive = false
+			@gracefullyReconnecting = false
 			
 			@$scope.connection = 
 				reconnecting: false
@@ -54,6 +55,7 @@ define [], () ->
 			@ide.socket.on "connect", () =>
 				sl_console.log "[socket.io connect] Connected"
 				@connected = true
+				@gracefullyReconnecting = false
 				@ide.pushEvent("connected")
 
 				@$scope.$apply () =>
@@ -81,7 +83,7 @@ define [], () ->
 				@$scope.$apply () =>
 					@$scope.connection.reconnecting = false
 
-				if !$scope.connection.forced_disconnect and !@userIsInactive
+				if !$scope.connection.forced_disconnect and !@userIsInactive and !@gracefullyReconnecting
 					@startAutoReconnectCountdown()
 
 			@ide.socket.on 'forceDisconnect', (message) =>
@@ -97,7 +99,11 @@ define [], () ->
 				setTimeout () ->
 					location.reload()
 				, 10 * 1000
-				
+			
+			@ide.socket.on "reconnectGracefully", () =>
+				sl_console.log "Reconnect gracefully"
+				@reconnectGracefully()
+
 		joinProject: () ->
 			sl_console.log "[joinProject] joining..."
 			@ide.socket.emit 'joinProject', {
@@ -180,3 +186,24 @@ define [], () ->
 				@$scope.$apply () =>
 					@$scope.connection.inactive_disconnect = true
 
+		RECONNECT_GRACEFULLY_RETRY_INTERVAL: 5000 # ms
+		MAX_RECONNECT_GRACEFULLY_INTERVAL: 60 * 5 * 1000 # 5 minutes
+		reconnectGracefully: () ->
+			@reconnectGracefullyStarted ?= new Date()
+			userIsInactive = (new Date() - @lastUserAction) > @RECONNECT_GRACEFULLY_RETRY_INTERVAL
+			maxIntervalReached = (new Date() - @reconnectGracefullyStarted) > @MAX_RECONNECT_GRACEFULLY_INTERVAL
+			if userIsInactive or maxIntervalReached
+				sl_console.log "[reconnectGracefully] User didn't do anything for last 5 seconds, reconnecting"
+				@_reconnectGracefullyNow()
+			else
+				sl_console.log "[reconnectGracefully] User is working, will try again in 5 seconds"
+				setTimeout () =>
+					@reconnectGracefully()
+				, @RECONNECT_GRACEFULLY_RETRY_INTERVAL
+		
+		_reconnectGracefullyNow: () ->
+			@gracefullyReconnecting = true
+			@reconnectGracefullyStarted = null
+			# Clear cookie so we don't go to the same backend server
+			$.cookie("SERVERID", "", { expires: -1, path: "/" })
+			@reconnectImmediately()

services/web/public/coffee/ide/editor/EditorManager.coffee

@@ -8,6 +8,7 @@ define [
 			@$scope.editor = {
 				sharejs_doc: null
 				open_doc_id: null
+				open_doc_name: null
 				opening: true
 			}
 
@@ -59,6 +60,7 @@ define [
 				return
 
 			@$scope.editor.open_doc_id = doc.id
+			@$scope.editor.open_doc_name = doc.name
 
 			@ide.localStorage "doc.open_id.#{@$scope.project_id}", doc.id
 			@ide.fileTreeManager.selectEntity(doc)

services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -2,14 +2,16 @@ define [
 	"base"
 	"ace/ace"
 	"ace/ext-searchbox"
+	"ace/ext-modelist"
 	"ide/editor/directives/aceEditor/undo/UndoManager"
 	"ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager"
 	"ide/editor/directives/aceEditor/spell-check/SpellCheckManager"
 	"ide/editor/directives/aceEditor/highlights/HighlightsManager"
 	"ide/editor/directives/aceEditor/cursor-position/CursorPositionManager"
 	"ide/editor/directives/aceEditor/track-changes/TrackChangesManager"
-], (App, Ace, SearchBox, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager) ->
+], (App, Ace, SearchBox, ModeList, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager) ->
 	EditSession = ace.require('ace/edit_session').EditSession
+	ModeList = ace.require('ace/ext/modelist')
 
 	# set the path for ace workers if using a CDN (from editor.jade)
 	if window.aceWorkerPath != ""
@@ -42,7 +44,8 @@ define [
 				text: "="
 				readOnly: "="
 				annotations: "="
-				navigateHighlights: "=",
+				navigateHighlights: "="
+				fileName: "="
 				onCtrlEnter: "="
 				syntaxValidation: "="
 			}
@@ -204,11 +207,6 @@ define [
 
 				editor.setOption("scrollPastEnd", true)
 
-				resetSession = () ->
-					session = editor.getSession()
-					session.setUseWrapMode(true)
-					session.setMode("ace/mode/latex")
-
 				updateCount = 0
 				onChange = () ->
 					updateCount++
@@ -221,9 +219,18 @@ define [
 					session = editor.getSession()
 					if session?
 						session.destroy()
-					editor.setSession(new EditSession(lines, "ace/mode/latex"))
-					resetSession()
+
+					# see if we can lookup a suitable mode from ace
+					# but fall back to text by default
+					try
+						mode = ModeList.getModeForPath(scope.fileName).mode
+					catch
+						mode = "ace/mode/text"
+
+					editor.setSession(new EditSession(lines, mode))
+
 					session = editor.getSession()
+					session.setUseWrapMode(true)
 
 					doc = session.getDocument()
 					doc.on "change", onChange

services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee

@@ -233,8 +233,16 @@ define [
 			start = aceDelta.start
 			if !start?
 				error = new Error("aceDelta had no start event.")
+				JSONstringifyWithCycles = (o) ->
+					seen = []
+					return JSON.stringify o, (k,v) ->
+						if (typeof v == 'object')
+							if ( !seen.indexOf(v) )
+								return '__cycle__'
+							seen.push(v);
+						return v
 				Raven?.captureException(error, {
-					aceDelta: JSON.stringify(aceDelta)
+					aceDelta: JSONstringifyWithCycles(aceDelta)
 				})
 				throw error
 			linesBefore = docLines.slice(0, start.row)

services/web/public/coffee/ide/references/ReferencesManager.coffee

@@ -17,8 +17,13 @@ define [
 			# When we join the project:
 			#   index all references files
 			#   and don't broadcast to all clients
+			@inited = false
 			@$scope.$on 'project:joined', (e) =>
-				@indexAllReferences(false)
+				# We only need to grab the references when the editor first loads,
+				# not on every reconnect
+				if !@inited
+					@inited = true
+					@indexAllReferences(false)
 
 			setTimeout(
 				(self) ->

services/web/public/coffee/ide/settings/controllers/SettingsController.coffee

@@ -30,7 +30,7 @@ define [
 
 		$scope.$watch "settings.syntaxValidation", (syntaxValidation, oldSyntaxValidation) =>
 			if syntaxValidation != oldSyntaxValidation
-				settings.saveProjectSettings({syntaxValidation: syntaxValidation})
+				settings.saveSettings({syntaxValidation: syntaxValidation})
 
 		$scope.$watch "project.spellCheckLanguage", (language, oldLanguage) =>
 			return if @ignoreUpdates

services/web/public/js/ace-1.2.5/mode-latex.js

@@ -205,128 +205,137 @@ var LatexFoldMode = require("./folding/latex").FoldMode;
 var Range = require("../range").Range;
 var WorkerClient = require("ace/worker/worker_client").WorkerClient;
 
+var createLatexWorker = function (session) {
+    var doc = session.getDocument();
+    var selection = session.getSelection();
+    var cursorAnchor = selection.lead;
+
+    var savedRange = {};
+    var suppressions = [];
+    var hints = [];
+    var changeHandler = null;
+
+    var worker = new WorkerClient(["ace"], "ace/mode/latex_worker", "LatexWorker");
+    worker.attachToDocument(doc);
+
+    doc.on("change", function () {
+        if(changeHandler) {
+            clearTimeout(changeHandler);
+            changeHandler = null;
+        }
+    });
+
+    selection.on("changeCursor", function () {
+        changeHandler = setTimeout(function () {
+            updateMarkers({cursorMoveOnly:true});
+            suppressions = [];
+            changeHandler = null;
+        }, 100);
+    });
+
+    var updateMarkers = function (options) {
+        if (!options) { options = {};};
+        var cursorMoveOnly = options.cursorMoveOnly;
+        var annotations = [];
+        var newRange = {};
+        var cursor = selection.getCursor();
+        suppressions = [];
+
+        for (var i = 0, len = hints.length; i<len; i++) {
+            var hint = hints[i];
+
+            var suppressedChanges = 0;
+            var hintRange = new Range(hint.start_row, hint.start_col, hint.end_row, hint.end_col);
+
+            var cursorInRange = hintRange.insideStart(cursor.row, cursor.column);
+            var cursorAtStart = hintRange.isStart(cursor.row, cursor.column);
+            var cursorAtEnd = hintRange.isEnd(cursor.row, cursor.column);
+            if (hint.suppressIfEditing && (cursorAtStart || cursorAtEnd)) {
+                suppressions.push(hintRange);
+                if (!hint.suppressed) { suppressedChanges++; };
+                hint.suppressed = true;
+                continue;
+            }
+            var isCascadeError = false;
+            for (var j = 0, suplen = suppressions.length; j < suplen; j++) {
+                var badRange = suppressions[j];
+                if (badRange.intersects(hintRange)) {
+                    isCascadeError = true;
+                    break;
+                }
+            }
+            if(isCascadeError) {
+                if (!hint.suppressed) { suppressedChanges++; };
+                hint.suppressed = true;
+                continue;
+            };
+
+            if (hint.suppressed) { suppressedChanges++; };
+            hint.suppressed = false;
+
+            annotations.push(hint);
+            if (hint.type === "info") {
+                continue;
+            };
+            var key = hintRange.toString() + (cursorInRange ? "+cursor" : "");
+            newRange[key] = {hint: hint, cursorInRange: cursorInRange, range: hintRange};
+        }
+        for (key in newRange) {
+            if (!savedRange[key]) {  // doesn't exist in already displayed errors
+                var new_range = newRange[key].range;
+                cursorInRange = newRange[key].cursorInRange;
+                hint = newRange[key].hint;
+                var errorAtStart = (hint.row === hint.start_row && hint.column === hint.start_col);
+                var a = (cursorInRange && !errorAtStart) ? cursorAnchor : doc.createAnchor(new_range.start);
+                var b = (cursorInRange && errorAtStart) ? cursorAnchor : doc.createAnchor(new_range.end);
+                var range = new Range();
+                range.start = a;
+                range.end = b;
+                var cssClass = "ace_error-marker";
+                if (hint.type === "warning") { cssClass = "ace_highlight-marker"; };
+                range.id = session.addMarker(range, cssClass, "text");
+                savedRange[key] = range;
+            }
+        }
+        for (key in savedRange) {
+            if (!newRange[key]) {  // no longer present in list of errors to display
+                range = savedRange[key];
+                if (range.start !== cursorAnchor) { range.start.detach(); }
+                if (range.end !== cursorAnchor) { range.end.detach(); }
+                session.removeMarker(range.id);
+                delete savedRange[key];
+            }
+        }
+        if (!cursorMoveOnly || suppressedChanges) {
+            session.setAnnotations(annotations);
+        };
+
+    };
+    worker.on("lint", function(results) {
+        hints = results.data;
+        if (hints.length > 100) {
+            hints = hints.slice(0, 100); // limit to 100 errors
+        };
+        updateMarkers();
+    });
+    worker.on("terminate", function() {
+        for (var key in savedRange) {
+            var range = savedRange[key];
+            range.start.detach();
+            range.end.detach();
+            session.removeMarker(range.id);
+            delete savedRange[key];
+        }
+
+    });
+
+    return worker;
+};
 
 var Mode = function() {
     this.HighlightRules = LatexHighlightRules;
     this.foldingRules = new LatexFoldMode();
-    this.createWorker = function(session) {
-	var doc = session.getDocument();
-	var selection = session.getSelection();
-
-	var savedRange = {};
-	var suppressions = [];
-	var hints = [];
-	var changeHandler = null;
-
-	var worker = new WorkerClient(["ace"], "ace/mode/latex_worker", "LatexWorker");
-	worker.attachToDocument(doc);
-
-	doc.on("change", function () {
-	    if(changeHandler) {
-		clearTimeout(changeHandler);
-		changeHandler = null;
-	    }
-	});
-
-	selection.on("changeCursor", function () {
-	    if(suppressions.length > 0) {
-		changeHandler = setTimeout(function () {
-		    updateMarkers();
-		    suppressions = [];
-		    changeHandler = null;
-		}, 100);
-	    }
-	});
-
-	var updateMarkers = function () {
-	    var annotations = [];
-	    var newRange = {};
-	    var cursor = selection.getCursor();
-	    suppressions = [];
-
-	    for (var i = 0; i<hints.length; i++) {
-		var data = hints[i];
-		var start_row = data.start_row;
-		var start_col = data.start_col;
-		var end_row = data.end_row;
-		var end_col = data.end_col;
-		if (data.suppressIfEditing &&
-		    ((cursor.row === start_row && cursor.column == start_col+1)
-		     || (cursor.row === end_row && (cursor.column+1) == end_col))) {
-		    suppressions.push([start_row, start_col, end_row, end_col]);
-		    continue;
-		}
-		var suppress = false;
-		for (var j = 0; j < suppressions.length; j++) {
-		    var e=suppressions[j];
-		    var fromRow=e[0], fromCol=e[1], toRow=e[2], toCol=e[3];
-		    if (start_row == fromRow && start_col >= fromCol && start_row === toRow  && start_col <= toCol) {
-			suppress = true;
-			break;
-		    }
-		}
-		if(suppress) { continue; };
-
-		var key = "(" + start_row + "," + start_col + ")" + ":" + "(" + end_row + "," + end_col + ")";
-		newRange[key] = data;
-		annotations.push(data);
-	    }
-
-	    var newKeys = Object.keys(newRange);
-	    var oldKeys = Object.keys(savedRange);
-	    var changes = 0;
-	    for (i = 0; i < newKeys.length; i++) {
-		key = newKeys[i];
-		if (!savedRange[key]) {
-		    var new_range = newRange[key];
-		    var a = doc.createAnchor(new_range.start_row, new_range.start_col);
-		    var b = doc.createAnchor(new_range.end_row, new_range.end_col);
-		    var range = new Range();
-		    range.start = a;
-		    range.end = b;
-		    range.id = session.addMarker(range, "ace_error-marker", "text");
-		    savedRange[key] = range;
-		    changes++;
-		}
-	    }
-
-	    for (i = 0; i < oldKeys.length; i++) {
-		key = oldKeys[i];
-		if (!newRange[key]) {
-		    range = savedRange[key];
-		    range.start.detach();
-		    range.end.detach();
-		    session.removeMarker(range.id);
-		    delete savedRange[key];
-		    changes++;
-		}
-	    }
-
-	    if (changes>0) {
-		session.setAnnotations(annotations);
-	    };
-	};
-
-	worker.on("lint", function(results) {
-	    hints = results.data;
-	    if (hints.length > 100) {
-		hints = hints.slice(0, 100); // limit to 100 errors
-	    };
-	    updateMarkers();
-	});
-
-	worker.on("terminate", function() {
-	    var oldKeys = Object.keys(savedRange);
-	    for (var i = 0; i < oldKeys.length; i++) {
-		var key = oldKeys[i];
-		var range = savedRange[key];
-		session.removeMarker(range.id);
-		delete savedRange[key];
-	    }
-
-	});
-	return worker;
-    };
+    this.createWorker = createLatexWorker;
 };
 oop.inherits(Mode, TextMode);
 

services/web/public/js/ace-1.2.5/worker-latex.js

@@ -1419,407 +1419,634 @@ var LatexWorker = exports.LatexWorker = function(sender) {
 
 oop.inherits(LatexWorker, Mirror);
 
-var Parse = function (text) {
-    var errors = [];
-    var Comments = [];
+var Tokenise = function (text) {
     var Tokens = [];
-    var Environments = [];
+    var Comments = [];
     var pos = -1;
-    var SPECIAL = /[\\\{\}\$\&\#\^\_\~\%]/g;
-    var CS = /[^a-zA-Z]/g;
+    var SPECIAL = /[\\\{\}\$\&\#\^\_\~\%]/g;  // match TeX special characters
+    var NEXTCS = /[^a-zA-Z]/g;  // match characters which aren't part of a TeX control sequence
     var idx = 0;
-    var lineNumber = 0;
-    var linePosition = [];
-    linePosition[0] = 0;
 
-    var TokenError = function (token, message) {
-	var line = token[0], type = token[1], start = token[2], end = token[3], seq = token[4];
-	var start_col = start - linePosition[line];
-	var end_col = end - linePosition[line] + 1;
-	errors.push({row: line,
-		     column: start_col,
-		     start_row:line,
-		     start_col: start_col,
-		     end_row:line,
-		     end_col: end_col,
-		     type:"error",
-		     text:message,
-		     suppressIfEditing:true});
-    };
-
-    var TokenErrorFromTo = function (fromToken, toToken, message) {
-	var fromLine = fromToken[0], fromStart = fromToken[2], fromEnd = fromToken[3];
-	var toLine = toToken[0], toStart = toToken[2], toEnd = toToken[3];
-	if (!toEnd) { toEnd = toStart + 1;};
-	var start_col = fromStart - linePosition[fromLine];
-	var end_col = toEnd - linePosition[toLine] + 1;
-
-	errors.push({row: line,
-		     column: start_col,
-		     start_row: fromLine,
-		     start_col: start_col,
-		     end_row: toLine,
-		     end_col: end_col,
-		     type:"error",
-		     text:message,
-		     suppressIfEditing:true});
-    };
-
-
-    var EnvErrorFromTo = function (fromEnv, toEnv, message, options) {
-	if(!options) { options = {} ; };
-	var fromToken = fromEnv.token, toToken = toEnv.closeToken || toEnv.token;
-	var fromLine = fromToken[0], fromStart = fromToken[2], fromEnd = fromToken[3], fromSeq = fromToken[4];
-	if (!toToken) {toToken = fromToken;};
-	var toLine = toToken[0], toStart = toToken[2], toEnd = toToken[3], toSeq = toToken[4];
-	if (!toEnd) { toEnd = toStart + 1;};
-	var start_col = fromStart - linePosition[fromLine];
-	var end_col = toEnd - linePosition[toLine] + 1;
-	errors.push({row:toLine,
-		     column:end_col,
-		     start_row:fromLine,
-		     start_col: start_col,
-		     end_row:toLine,
-		     end_col: end_col,
-		     type:"error",
-		     text:message,
-		     suppressIfEditing:options.suppressIfEditing});
-    };
-
-    var EnvErrorTo = function (toEnv, message) {
-	var token = toEnv.closeToken || toEnv.token;
-	var line = token[0], type = token[1], start = token[2], end = token[3], seq = token[4];
-	if (!end) { end = start + 1; };
-	var end_col = end - linePosition[line] + 1;
-	var err = {row: line,
-		   column: end_col,
-		   start_row:0,
-		   start_col: 0,
-		   end_row: line,
-		   end_col: end_col,
-		   type:"error",
-		   text:message};
-	errors.push(err);
-    };
-
-    var EnvErrorFrom = function (env, message) {
-	var token = env.token;
-	var line = token[0], type = token[1], start = token[2], end = token[3], seq = token[4];
-	var start_col = start - linePosition[line];
-	var end_col = Infinity;
-	errors.push({row: line,
-		     column: start_col,
-		     start_row:line,
-		     start_col: start_col,
-		     end_row: lineNumber,
-		     end_col: end_col,
-		     type:"error",
-		     text:message});
-    };
+    var lineNumber = 0;   // current line number when parsing tokens (zero-based)
+    var linePosition = [];  // mapping from line number to absolute offset of line in text[]
+    linePosition[0] = 0;
 
     var checkingDisabled = false;
+    var count = 0;  // number of tokens parses
+    var MAX_TOKENS = 100000;
 
     while (true) {
-	var result = SPECIAL.exec(text);
-	if (result == null) {
-	    if (idx < text.length) {
-		Tokens.push([lineNumber, "Text", idx, text.length]);
-	    }
-	    break;
-	}
-	if (result && result.index <= pos) {
-	    break;
-	};
-	pos = result.index;
-	var newIdx = SPECIAL.lastIndex;
-	if (pos > idx) {
-	    Tokens.push([lineNumber, "Text", idx, pos]);
-	}
-	for (var i = idx; i < pos; i++) {
-	    if (text[i] === "\n") {
-		lineNumber++;
-		linePosition[lineNumber] = i+1;
-	    }
-	}
-	idx = newIdx;
-	var code = result[0];
-	if (code === "%") {
-	    var newLinePos = text.indexOf("\n", idx);
-	    if (newLinePos === -1) {
-		newLinePos = text.length;
-	    };
-	    var commentString = text.substring(idx, newLinePos);
-	    if (commentString.indexOf("%novalidate") === 0) {
-		return [];
-	    } else if(!checkingDisabled && commentString.indexOf("%begin novalidate") === 0) {
-		checkingDisabled = true;
-	    } else if (checkingDisabled && commentString.indexOf("%end novalidate") === 0) {
-		checkingDisabled = false;
-	    };
-	    idx = SPECIAL.lastIndex = newLinePos + 1;
-	    Comments.push([lineNumber, idx, newLinePos]);
-	    lineNumber++;
-	    linePosition[lineNumber] = idx;
-	} else if (checkingDisabled) {
-	    continue;
-	} else if (code === '\\') {
-	    CS.lastIndex = idx;
-	    var controlSequence = CS.exec(text);
-	    var nextSpecialPos = controlSequence === null ? idx : controlSequence.index;
-	    if (nextSpecialPos === idx) {
-		Tokens.push([lineNumber, code, pos, idx + 1, text[idx]]);
-		idx = SPECIAL.lastIndex = idx + 1;
-		char = text[nextSpecialPos];
-		if (char === '\n') { lineNumber++; linePosition[lineNumber] = nextSpecialPos;};
-	    } else {
-		Tokens.push([lineNumber, code, pos, nextSpecialPos, text.slice(idx, nextSpecialPos)]);
-		var char;
-		while ((char = text[nextSpecialPos]) === ' ' || char === '\t' || char  === '\r' || char === '\n') {
-		    nextSpecialPos++;
-		    if (char === '\n') { lineNumber++; linePosition[lineNumber] = nextSpecialPos;};
-		}
-		idx = SPECIAL.lastIndex = nextSpecialPos;
-	    }
-	} else if (code === "{") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "}") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "$") {
-	    if (text[idx] === "$") {
-		idx = SPECIAL.lastIndex = idx + 1;
-		Tokens.push([lineNumber, "$$", pos]);
-	    } else {
-		Tokens.push([lineNumber, code, pos]);
-	    }
-	} else if (code === "&") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "#") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "^") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "_") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else if (code === "~") {
-	    Tokens.push([lineNumber, code, pos]);
-	} else {
-	    throw "unrecognised character " + code;
-	}
+        count++;
+        if (count > MAX_TOKENS) {
+            throw new Error("exceed max token count of " + MAX_TOKENS);
+            break;
+        };
+        var result = SPECIAL.exec(text);
+        if (result == null) {
+            if (idx < text.length) {
+                Tokens.push([lineNumber, "Text", idx, text.length]);
+            }
+            break;
+        }
+        if (result && result.index <= pos) {
+            throw new Error("infinite loop in parsing");
+            break;
+        };
+        pos = result.index;
+        if (pos > idx) {
+            Tokens.push([lineNumber, "Text", idx, pos]);
+        }
+        for (var i = idx; i < pos; i++) {
+            if (text[i] === "\n") {
+                lineNumber++;
+                linePosition[lineNumber] = i+1;
+            }
+        }
+
+        var newIdx = SPECIAL.lastIndex;
+        idx = newIdx;
+        var code = result[0];
+        if (code === "%") { // comment character
+            var newLinePos = text.indexOf("\n", idx);
+            if (newLinePos === -1) {
+                newLinePos = text.length;
+            };
+            var commentString = text.substring(idx, newLinePos);
+            if (commentString.indexOf("%novalidate") === 0) {
+                return [];
+            } else if(!checkingDisabled && commentString.indexOf("%begin novalidate") === 0) {
+                checkingDisabled = true;
+            } else if (checkingDisabled && commentString.indexOf("%end novalidate") === 0) {
+                checkingDisabled = false;
+            };
+            idx = SPECIAL.lastIndex = newLinePos + 1;
+            Comments.push([lineNumber, idx, newLinePos]);
+            lineNumber++;
+            linePosition[lineNumber] = idx;
+        } else if (checkingDisabled) {
+            continue;
+        } else if (code === '\\') { // escape character
+            NEXTCS.lastIndex = idx;
+            var controlSequence = NEXTCS.exec(text);
+            var nextSpecialPos = controlSequence === null ? idx : controlSequence.index;
+            if (nextSpecialPos === idx) {
+                Tokens.push([lineNumber, code, pos, idx + 1, text[idx]]);
+                idx = SPECIAL.lastIndex = idx + 1;
+                char = text[nextSpecialPos];
+                if (char === '\n') { lineNumber++; linePosition[lineNumber] = nextSpecialPos;};
+            } else {
+                Tokens.push([lineNumber, code, pos, nextSpecialPos, text.slice(idx, nextSpecialPos)]);
+                var char;
+                while ((char = text[nextSpecialPos]) === ' ' || char === '\t' || char  === '\r' || char === '\n') {
+                    nextSpecialPos++;
+                    if (char === '\n') { lineNumber++; linePosition[lineNumber] = nextSpecialPos;};
+                }
+                idx = SPECIAL.lastIndex = nextSpecialPos;
+            }
+        } else if (code === "{") {  // open group
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "}") {  // close group
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "$") {  // math mode
+            if (text[idx] === "$") {
+                idx = SPECIAL.lastIndex = idx + 1;
+                Tokens.push([lineNumber, "$$", pos]);
+            } else {
+                Tokens.push([lineNumber, code, pos]);
+            }
+        } else if (code === "&") {  // tabalign
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "#") {  // macro parameter
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "^") {  // superscript
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "_") {  // subscript
+            Tokens.push([lineNumber, code, pos]);
+        } else if (code === "~") {  // active character (space)
+            Tokens.push([lineNumber, code, pos]);
+        } else {
+            throw "unrecognised character " + code;
+        }
+    }
+
+    return {tokens: Tokens, comments: Comments, linePosition: linePosition, lineNumber: lineNumber, text: text};
+};
+
+var read1arg = function (TokeniseResult, k, options) {
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
+    if (options && options.allowStar) {
+        var optional = Tokens[k+1];
+        if (optional && optional[1] === "Text") {
+            var optionalstr = text.substring(optional[2], optional[3]);
+            if (optionalstr === "*") { k++;}
+        };
+    };
+
+    var open = Tokens[k+1];
+    var env = Tokens[k+2];
+    var close = Tokens[k+3];
+    var envName;
+
+    if(open && open[1] === "\\") {
+        envName = open[4]; // array element 4 is command sequence
+        return k + 1;
+    } else if(open && open[1] === "{" && env && env[1] === "\\" && close && close[1] === "}") {
+        envName = env[4]; // NOTE: if we were actually using this, keep track of * above
+        return k + 3; // array element 4 is command sequence
+    } else {
+        return null;
+    }
+};
+
+
+var read1name = function (TokeniseResult, k) {
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
+
+    var open = Tokens[k+1];
+    var env = Tokens[k+2];
+    var close = Tokens[k+3];
+
+    if(open && open[1] === "{" && env && env[1] === "Text" && close && close[1] === "}") {
+        var envName = text.substring(env[2], env[3]);
+        return k + 3;
+    } else if (open && open[1] === "{" && env && env[1] === "Text") {
+        envName = "";
+        for (var j = k + 2, tok; (tok = Tokens[j]); j++) {
+            if (tok[1] === "Text") {
+                var str = text.substring(tok[2], tok[3]);
+                if (!str.match(/^\S*$/)) { break; }
+                envName = envName + str;
+            } else if (tok[1] === "_") {
+                envName = envName + "_";
+            } else {
+                break;
+            }
+        }
+        if (tok && tok[1] === "}") {
+            return  j; // advance past these tokens
+        } else {
+            return null;
+        }
+    } else {
+        return null;
     }
+};
+
+var readOptionalParams = function(TokeniseResult, k) {
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
 
-    var read1arg = function (k) {
-	var open = Tokens[k+1];
-	var env = Tokens[k+2];
-	var close = Tokens[k+3];
-	var envName;
-
-	if(open && open[1] === "\\") {
-	    envName = open[4];
-	    return k + 1;
-	} else if(open && open[1] === "{" && env && env[1] === "\\" && close && close[1] === "}") {
-	    envName = env[4];
-	    return k + 3;
-	} else {
-	    return null;
-	}
-    };
-
-    var read1name = function (k) {
-	var open = Tokens[k+1];
-	var env = Tokens[k+2];
-	var close = Tokens[k+3];
-
-	if(open && open[1] === "{" && env && env[1] === "Text" && close && close[1] === "}") {
-	    var envName = text.substring(env[2], env[3]);
-	    return k + 3;
-	} else {
-	    return null;
-	}
-    };
-
-
-
-    var readOptionalParams = function(k) {
-	var params = Tokens[k+1];
-
-	if(params && params[1] === "Text") {
-	    var paramNum = text.substring(params[2], params[3]);
-	    if (paramNum.match(/^\[\d+\]$/)) {
-		return k + 1;
-	    };
-	};
-	return null;
-    };
-
-    var readDefinition = function(k) {
-	k = k + 1;
-	var count = 0;
-	var nextToken = Tokens[k];
-	while (nextToken && nextToken[1] === "Text") {
-	    var start = nextToken[2], end = nextToken[3];
-	    for (i = start; i < end; i++) {
-		var char = text[i];
-		if (char === ' ' || char === '\t' || char  === '\r' || char === '\n') { continue; }
-		return null;
-	    }
-	    k++;
-	    nextToken = Tokens[k];
-	}
-	if (nextToken && nextToken[1] === "{") {
-	    count++;
-	    while (count>0) {
-		k++;
-		nextToken = Tokens[k];
-		if(!nextToken) { break; };
-		if (nextToken[1] === "}") { count--; }
-		if (nextToken[1] === "{") { count++; }
-	    }
-	    return k;
-	}
-	return null;
-    };
-
-    for (var _j = 0, _len = Tokens.length; _j < _len; _j++) {
-	var token = Tokens[_j];
-	var line = token[0], type = token[1], start = token[2], end = token[3], seq = token[4];
-	if (type === "\\") {
-	    if (seq === "begin" || seq === "end") {
-		var open = Tokens[_j+1];
-		var env = Tokens[_j+2];
-		var close = Tokens[_j+3];
-		if(open && open[1] === "{" && env && env[1] === "Text" && close && close[1] === "}") {
-		    var envName = text.substring(env[2], env[3]);
-		    Environments.push({command: seq, name: envName, token: token, closeToken: close});
-		    _j = _j + 3; // advance past these tokens
-		} else {
-		    var endToken = null;
-		    if (open && open[1] === "{") {
-			endToken = open;
-
-			if (env && env[1] === "Text") {
-			    endToken = env.slice();
-			    start = endToken[2]; end = endToken[3];
-			    for (i = start; i < end; i++) {
-				char = text[i];
-				if (char === ' ' || char === '\t' || char  === '\r' || char === '\n') { break; }
-			    }
-			    endToken[3] = i;
-			};
-		    };
-
-		    if (endToken) {
-			TokenErrorFromTo(token, endToken, "invalid environment command" + text.substring(token[2], endToken[3] || endToken[2]));
-		    } else {
-			TokenError(token, "invalid environment command");
-		    };
-		}
-	    } else if (seq === "newcommand" || seq === "renewcommand" || seq === "def" || seq === "DeclareRobustCommand") {
-
-		var newPos = read1arg(_j);
-		if (newPos === null) { continue; } else {_j = newPos;};
-
-		newPos = readOptionalParams(_j);
-		if (newPos === null) { /* do nothing */ } else {_j = newPos;};
-
-		newPos = readDefinition(_j);
-		if (newPos === null) { /* do nothing */ } else {_j = newPos;};
-
-	    } else if (seq === "newenvironment") {
-
-		newPos = read1name(_j);
-		if (newPos === null) { continue; } else {_j = newPos;};
-
-		newPos = readOptionalParams(_j);
-		if (newPos === null) { /* do nothing */ } else {_j = newPos;};
-
-		newPos = readDefinition(_j);
-		if (newPos === null) { /* do nothing */ } else {_j = newPos;};
-
-		newPos = readDefinition(_j);
-		if (newPos === null) { /* do nothing */ } else {_j = newPos;};
-	    }
-	} else if (type === "{") {
-	    Environments.push({command:"{", token:token});
-	} else if (type === "}") {
-	    Environments.push({command:"}", token:token});
-	};
-
-	if ((start != null) && (end != null) && (seq != null)) {
-	} else if ((start != null) && (end != null)) {
-	} else if (start != null) {
-	} else {
-	}
+    var params = Tokens[k+1];
+
+    if(params && params[1] === "Text") {
+        var paramNum = text.substring(params[2], params[3]);
+        if (paramNum.match(/^\[\d+\](\[[^\]]*\])*\s*$/)) {
+            return k + 1; // got it
+        };
+    };
+    return null;
+};
+
+var readDefinition = function(TokeniseResult, k) {
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
+
+    k = k + 1;
+    var count = 0;
+    var nextToken = Tokens[k];
+    while (nextToken && nextToken[1] === "Text") {
+        var start = nextToken[2], end = nextToken[3];
+        for (var i = start; i < end; i++) {
+            var char = text[i];
+            if (char === ' ' || char === '\t' || char  === '\r' || char === '\n') { continue; }
+            return null; // bail out, should begin with a {
+        }
+        k++;
+        nextToken = Tokens[k];
+    }
+    if (nextToken && nextToken[1] === "{") {
+        count++;
+        while (count>0) {
+            k++;
+            nextToken = Tokens[k];
+            if(!nextToken) { break; };
+            if (nextToken[1] === "}") { count--; }
+            if (nextToken[1] === "{") { count++; }
+        }
+        return k;
     }
+
+    return null;
+};
+
+var readVerb = function(TokeniseResult, k) {
+
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
+
+    var verbToken = Tokens[k];
+    var verbStr = text.substring(verbToken[2], verbToken[3]);
+    var pos = verbToken[3];
+    if (text[pos] === "*") { pos++; } // \verb* form of command
+    var delimiter = text[pos];
+    pos++;
+
+    var nextToken = Tokens[k+1];
+    for (var i = pos, end = text.length; i < end; i++) {
+        var char = text[i];
+        if (nextToken && i >= nextToken[2]) { k++; nextToken = Tokens[k+1];};
+        if (char === delimiter) { return k; };
+        if (char  === '\r' || char === '\n') { return null; }
+    };
+
+    return null;
+};
+
+var readUrl = function(TokeniseResult, k) {
+
+    var Tokens = TokeniseResult.tokens;
+    var text = TokeniseResult.text;
+
+    var urlToken = Tokens[k];
+    var urlStr = text.substring(urlToken[2], urlToken[3]);
+    var pos = urlToken[3];
+    var openDelimiter = text[pos];
+    var closeDelimiter =  (openDelimiter === "{") ? "}" : openDelimiter;
+    var nextToken = Tokens[k+1];
+    if (nextToken && pos === nextToken[2]) {
+        k++;
+        nextToken = Tokens[k+1];
+    };
+    pos++;
+
+    var count = 1;
+    for (var i = pos, end = text.length; count > 0 && i < end; i++) {
+        var char = text[i];
+        if (nextToken && i >= nextToken[2]) { k++; nextToken = Tokens[k+1];};
+        if (char === closeDelimiter) {
+            count--;
+        } else if (char === openDelimiter) {
+            count++;
+        };
+        if (count === 0) { return k; };
+        if (char  === '\r' || char === '\n') { return null; }
+    };
+
+    return null;
+};
+
+
+var InterpretTokens = function (TokeniseResult, ErrorReporter) {
+    var Tokens = TokeniseResult.tokens;
+    var linePosition = TokeniseResult.linePosition;
+    var lineNumber = TokeniseResult.lineNumber;
+    var text = TokeniseResult.text;
+
+    var TokenErrorFromTo = ErrorReporter.TokenErrorFromTo;
+    var TokenError = ErrorReporter.TokenError;
+    var Environments = [];
+
+    for (var i = 0, len = Tokens.length; i < len; i++) {
+        var token = Tokens[i];
+        var line = token[0], type = token[1], start = token[2], end = token[3], seq = token[4];
+        if (type === "\\") {
+            if (seq === "begin" || seq === "end") {
+                var open = Tokens[i+1];
+                var env = Tokens[i+2];
+                var close = Tokens[i+3];
+                if(open && open[1] === "{" && env && env[1] === "Text" && close && close[1] === "}") {
+                    var envName = text.substring(env[2], env[3]);
+                    Environments.push({command: seq, name: envName, token: token, closeToken: close});
+                    i = i + 3; // advance past these tokens
+                } else {
+                    if (open && open[1] === "{" && env && env[1] === "Text") {
+                        envName = "";
+                        for (var j = i + 2, tok; (tok = Tokens[j]); j++) {
+                            if (tok[1] === "Text") {
+                                var str = text.substring(tok[2], tok[3]);
+                                if (!str.match(/^\S*$/)) { break; }
+                                envName = envName + str;
+                            } else if (tok[1] === "_") {
+                                envName = envName + "_";
+                            } else {
+                                break;
+                            }
+                        }
+                        if (tok && tok[1] === "}") {
+                            Environments.push({command: seq, name: envName, token: token, closeToken: close});
+                            i = j; // advance past these tokens
+                            continue;
+                        }
+                    }
+                    var endToken = null;
+                    if (open && open[1] === "{") {
+                        endToken = open; // we've got a {
+                        if (env && env[1] === "Text") {
+                            endToken = env.slice(); // we've got some text following the {
+                            start = endToken[2]; end = endToken[3];
+                            for (j = start; j < end; j++) {
+                                var char = text[j];
+                                if (char === ' ' || char === '\t' || char  === '\r' || char === '\n') { break; }
+                            }
+                            endToken[3] = j; // the end of partial token is as far as we got looking ahead
+                        };
+                    };
+
+                    if (endToken) {
+                        TokenErrorFromTo(token, endToken, "invalid environment command" + text.substring(token[2], endToken[3] || endToken[2]));
+                    } else {
+                        TokenError(token, "invalid environment command");
+                    };
+                    }
+            } else if (seq === "newcommand" || seq === "renewcommand" || seq === "def" || seq === "DeclareRobustCommand") {
+                var newPos = read1arg(TokeniseResult, i, {allowStar: (seq != "def")});
+                if (newPos === null) { continue; } else {i = newPos;};
+                newPos = readOptionalParams(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+                newPos = readDefinition(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+
+            } else if (seq === "newcolumntype") {
+                newPos = read1name(TokeniseResult, i);
+                if (newPos === null) { continue; } else {i = newPos;};
+                newPos = readOptionalParams(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+                newPos = readDefinition(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+
+            } else if (seq === "newenvironment" || seq === "renewenvironment") {
+                newPos = read1name(TokeniseResult, i);
+                if (newPos === null) { continue; } else {i = newPos;};
+                newPos = readOptionalParams(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+                newPos = readDefinition(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+                newPos = readDefinition(TokeniseResult, i);
+                if (newPos === null) { /* do nothing */ } else {i = newPos;};
+            } else if (seq === "verb") {
+                newPos = readVerb(TokeniseResult, i);
+                if (newPos === null) { TokenError(token, "invalid verbatim command"); } else {i = newPos;};
+            } else if (seq === "url") {
+                newPos = readUrl(TokeniseResult, i);
+                if (newPos === null) { TokenError(token, "invalid url command"); } else {i = newPos;};
+            }
+        } else if (type === "{") {
+            Environments.push({command:"{", token:token});
+        } else if (type === "}") {
+            Environments.push({command:"}", token:token});
+        };
+    };
+    return Environments;
+};
+
+
+var CheckEnvironments = function (Environments, ErrorReporter) {
+    var ErrorTo = ErrorReporter.EnvErrorTo;
+    var ErrorFromTo = ErrorReporter.EnvErrorFromTo;
+    var ErrorFrom = ErrorReporter.EnvErrorFrom;
+
     var state = [];
-    for (i = 0; i < Environments.length; i++) {
-	var thisEnv = Environments[i];
-	if(thisEnv.command === "begin" || thisEnv.command === "{") {
-	    state.push(thisEnv);
-	} else if (thisEnv.command === "end" || thisEnv.command === "}") {
-	    var lastEnv = state.pop();
-	    if (!lastEnv) {
-		if (thisEnv.command === "}") {
-		    EnvErrorTo(thisEnv, "unexpected end group }");
-		} else if (thisEnv.command === "end") {
-		    EnvErrorTo(thisEnv, "unexpected \\end{" + thisEnv.name + "}");
-		}
-	    } else if (lastEnv.command === "{" && thisEnv.command === "}") {
-		continue; // closed group correctly
-	    } else if (lastEnv.name === thisEnv.name) {
-		continue; // closed environment correctly
-	    } else if (thisEnv.command === "}") {
-		EnvErrorFromTo(lastEnv, thisEnv, "unexpected end group } after \\begin{" + lastEnv.name +"}");
-		state.push(lastEnv);
-	    } else if (lastEnv.command === "{" && thisEnv.command === "end") {
-		EnvErrorFromTo(lastEnv, thisEnv, "unexpected \\end{" + thisEnv.name + "} inside group {", {suppressIfEditing:true});
-		i--;
-	    } else if (lastEnv.command === "begin" && thisEnv.command === "end") {
-		EnvErrorFromTo(lastEnv, thisEnv, "unexpected \\end{" + thisEnv.name + "} after \\begin{" + lastEnv.name + "}");
-		for (var j = i + 1; j < Environments.length; j++) {
-		    var futureEnv = Environments[j];
-		    if (futureEnv.command === "end" && futureEnv.name === lastEnv.name) {
-			state.push(lastEnv);
-			continue;
-		    }
-		}
-		lastEnv = state.pop();
-		if(lastEnv) {
-		    if (thisEnv.name === lastEnv.name) {
-			continue;
-		    } else {
-			state.push(lastEnv);
-		    }
-		}
-
-	    }
-	}
+    var documentClosed = null;
+    var inVerbatim = false;
+    var verbatimRanges = [];
+    for (var i = 0, len = Environments.length; i < len; i++) {
+        var name = Environments[i].name ;
+        if (name && name.match(/^(verbatim|boxedverbatim|lstlisting)$/)) {
+            Environments[i].verbatim = true;
+        }
+    }
+    for (i = 0, len = Environments.length; i < len; i++) {
+        var thisEnv = Environments[i];
+        if(thisEnv.command === "begin" || thisEnv.command === "{") {
+            if (inVerbatim) { continue; } // ignore anything in verbatim environments
+            if (thisEnv.verbatim) {inVerbatim = true;};
+            state.push(thisEnv);
+        } else if (thisEnv.command === "end" || thisEnv.command === "}") {
+            var lastEnv = state.pop();
+
+            if (inVerbatim) {
+                if (lastEnv && lastEnv.name === thisEnv.name) {
+                    inVerbatim = false;
+                    verbatimRanges.push({start: lastEnv.token[2], end: thisEnv.token[2]});
+                    continue;
+                } else {
+                    if(lastEnv) { state.push(lastEnv); } ;
+                    continue;  // ignore all other commands
+                }
+            };
+
+            if (lastEnv && lastEnv.command === "{" && thisEnv.command === "}") {
+                continue;
+            } else if (lastEnv && lastEnv.name === thisEnv.name) {
+                if (thisEnv.name === "document" && !documentClosed) {
+                    documentClosed = thisEnv;
+                };
+                continue;
+            } else if (!lastEnv) {
+                if (thisEnv.command === "}") {
+                    if (documentClosed) {
+                        ErrorFromTo(documentClosed, thisEnv, "\\end{" + documentClosed.name + "} is followed by unexpected end group }",{errorAtStart: true, type: "info"});
+                    } else {
+                        ErrorTo(thisEnv, "unexpected end group }");
+                    };
+                } else if (thisEnv.command === "end") {
+                    if (documentClosed) {
+                        ErrorFromTo(documentClosed, thisEnv, "\\end{" + documentClosed.name + "} is followed by unexpected content",{errorAtStart: true, type: "info"});
+                    } else {
+                        ErrorTo(thisEnv, "unexpected \\end{" + thisEnv.name + "}");
+                    }
+                }
+            } else if (lastEnv.command === "begin" && thisEnv.command === "}") {
+                ErrorFromTo(lastEnv, thisEnv, "unexpected end group } after \\begin{" + lastEnv.name +"}");
+                state.push(lastEnv);
+            } else if (lastEnv.command === "{" && thisEnv.command === "end") {
+                ErrorFromTo(lastEnv, thisEnv,
+                            "unclosed group { found at \\end{" + thisEnv.name + "}",
+                            {suppressIfEditing:true, errorAtStart: true, type:"warning"});
+                i--;
+            } else if (lastEnv.command === "begin" && thisEnv.command === "end") {
+                ErrorFromTo(lastEnv, thisEnv,
+                            "unclosed \\begin{" + lastEnv.name + "} found at \\end{" + thisEnv.name + "} " ,
+                            {errorAtStart: true});
+                for (var j = i + 1; j < len; j++) {
+                    var futureEnv = Environments[j];
+                    if (futureEnv.command === "end" && futureEnv.name === lastEnv.name) {
+                        state.push(lastEnv);
+                        continue;
+                    }
+                }
+                lastEnv = state.pop();
+                if(lastEnv) {
+                    if (thisEnv.name === lastEnv.name) {
+                        continue;
+                    } else {
+                        state.push(lastEnv);
+                    }
+                }
+
+            }
+        }
     }
     while (state.length > 0) {
-	thisEnv = state.pop();
-	if (thisEnv.command === "{") {
-	    EnvErrorFrom(thisEnv, "unclosed group {");
-	} else if (thisEnv.command === "begin") {
-	    EnvErrorFrom(thisEnv, "unclosed environment \\begin{" + thisEnv.name + "}");
-	};
+        thisEnv = state.pop();
+        if (thisEnv.command === "{") {
+            ErrorFrom(thisEnv, "unclosed group {", {type:"warning"});
+        } else if (thisEnv.command === "begin") {
+            ErrorFrom(thisEnv, "unclosed environment \\begin{" + thisEnv.name + "}");
+        };
+    }
+    var vlen = verbatimRanges.length;
+    len = ErrorReporter.tokenErrors.length;
+    if (vlen >0 && len > 0) {
+        for (i = 0; i < len; i++) {
+            var tokenError = ErrorReporter.tokenErrors[i];
+            var startPos = tokenError.startPos;
+            var endPos = tokenError.endPos;
+            for (j = 0; j < vlen; j++) {
+                if (startPos > verbatimRanges[j].start && startPos < verbatimRanges[j].end) {
+                    tokenError.ignore = true;
+                    break;
+                }
+            }
+        }
     }
-    return errors;
+
+};
+var ErrorReporter = function (TokeniseResult) {
+    var text = TokeniseResult.text;
+    var linePosition = TokeniseResult.linePosition;
+    var lineNumber = TokeniseResult.lineNumber;
+
+    var errors = [], tokenErrors = [];
+    this.errors = errors;
+    this.tokenErrors = tokenErrors;
+
+    this.getErrors = function () {
+        var returnedErrors = [];
+        for (var i = 0, len = tokenErrors.length; i < len; i++) {
+            if (!tokenErrors[i].ignore) { returnedErrors.push(tokenErrors[i]); }
+        }
+        return returnedErrors.concat(errors);
+    };
+
+    this.TokenError = function (token, message) {
+        var line = token[0], type = token[1], start = token[2], end = token[3];
+        var start_col = start - linePosition[line];
+        var end_col = end - linePosition[line];
+        tokenErrors.push({row: line,
+                          column: start_col,
+                          start_row:line,
+                          start_col: start_col,
+                          end_row:line,
+                          end_col: end_col,
+                          type:"error",
+                          text:message,
+                          startPos: start,
+                          endPos: end,
+                          suppressIfEditing:true});
+    };
+
+    this.TokenErrorFromTo = function (fromToken, toToken, message) {
+        var fromLine = fromToken[0], fromStart = fromToken[2], fromEnd = fromToken[3];
+        var toLine = toToken[0], toStart = toToken[2], toEnd = toToken[3];
+        if (!toEnd) { toEnd = toStart + 1;};
+        var start_col = fromStart - linePosition[fromLine];
+        var end_col = toEnd - linePosition[toLine];
+
+        tokenErrors.push({row: fromLine,
+                          column: start_col,
+                          start_row: fromLine,
+                          start_col: start_col,
+                          end_row: toLine,
+                          end_col: end_col,
+                          type:"error",
+                          text:message,
+                          startPos: fromStart,
+                          endPos: toEnd,
+                          suppressIfEditing:true});
+    };
+
+
+    this.EnvErrorFromTo = function (fromEnv, toEnv, message, options) {
+        if(!options) { options = {} ; };
+        var fromToken = fromEnv.token, toToken = toEnv.closeToken || toEnv.token;
+        var fromLine = fromToken[0], fromStart = fromToken[2], fromEnd = fromToken[3];
+        if (!toToken) {toToken = fromToken;};
+        var toLine = toToken[0], toStart = toToken[2], toEnd = toToken[3];
+        if (!toEnd) { toEnd = toStart + 1;};
+        var start_col = fromStart - linePosition[fromLine];
+        var end_col = toEnd - linePosition[toLine];
+        errors.push({row: options.errorAtStart ? fromLine : toLine,
+                     column: options.errorAtStart ? start_col: end_col,
+                     start_row:fromLine,
+                     start_col: start_col,
+                     end_row:toLine,
+                     end_col: end_col,
+                     type: options.type ? options.type : "error",
+                     text:message,
+                     suppressIfEditing:options.suppressIfEditing});
+    };
+
+    this.EnvErrorTo = function (toEnv, message, options) {
+        if(!options) { options = {} ; };
+        var token = toEnv.closeToken || toEnv.token;
+        var line = token[0], type = token[1], start = token[2], end = token[3];
+        if (!end) { end = start + 1; };
+        var end_col = end - linePosition[line];
+        var err = {row: line,
+                   column: end_col,
+                   start_row:0,
+                   start_col: 0,
+                   end_row: line,
+                   end_col: end_col,
+                   type: options.type ? options.type : "error",
+                   text:message};
+        errors.push(err);
+    };
+
+    this.EnvErrorFrom = function (env, message, options) {
+        if(!options) { options = {} ; };
+        var token = env.token;
+        var line = token[0], type = token[1], start = token[2], end = token[3];
+        var start_col = start - linePosition[line];
+        var end_col = Infinity;
+        errors.push({row: line,
+                     column: start_col,
+                     start_row:line,
+                     start_col: start_col,
+                     end_row: lineNumber,
+                     end_col: end_col,
+                     type: options.type ? options.type : "error",
+                     text:message});
+    };
+};
+
+var Parse = function (text) {
+    var TokeniseResult = Tokenise(text);
+    var Reporter = new ErrorReporter(TokeniseResult);
+    var Environments = InterpretTokens(TokeniseResult, Reporter);
+    CheckEnvironments(Environments, Reporter);
+    return Reporter.getErrors();
 };
 
 (function() {
     var disabled = false;
 
     this.onUpdate = function() {
-	if (disabled) { return ; };
-
-	var value = this.doc.getValue();
-	var errors = [];
-	try {
-	    if (value)
-		errors = Parse(value);
-	} catch (e) {
-	    disabled = true;
-	    errors = [];
-	}
-	this.sender.emit("lint", errors);
+        if (disabled) { return ; };
+
+        var value = this.doc.getValue();
+        var errors = [];
+        try {
+            if (value)
+                errors = Parse(value);
+        } catch (e) {
+            disabled = true;
+            errors = [];
+        }
+        this.sender.emit("lint", errors);
     };
 
 }).call(LatexWorker.prototype);

services/web/public/stylesheets/app/project-list.less

@@ -200,6 +200,10 @@ ul.structured-list {
 		.select-item + span, .select-all + span {
 			display: inline-block;
 			padding-left: @line-height-computed * 1.5;
+			max-width: 100%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			vertical-align: top;
 		}
 	}
 }