1 files changed, 18 insertions, 12 deletions

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 3591ab4..8215051 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -37,28 +37,28 @@ static int line_from_hunk(char *line, char type)
 }
 
 static char *replace_tabs(char *line)
 {
         char *prev_buf = line;
         char *cur_buf;
-        int linelen = strlen(line);
+        int linelen = strlen(line);
         int n_tabs = 0;
-        int i;
+        int i;
         char *result;
         char *spaces = "        ";
 
         if (linelen == 0) {
                 result = xmalloc(1);
                 result[0] = '\0';
                 return result;
         }
 
-        for (i = 0; i < linelen; i++)
+        for (i = 0; i < linelen; i++)
                 if (line[i] == '\t')
                         n_tabs += 1;
-        result = xmalloc(linelen + n_tabs * 8 + 1);
+        result = xmalloc(linelen + n_tabs * 8 + 1);
         result[0] = '\0';
 
         while (1) {
                 cur_buf = strchr(prev_buf, '\t');
                 if (!cur_buf) {
                         strcat(result, prev_buf);
@@ -103,30 +103,30 @@ static void deferred_new_add(char *line, int line_no)
 
 static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
                               int new_line_no, char *new_line)
 {
         html("<tr>");
         if (old_line_no > 0)
-                htmlf("<td class='%s'>%d </td><td class='%s'>", class,
+                htmlf("<td class='lineno'>%d</td><td class='%s'>",
                       old_line_no, class);
         else
-                htmlf("<td class='%s_dark'>  </td><td class='%s_dark'>", class, class);
+                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
         if (old_line) {
                 old_line = replace_tabs(old_line + 1);
                 html_txt(old_line);
                 free(old_line);
         }
 
-        html("  </td>");
+        html("</td>");
 
         if (new_line_no > 0)
-                htmlf("<td class='%s'>  %d </td><td class='%s'>", class,
+                htmlf("<td class='lineno'>%d</td><td class='%s'>",
                       new_line_no, class);
         else
-                htmlf("<td class='%s_dark'>  </td><td class='%s_dark'>", class, class);
+                htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
         if (new_line) {
                 new_line = replace_tabs(new_line + 1);
                 html_txt(new_line);
                 free(new_line);
         }
@@ -246,19 +246,25 @@ void cgit_ssdiff_line_cb(char *line, int len)
                 html_txt(line);
                 html("</td></tr>");
         }
         line[len - 1] = c;
 }
 
-void cgit_ssdiff_header()
+void cgit_ssdiff_header_begin()
 {
         current_old_line = 0;
         current_new_line = 0;
-        html("<table class='ssdiff'>");
+        html("<tr><td class='space' colspan='4'><div></div></td></tr>");
+        html("<tr><td class='head' colspan='4'>");
+}
+
+void cgit_ssdiff_header_end()
+{
+        html("</td><tr>");
 }
 
 void cgit_ssdiff_footer()
 {
         if (deferred_old || deferred_new)
                 cgit_ssdiff_print_deferred_lines();
-        html("</table>");
+        html("<tr><td class='foot' colspan='4'></td></tr>");
 }