fixes

app/controllers/home.controller.js

@@ -11,6 +11,11 @@ angular.module('app')
 
             $scope.macros = [];
 
+            $scope.escapeRegExp = function(str)
+            {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            };
+
             $scope.addMacro = function(latex, html)
             {
                 $scope.macros.push({
@@ -24,15 +29,18 @@ angular.module('app')
                 text = text.replace(/\$([^\$]+)\$/g, function($1, $2)
                 {
                     return "\\(" + $2 + "\\)";
-                }).replace(/\\medskip/, "")
+                }).replace(/\\medskip/g, "")
                     .replace(/\\begin\{.*\}/g, "")
                     .replace(/\\end\{.*\}/g, "")
                     .replace(/\n|\r|\r\n|\n\r/g, " ")
-                    .replace(/ +/, " ")
+                    .replace(/ +/g, " ")
                     .trim();
                 $scope.macros.forEach(function(macro)
                 {
-                    text = text.replace(macro.latex, macro.html);
+                    text = text.replace(new RegExp($scope.escapeRegExp(macro.latex) + "([^a-zA-Z])", "g"), function($1, $2)
+                    {
+                        return macro.html + $2;
+                    });
                 });
                 return text;
             };
@@ -55,7 +63,8 @@ angular.module('app')
                         Answers: []
                     };
                     var responses = questionStr.split("\\item");
-                    question.Text = responses[0].replace(/^\*\{.* ([0-9]+).*\}/, function($1, $2)
+                    question.Text = $scope.formatText(responses[0]);
+                    question.Text = question.Text.replace(/^\*\{[^\}]* ([0-9]+)[^\}]*\}/, function($1, $2)
                     {
                         $2 = parseInt($2);
                         if (firstQuestion == null) {
@@ -63,7 +72,6 @@ angular.module('app')
                         }
                         return "Question " + ($2 - firstQuestion + 1) + "\n";
                     });
-                    question.Text = $scope.formatText(question.Text);
                     responses.splice(0, 1);
 
                     responses.forEach(function(answerStr) {