X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=5aec959c740a16a69888d9f5da76ad2d56778528;hb=f3668539947d5baed813a4f8436d6cf36abeedd2;hp=989752b627fc9c54dcbf59410c5729769a96488c;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/src/output/html.c b/src/output/html.c
index 989752b627..5aec959c74 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -103,7 +103,7 @@ html_create (const char *file_name, enum settings_output_devices device_type,
   html->file = fn_open (html->file_name, "w");
   if (html->file == NULL)
     {
-      error (0, errno, _("error opening output file \"%s\""), html->file_name);
+      error (0, errno, _("error opening output file `%s'"), html->file_name);
       goto error;
     }
 
@@ -116,8 +116,8 @@ html_create (const char *file_name, enum settings_output_devices device_type,
   fputs ("<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\n",
          html->file);
   fputs ("<META HTTP-EQUIV=\"Content-Type\" "
-         "CONTENT=\"text/html; charset=ISO-8859-1\">\n", html->file);
-  fputs ("<STYLE>\n"
+         "CONTENT=\"text/html; charset=utf-8\">\n", html->file);
+  fputs ("<STYLE TYPE=\"text/css\">\n"
          "<!--\n"
          "body {\n"
          "  background: white;\n"
@@ -253,7 +253,9 @@ html_submit (struct output_driver *driver,
                                      html->chart_cnt++);
       if (file_name != NULL)
         {
-          fprintf (html->file, "<IMG SRC=\"%s\"/>", file_name);
+	  const char *title = chart_item_get_title (chart_item);
+          fprintf (html->file, "<IMG SRC=\"%s\" ALT=\"Chart: %s\">",
+		   file_name, title ? title : _("No description"));
           free (file_name);
         }
     }
@@ -418,16 +420,16 @@ html_output_table (struct html_driver *html, struct table_item *item)
 
           alignment = cell.options & TAB_ALIGNMENT;
           if (alignment != TAB_LEFT)
-            fprintf (html->file, " ALIGN=%s",
+            fprintf (html->file, " ALIGN=\"%s\"",
                      alignment == TAB_RIGHT ? "RIGHT" : "CENTER");
 
           colspan = table_cell_colspan (&cell);
           if (colspan > 1)
-            fprintf (html->file, " COLSPAN=%d", colspan);
+            fprintf (html->file, " COLSPAN=\"%d\"", colspan);
 
           rowspan = table_cell_rowspan (&cell);
           if (rowspan > 1)
-            fprintf (html->file, " ROWSPAN=%d", rowspan);
+            fprintf (html->file, " ROWSPAN=\"%d\"", rowspan);
 
           /* Cell borders. */
           n_borders = 0;