From mboxrd@z Thu Jan  1 00:00:00 1970
From: e at 80x24.org (Eric Wong)
Date: Tue,  1 Jan 2019 11:44:53 +0000
Subject: [PATCH 4/4] ui-diff: preserve spaces w/o CSS on context lines
In-Reply-To: <20190101114453.4876-1-e@80x24.org>
References: <20190101114453.4876-1-e@80x24.org>
Message-ID: <20190101114453.4876-5-e@80x24.org>

We need to use a non-breaking space entity to preserve
spacing for browsers without CSS support.
---
 html.c    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 html.h    |  1 +
 ui-diff.c |  5 +----
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/html.c b/html.c
index 7f81965..138c649 100644
--- a/html.c
+++ b/html.c
@@ -156,6 +156,52 @@ ssize_t html_ntxt(const char *txt, size_t len)
 	return slen;
 }
 
+ssize_t html_ntxt_pre(const char *txt, size_t len)
+{
+	const char *t = txt;
+	ssize_t slen;
+	int prev = 0;
+
+	if (len > SSIZE_MAX)
+		return -1;
+
+	slen = (ssize_t) len;
+	while (t && *t && slen--) {
+		int c = *t;
+		if (c == '<' || c == '>' || c == '&' || c == ' ' || c == '\t') {
+			html_raw(txt, t - txt);
+			if (c == '>')
+				html("&gt;");
+			else if (c == '<')
+				html("&lt;");
+			else if (c == '&')
+				html("&amp;");
+			else if (c == ' ') {
+				if (!prev || prev == ' ' || prev == '\t') {
+					html("&#160;");
+					/* next byte can be unescaped ' ' */
+					c = 160;
+				} else {
+					html(" ");
+				}
+			} else if (c == '\t') {
+				html("&#160;&#160;&#160;&#160;"
+				     "&#160;&#160;&#160;&#160;");
+				/* next byte can be unescaped ' ' */
+				c = 160;
+			}
+			txt = t + 1;
+		}
+		prev = c;
+		t++;
+	}
+	if (t != txt)
+		html_raw(txt, t - txt);
+	return slen;
+}
+
+
+
 void html_attrf(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/html.h b/html.h
index fa4de77..4479b8e 100644
--- a/html.h
+++ b/html.h
@@ -20,6 +20,7 @@ extern void html_attrf(const char *format,...);
 
 extern void html_txt(const char *txt);
 extern ssize_t html_ntxt(const char *txt, size_t len);
+extern ssize_t html_ntxt_pre(const char *txt, size_t len);
 extern void html_attr(const char *txt);
 extern void html_url_path(const char *txt);
 extern void html_url_arg(const char *txt);
diff --git a/ui-diff.c b/ui-diff.c
index 70dcc91..ca19f9e 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -222,7 +222,6 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
 static void print_line(char *line, int len)
 {
 	char *class = "ctx";
-	char c = line[len-1];
 
 	if (line[0] == '+')
 		class = "add";
@@ -232,10 +231,8 @@ static void print_line(char *line, int len)
 		class = "hunk";
 
 	htmlf("<div class='%s'>", class);
-	line[len-1] = '\0';
-	html_txt(line);
+	html_ntxt_pre(line, len - 1);
 	html("</div>");
-	line[len-1] = c;
 }
 
 static void header(const struct object_id *oid1, char *path1, int mode1,
-- 
EW