fixed macro replacement; added space behind '<' replacement; all checkboxes with []; added macros replacement

app/controllers/home.controller.js

@@ -37,7 +37,8 @@ angular.module('app')
                     .trim();
                 $scope.macros.forEach(function(macro)
                 {
-                    text = text.replace(new RegExp($scope.escapeRegExp(macro.latex) + "([^a-zA-Z])", "g"), function($1, $2)
+                    var regex = macro.latex.match(/[a-zA-Z0-9]$/) != null ? "([^a-zA-Z0-9])" : "";
+                    text = text.replace(new RegExp($scope.escapeRegExp(macro.latex) + regex, "g"), function($1, $2)
                     {
                         return macro.html + $2;
                     });
@@ -92,18 +93,11 @@ angular.module('app')
                 {
                     $scope.Data.Output += question.Text + "\n";
 
-                    var goodAnswersCount = 0;
-                    question.Answers.forEach(function(answer)
-                    {
-                        if (answer.Correct) {
-                            ++goodAnswersCount;
-                        }
-                    });
+
 
                     question.Answers.forEach(function(answer)
                     {
-                        $scope.Data.Output += "\t" + (goodAnswersCount > 1 ? "[" : "(") + (answer.Correct ? "x" : "") +
-                            (goodAnswersCount > 1 ? "]" : ")") + answer.Text + "\n";
+                        $scope.Data.Output += "\t[" + (answer.Correct ? "x" : "") + "]" + answer.Text + "\n";
                     });
                     $scope.Data.Output += "\n";
                 });
@@ -118,11 +112,13 @@ angular.module('app')
             $scope.addMacro("\\RR", "\\mathbb{R}");
             $scope.addMacro("\\CC", "\\mathbb{C}");
             $scope.addMacro("\\QQ", "\\mathbb{Q}");
+            $scope.addMacro("\\NN", "\\mathbb{N}");
+            $scope.addMacro("\\ZZ", "\\mathbb{Z}");
             $scope.addMacro("\\di", "\\displaystyle");
             $scope.addMacro("\\dd", "\\text{d}");
             $scope.addMacro("<<", "&#171;");
             $scope.addMacro(">>", "&#187;");
-            $scope.addMacro("<", "&#60;");
+            $scope.addMacro("<", "&#60; ");
             $scope.addMacro(">", "&#62;");
             $scope.addMacro("\\\'{E}", "&#201;");
             $scope.addMacro("\\\'{A}", "&#192;");