macros replacement; output string generation

app/controllers/home.controller.js

@@ -9,16 +9,32 @@ angular.module('app')
 
             $scope.questions = [];
 
+            $scope.macros = [];
+
+            $scope.addMacro = function(latex, html)
+            {
+                $scope.macros.push({
+                    latex: latex,
+                    html: html
+                });
+            };
+
             $scope.formatText = function(text)
             {
-                return text.replace(/\$([^\$]+)\$/g, function($1, $2)
+                text = text.replace(/\$([^\$]+)\$/g, function($1, $2)
                 {
                     return "\\(" + $2 + "\\)";
-                })
+                }).replace("\n", "");
+                $scope.macros.forEach(function(macro)
+                {
+                    text = text.replace(macro.latex, macro.html);
+                });
+                return text;
             };
 
             $scope.convert = function()
             {
+                $scope.Data.Output = "";
                 $scope.questions = [];
                 var input = $scope.Data.Input;
                 $scope.Data.Output = "";
@@ -34,15 +50,15 @@ angular.module('app')
                     };
                     var responses = questionStr.split("\\item");
                     question.Text = responses[0].replace(/^\*\{.*\}/, "")
-                        .replace(/\\medskip/, "")
-                        .replace(/\\begin\{.*\}/, "")
+                        .replace(/\\medskip/g, "")
+                        .replace(/\\begin\{.*\}/g, "")
                         .trim();
                     question.Text = $scope.formatText(question.Text);
                     responses.splice(0, 1);
 
                     responses.forEach(function(answerStr) {
                         answerStr = answerStr.replace(/\\medskip/, "")
-                            .replace(/\\end\{.*\}/, "")
+                            .replace(/\\end\{.*\}/g, "")
                             .trim();
                         var a = answerStr.match(/^\[[^\]\[]+\]/)[0];
                         answerStr = answerStr.substring(a.length, answerStr.length);
@@ -56,8 +72,36 @@ angular.module('app')
                     $scope.questions.push(question);
                 });
 
-                /*var re = /\$[^$]+\$/g;
-                console.log(input.match(re));*/
+                $scope.questions.forEach(function(question)
+                {
+                    $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 += "\n";
+                });
             };
 
+            $scope.addMacro("\\RR", "\\mathbb{R}");
+            $scope.addMacro("\\CC", "\\mathbb{C}");
+            $scope.addMacro("\\QQ", "\\mathbb{Q}");
+            $scope.addMacro("\\di", "\\displaystyle");
+            $scope.addMacro("\\dd", "\\text{d}");
+            $scope.addMacro("<<", "&#171");
+            $scope.addMacro(">>", "&#187");
+            $scope.addMacro("<", "&#60");
+            $scope.addMacro(">", "&#62");
+            $scope.addMacro("\\\'{E}", "&#201");
+            $scope.addMacro("\\\'{A}", "&#192");
     }]);

app/views/home.html

@@ -21,10 +21,10 @@
                     </ul>
                 </div>
             </div>
-            <!--<div class="form-group">
+            <div class="form-group">
                 <label for="Output">Output:</label>
                 <textarea id="Output" rows="10" class="form-control" ng-model="Data.Output"></textarea>
-            </div>-->
+            </div>
         </div>
     </div>
 </div>