Indent text with newlines inside indented elements

2 files changed, 15 insertions, 4 deletions

diff --git a/lib/html-writer.js b/lib/html-writer.js
index 233e5dd..1b551ed 100644
--- a/lib/html-writer.js
+++ b/lib/html-writer.js
@@ -22,7 +22,9 @@ var indentedElements = {
 
 function prettyWriter() {
     var indentationLevel = 0;
+    var indentation = "  ";
     var stack = [];
+    var start = true;
     
     var writer = simpleWriter();
     
@@ -33,6 +35,7 @@ function prettyWriter() {
         if (indentedElements[tagName]) {
             indentationLevel++;
         }
+        start = false;
     }
     
     function close(tagName) {
@@ -46,18 +49,18 @@ function prettyWriter() {
     
     function text(value) {
         indent();
-        writer.text(value);
+        writer.text(value.replace("\n", "\n" + indentation));
     }
     
     function insideIndentedElement() {
-        return stack.length > 0 && indentedElements[stack[stack.length - 1]];
+        return stack.length === 0 || indentedElements[stack[stack.length - 1]];
     }
     
     function indent() {
-        if (insideIndentedElement()) {
+        if (!start && insideIndentedElement()) {
             writer.append("\n");
             for (var i = 0; i < indentationLevel; i++) {
-                writer.append("  ");
+                writer.append(indentation);
             }
         }
     }
diff --git a/tests/html-writer.tests.js b/tests/html-writer.tests.js
index 2a22caf..dc6cb1c 100644
--- a/tests/html-writer.tests.js
+++ b/tests/html-writer.tests.js
@@ -50,4 +50,12 @@ describe('html-writer', function() {
         writer.close("div");
         return assert.equal(writer.asString(), "<div>\n  <div>\n    <div>\n      Hello\n    </div>\n  </div>\n</div>");
     });
+    
+    test('newlines in text are indented', function() {
+        var writer = htmlWriter.writer({prettyPrint: true});
+        writer.open("p");
+        writer.text("One\nTwo");
+        writer.close("p");
+        return assert.equal(writer.asString(), "<p>\n  One\n  Two\n</p>");
+    });
 })