fixed newline replace; added question number

app/controllers/home.controller.js

@@ -24,7 +24,12 @@ angular.module('app')
                 text = text.replace(/\$([^\$]+)\$/g, function($1, $2)
                 {
                     return "\\(" + $2 + "\\)";
-                }).replace("\n", "");
+                }).replace(/\\medskip/, "")
+                    .replace(/\\begin\{.*\}/g, "")
+                    .replace(/\\end\{.*\}/g, "")
+                    .replace(/\n|\r|\r\n|\n\r/g, " ")
+                    .replace(/ +/, " ")
+                    .trim();
                 $scope.macros.forEach(function(macro)
                 {
                     text = text.replace(macro.latex, macro.html);
@@ -42,6 +47,7 @@ angular.module('app')
                 var questions = input.split("\\section");
                 questions.splice(0, 1);
 
+                var firstQuestion = null;
                 questions.forEach(function(questionStr)
                 {
                     var question = {
@@ -49,17 +55,19 @@ angular.module('app')
                         Answers: []
                     };
                     var responses = questionStr.split("\\item");
-                    question.Text = responses[0].replace(/^\*\{.*\}/, "")
-                        .replace(/\\medskip/g, "")
-                        .replace(/\\begin\{.*\}/g, "")
-                        .trim();
+                    question.Text = responses[0].replace(/^\*\{.* ([0-9]+).*\}/, function($1, $2)
+                    {
+                        $2 = parseInt($2);
+                        if (firstQuestion == null) {
+                            firstQuestion = $2;
+                        }
+                        return "Question " + ($2 - firstQuestion + 1) + "\n";
+                    });
                     question.Text = $scope.formatText(question.Text);
                     responses.splice(0, 1);
 
                     responses.forEach(function(answerStr) {
-                        answerStr = answerStr.replace(/\\medskip/, "")
-                            .replace(/\\end\{.*\}/g, "")
-                            .trim();
+                        answerStr = answerStr.replace(/\\medskip/, "").trim();
                         var a = answerStr.match(/^\[[^\]\[]+\]/)[0];
                         answerStr = answerStr.substring(a.length, answerStr.length);
                         answerStr = $scope.formatText(answerStr);

app/views/home.html

@@ -11,6 +11,10 @@
             <div class="form-group">
                 <button class="btn btn-primary btn-block" ng-click="convert()">Do the magic</button>
             </div>
+            <div class="form-group">
+                <label for="Output">Output:</label>
+                <textarea id="Output" rows="10" class="form-control" ng-model="Data.Output"></textarea>
+            </div>
             <div class="form-group">
                 <div ng-repeat="question in questions">
                     {{ question.Text }}
@@ -21,10 +25,6 @@
                     </ul>
                 </div>
             </div>
-            <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>