From 83c1c6bedbf9d6be1c7e0220dd69844c7265f527 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Sun, 17 Jan 2021 19:27:59 +0000 Subject: Use 
 and  to print diffs

This correctly preserves whitespace in browsers without CSS, as an
alternative to [1].

[1]: https://80x24.org/cgit.git/commit/?id=7c692e6137697de8a8473c4de5c3de4fb03a2989
---
 www/git.causal.agency/cgit/cgit.css  | 14 ++++----------
 www/git.causal.agency/cgit/ui-diff.c | 30 +++++++++++++++++-------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/www/git.causal.agency/cgit/cgit.css b/www/git.causal.agency/cgit/cgit.css
index dac791b6..36826b07 100644
--- a/www/git.causal.agency/cgit/cgit.css
+++ b/www/git.causal.agency/cgit/cgit.css
@@ -533,26 +533,20 @@ div#cgit table.diff {
 	width: 100%;
 }
 
-div#cgit table.diff td {
-	font-family: monospace;
-	white-space: pre;
-}
-
-div#cgit table.diff td div.head {
+div#cgit table.diff td span.head {
 	font-weight: bold;
-	margin-top: 1em;
 	color: black;
 }
 
-div#cgit table.diff td div.hunk {
+div#cgit table.diff td span.hunk {
 	color: #009;
 }
 
-div#cgit table.diff td div.add {
+div#cgit table.diff td span.add {
 	color: green;
 }
 
-div#cgit table.diff td div.del {
+div#cgit table.diff td span.del {
 	color: red;
 }
 
diff --git a/www/git.causal.agency/cgit/ui-diff.c b/www/git.causal.agency/cgit/ui-diff.c
index 329c3506..97c1ca02 100644
--- a/www/git.causal.agency/cgit/ui-diff.c
+++ b/www/git.causal.agency/cgit/ui-diff.c
@@ -231,11 +231,11 @@ static void print_line(char *line, int len)
 	else if (line[0] == '@')
 		class = "hunk";
 
-	htmlf("
", class);
+	htmlf("", class);
 	line[len-1] = '\0';
 	html_txt(line);
-	html("
");
 	line[len-1] = c;
+	html("\n");
 }
 
 static void header(const struct object_id *oid1, char *path1, int mode1,
@@ -245,22 +245,23 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
 	int subproject;
 
 	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
-	html("
");
+	html("");
 	html("diff --git a/");
 	html_txt(path1);
 	html(" b/");
 	html_txt(path2);
+	html("\n");
 
 	if (mode1 == 0)
-		htmlf("
new file mode %.6o", mode2);
+		htmlf("new file mode %.6o\n", mode2);
 
 	if (mode2 == 0)
-		htmlf("
deleted file mode %.6o", mode1);
+		htmlf("deleted file mode %.6o\n", mode1);
 
 	if (!subproject) {
 		abbrev1 = xstrdup(find_unique_abbrev(oid1, DEFAULT_ABBREV));
 		abbrev2 = xstrdup(find_unique_abbrev(oid2, DEFAULT_ABBREV));
-		htmlf("
index %s..%s", abbrev1, abbrev2);
+		htmlf("index %s..%s", abbrev1, abbrev2);
 		free(abbrev1);
 		free(abbrev2);
 		if (mode1 != 0 && mode2 != 0) {
@@ -268,28 +269,31 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
 			if (mode2 != mode1)
 				htmlf("..%.6o", mode2);
 		}
+		html("\n");
 		if (is_null_oid(oid1)) {
 			path1 = "dev/null";
-			html("
--- /");
+			html("--- /");
 		} else
-			html("
--- a/");
+			html("--- a/");
 		if (mode1 != 0)
 			cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
 				       oid_to_hex(old_rev_oid), path1);
 		else
 			html_txt(path1);
+		html("\n");
 		if (is_null_oid(oid2)) {
 			path2 = "dev/null";
-			html("
+++ /");
+			html("+++ /");
 		} else
-			html("
+++ b/");
+			html("+++ b/");
 		if (mode2 != 0)
 			cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
 				       oid_to_hex(new_rev_oid), path2);
 		else
 			html_txt(path2);
+		html("\n");
 	}
-	html("
");
+	html("");
 }
 
 static void filepair_cb(struct diff_filepair *pair)
@@ -488,12 +492,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
 		html("");
 	} else {
 		html("
");
-		html("");
+		html("");
 	html("
");
+		html("
");
 	}
 	cgit_diff_tree(old_rev_oid, new_rev_oid, filepair_cb, prefix,
 		       ctx.qry.ignorews);
 	if (!use_ssdiff)
-		html("
");
 
 	if (show_ctrls)
-- 
cgit 1.4.1


This reverts commit 066b65515e7d35ed0de41ca3f5f351f394457c2b.

Ok the reason you DON'T do that is because then every post older
than colb gets regenerated.



2022-04-20Set txt mtimes to source mtimesJune McEnroe


2022-04-20Make (pun) the dependencies make (pun) more senseJune McEnroe


2022-04-17Add HenchJune McEnroe

There are some truly horrifying and gruesome bits though.



2022-04-14Publish "Agency"June McEnroe


2022-04-13Swap dates so the difference is always positiveJune McEnroe


2022-04-04Update "Care"June McEnroe


2022-04-03Publish "Care"June McEnroe


2022-03-31Publish "Compassion"June McEnroe


2022-03-24Skip matches with ident chars on either sideJune McEnroe

This fixes, for example, where the link gets placed on

    static regex_t regex(const char *pattern, int flags)

in title.c.



2022-03-24Add The Invisible Life of Addie LaRueJune McEnroe

So good, but so long. Reminded me of The Ten Thousand Doors of
January at the beginning, and more of that N. K. Jemisin series
about gods later. I like this interacting with gods and becoming
something like one sort of thing.

God, it took me a whole month (more?) to read and this is only my
third book of the year :( I need some more novellas to read, but
the other books I have from the library currently are also thick.



2022-03-22Source ~/.profile.local if it existsJune McEnroe


2022-03-18Publish "Addendum 2021"June McEnroe


2022-03-16Remove wcwidth portJune McEnroe

DYLD_FORCE_FLAT_NAMESPACE no longer exists in macOS 12 so this
approach doesn't work anymore. Moved to
<https://git.causal.agency/jorts/tree/wcwidth> and compiled into
<https://git.causal.agency/jorts/tree/ncurses>.



2022-03-16Remove -j4 from ./PlanJune McEnroe

Plan learned to set this automatically!



2022-03-15Rewrite Linux install.sh for DebianJune McEnroe


2022-03-15Remove dashJune McEnroe