X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fhtml.c;h=53add68cd5dacd51e2afd3d4ec23f0fb439571df;hb=55dee937e22a49d01794ef772076d9f9d84199e9;hp=42d818b519f908004e0eb876cdfc089ffd53a67b;hpb=cb4033020c8a24d573814e6ac9192046bffdccac;p=pspp

diff --git a/src/html.c b/src/html.c
index 42d818b519..53add68cd5 100644
--- a/src/html.c
+++ b/src/html.c
@@ -21,6 +21,7 @@
 #if !NO_HTML
 
 #include <config.h>
+#include "htmlP.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -35,7 +36,6 @@
 #include "error.h"
 #include "filename.h"
 #include "getline.h"
-#include "htmlP.h"
 #include "output.h"
 #include "som.h"
 #include "tab.h"
@@ -45,19 +45,19 @@
 static int postopen (struct file_ext *);
 static int preclose (struct file_ext *);
 
-int
+static int
 html_open_global (struct outp_class *this unused)
 {
   return 1;
 }
 
-int
+static int
 html_close_global (struct outp_class *this unused)
 {
   return 1;
 }
 
-int
+static int
 html_preopen_driver (struct outp_driver *this)
 {
   struct html_driver_ext *x;
@@ -87,7 +87,7 @@ html_preopen_driver (struct outp_driver *this)
   return 1;
 }
 
-int
+static int
 html_postopen_driver (struct outp_driver *this)
 {
   struct html_driver_ext *x = this->ext;
@@ -105,7 +105,7 @@ html_postopen_driver (struct outp_driver *this)
   return 1;
 }
 
-int
+static int
 html_close_driver (struct outp_driver *this)
 {
   struct html_driver_ext *x = this->ext;
@@ -141,7 +141,7 @@ static struct outp_option option_tab[] =
 };
 static struct outp_option_info option_info;
 
-void
+static void
 html_option (struct outp_driver *this, const char *key, const struct string *val)
 {
   struct html_driver_ext *x = this->ext;
@@ -358,7 +358,7 @@ preclose (struct file_ext *f)
   return 1;
 }
 
-int
+static int
 html_open_page (struct outp_driver *this)
 {
   struct html_driver_ext *x = this->ext;
@@ -378,7 +378,7 @@ html_open_page (struct outp_driver *this)
   return !ferror (x->file.file);
 }
 
-int
+static int
 html_close_page (struct outp_driver *this)
 {
   struct html_driver_ext *x = this->ext;
@@ -390,7 +390,7 @@ html_close_page (struct outp_driver *this)
 
 static void output_tab_table (struct outp_driver *, struct tab_table *);
 
-void
+static void
 html_submit (struct outp_driver *this, struct som_table *s)
 {
   extern struct som_table_class tab_table_class;
@@ -409,26 +409,6 @@ html_submit (struct outp_driver *this, struct som_table *s)
     assert (0);
 }
 
-/* Emit HTML to FILE to change from *OLD_ATTR attributes to NEW_ATTR.
-   Sets *OLD_ATTR to NEW_ATTR when done. */
-static void
-change_attributes (FILE *f, int *old_attr, int new_attr)
-{
-  if (*old_attr == new_attr)
-    return;
-
-  if (*old_attr & OUTP_F_B)
-    fputs ("</B>", f);
-  if (*old_attr & OUTP_F_I)
-    fputs ("</I>", f);
-  if (new_attr & OUTP_F_I)
-    fputs ("<I>", f);
-  if (new_attr & OUTP_F_B)
-    fputs ("<B>", f);
-
-  *old_attr = new_attr;
-}
-
 /* Write string S of length LEN to file F, escaping characters as
    necessary for HTML. */
 static void
@@ -436,7 +416,6 @@ escape_string (FILE *f, char *s, int len)
 {
   char *ep = &s[len];
   char *bp, *cp;
-  int attr = 0;
 
   for (bp = cp = s; bp < ep; bp = cp)
     {
@@ -462,9 +441,6 @@ escape_string (FILE *f, char *s, int len)
 	    assert (0);
 	  }
     }
-
-  if (attr)
-    change_attributes (f, &attr, 0);
 }
   
 /* Write table T to THIS output driver. */
@@ -473,8 +449,6 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
 {
   struct html_driver_ext *x = this->ext;
   
-  tab_hit++;
-
   if (t->nr == 1 && t->nc == 1)
     {
       fputs ("<P>", x->file.file);
@@ -497,7 +471,6 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
   
   {
     int r;
-    struct len_string *cc = t->cc;
     unsigned char *ct = t->ct;
 
     for (r = 0; r < t->nr; r++)
@@ -505,15 +478,22 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
 	int c;
 	
 	fputs ("  <TR>\n", x->file.file);
-	for (c = 0; c < t->nc; c++, cc++, ct++)
+	for (c = 0; c < t->nc; c++, ct++)
 	  {
+            struct len_string *cc;
 	    int tag;
 	    char header[128];
 	    char *cp;
+            struct tab_joined_cell *j = NULL;
 
-	    if ((*ct & TAB_JOIN)
-		&& ((struct tab_joined_cell *) ls_value (cc))->hit == tab_hit)
-	      continue;
+            cc = t->cc + c + r * t->nc;
+	    if (*ct & TAB_JOIN) 
+              {
+                j = (struct tab_joined_cell *) ls_value (cc);
+                cc = &j->contents;
+                if (j->x1 != c || j->y1 != r)
+                  continue; 
+              }
 
 	    if (r < t->t || r >= t->nr - t->b
 		|| c < t->l || c >= t->nc - t->r)
@@ -539,14 +519,12 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
 
 	    if (*ct & TAB_JOIN)
 	      {
-		struct tab_joined_cell *j =
-		  (struct tab_joined_cell *) ls_value (cc);
-		j->hit = tab_hit;
-		
 		if (j->x2 - j->x1 > 1)
 		  cp = spprintf (cp, " COLSPAN=%d", j->x2 - j->x1);
 		if (j->y2 - j->y1 > 1)
 		  cp = spprintf (cp, " ROWSPAN=%d", j->y2 - j->y1);
+
+                cc = &j->contents;
 	      }
 	    
 	    strcpy (cp, ">");