Andreas Krennmair:

	improved HTML rendering a little bit

1 files changed, 11 insertions, 4 deletions

diff --git a/src/htmlrenderer.cpp b/src/htmlrenderer.cpp
index a9f638a0..aa12c862 100644
--- a/src/htmlrenderer.cpp
+++ b/src/htmlrenderer.cpp
@@ -1,4 +1,5 @@
 #include <htmlrenderer.h>
+#include <iostream>
 
 using namespace noos;
 
@@ -6,7 +7,8 @@ htmlrenderer::htmlrenderer(unsigned int width) : w(width) { }
 
 std::vector<std::string> htmlrenderer::render(const std::string& source) {
 	std::vector<std::string> lines;
-	std::string curline, cleaned_source;
+	std::string curline;
+	std::string cleaned_source;
 
 	const char * begin = source.c_str();
 	bool addchar = true;
@@ -18,6 +20,9 @@ std::vector<std::string> htmlrenderer::render(const std::string& source) {
 				char str[2];
 				str[0] = *begin;
 				str[1] = '\0';
+				if (str[0] == '\n' || str[0] == '\r') {
+					str[0] = ' ';
+				}
 				cleaned_source.append(str);
 			} else {
 				addchar = false;
@@ -31,6 +36,8 @@ std::vector<std::string> htmlrenderer::render(const std::string& source) {
 		++begin;
 	}
 
+	std::cerr << "cleaned_source: `" << cleaned_source << "'" << std::endl;
+
 	begin = cleaned_source.c_str();
 	while (strlen(begin) >= w) {
 		const char * end = begin + w;
@@ -44,12 +51,12 @@ std::vector<std::string> htmlrenderer::render(const std::string& source) {
 		} else {
 			char x[end-begin+1];
 			strncpy(x,begin,end-begin);
-			x[w] = '\0';
+			x[end-begin] = '\0';
 			curline = x;
 		}
 		lines.push_back(curline);
-		begin += w;
+		begin += curline.length() + 1;
 	}
-	lines.push_back(begin);
+	lines.push_back(std::string(begin));
 	return lines;
 }