Fix missing space in blocks of text.

Generally caused by inline anchor tags, but if we start formatting other inline tags, this issue will affect them, too.

Author: danmactough

lib/formatter.js

@@ -6,7 +6,7 @@ var helper = require('./helper');
 function formatText(elem, options) {
 	var text = _s.strip(elem.raw);
 	text = helper.decodeHTMLEntities(text);
-	return helper.wordwrap(text, options.wordwrap);
+	return helper.wordwrap(elem.needsSpace ? ' ' + text : text, options.wordwrap);
 };
 
 function formatLineBreak(elem, fn, options) {

lib/helper.js

@@ -50,9 +50,10 @@ exports.decodeHTMLEntities = function decodeHTMLEntities(text) {
 };
 
 exports.wordwrap = function wordwrap(text, max) {
-    var result = '';
+    // Preserve leading space
+    var result = _s.startsWith(text, ' ') ? ' ' : '';
     var words = _s.words(text);
-    var length = 0;
+    var length = result.length;
     var buffer = [];
     _.each(words, function(word) {
         if (length + word.length > max) {

lib/html-to-text.js

@@ -73,6 +73,7 @@ function containsTable(attr, tables) {
 
 function walk(dom, options) {
 	var result = '';
+	var whiteSpaceRegex = /\S$/;
 	_.each(dom, function(elem) {
 		switch(elem.type) {
 			case 'tag':
@@ -111,7 +112,12 @@ function walk(dom, options) {
 				}
 				break;
 			case 'text':
-				if (elem.raw !== '\r\n') result += format.text(elem, options);
+				if (elem.raw !== '\r\n') {
+					// Text needs a leading space if `result` currently
+					// doesn't end with whitespace
+					elem.needsSpace = whiteSpaceRegex.test(result);
+					result += format.text(elem, options);
+				}
 				break;
 			default:
 				if (!_.include(SKIP_TYPES, elem.type)) {