Format anchor tags more informatively.

Author: danmactough

lib/formatter.js

@@ -21,13 +21,23 @@ function formatHeading(elem, fn, options) {
 	return fn(elem.children, options).toUpperCase() + '\n';
 }
 
+// If we have both href and anchor text, format it in a useful manner:
+// - "anchor text [href]"
+// Otherwise if we have only anchor text or an href, we return the part we have:
+// - "anchor text" or
+// - "href"
 function formatAnchor(elem, fn, options) {
+	var href = '';
+	// Always get the anchor text
+	var result = _s.strip(fn(elem.children || [], options));
+	// Get the href, if present
 	if (elem.attribs && elem.attribs.href) {
-	    return elem.attribs.href.replace(/^mailto\:/, '');
-  	} 
-  	else {
-	    return helper.wordwrap(helper.decodeHTMLEntities(_s.strip(elem.raw)), options.wordwrap);
-  	}
+		href = elem.attribs.href.replace(/^mailto\:/, '');
+	}
+	if (result && href) {
+		result += ' [' + href + ']';
+	}
+	return formatText({ raw: result || href, needsSpace: elem.needsSpace }, options);
 };
 
 function formatHorizontalLine(elem, fn, options) {

lib/html-to-text.js

@@ -79,6 +79,9 @@ function walk(dom, options) {
 			case 'tag':
 				switch(elem.name.toLowerCase()) {
 					case 'a':
+						// Inline element needs a leading space if `result` currently
+						// doesn't end with whitespace
+						elem.needsSpace = whiteSpaceRegex.test(result);
 						result += format.anchor(elem, walk, options);
 						break;
 					case 'p':