X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=8b062134cde99c0a7f8abf0a02809708fa113dea;hb=638a86001fe7a237bd6c19a181d796305290d72a;hp=636450a9a353c1d43ccac0f7c4a54b665e946401;hpb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;p=pspp

diff --git a/src/output/html.c b/src/output/html.c
index 636450a9a3..8b062134cd 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, _("opening HTML output file: %s"), html->file_name);
+      error (0, errno, _("error opening output file `%s'"), html->file_name);
       goto error;
     }
 
@@ -112,11 +112,11 @@ html_create (const char *file_name, enum settings_output_devices device_type,
   fputs ("<HTML>\n", html->file);
   fputs ("<HEAD>\n", html->file);
   print_title_tag (html->file, "TITLE", _("PSPP Output"));
-  fprintf (html->file, "<META NAME=\"generator\" CONTENT=\"%s\">\n", version);
+  fprintf (html->file, "<META NAME=\"generator\" CONTENT=`%s'>\n", version);
   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);
+         "CONTENT=\"text/html; charset=utf-8\">\n", html->file);
   fputs ("<STYLE>\n"
          "<!--\n"
          "body {\n"
@@ -243,6 +243,7 @@ html_submit (struct output_driver *driver,
       struct table_item *table_item = to_table_item (output_item);
       html_output_table (html, table_item);
     }
+#ifdef HAVE_CAIRO
   else if (is_chart_item (output_item) && html->chart_file_name != NULL)
     {
       struct chart_item *chart_item = to_chart_item (output_item);
@@ -252,10 +253,11 @@ html_submit (struct output_driver *driver,
                                      html->chart_cnt++);
       if (file_name != NULL)
         {
-          fprintf (html->file, "<IMG SRC=\"%s\"/>", file_name);
+          fprintf (html->file, "<IMG SRC=`%s'/>", file_name);
           free (file_name);
         }
     }
+#endif  /* HAVE_CAIRO */
   else if (is_text_item (output_item))
     {
       struct text_item *text_item = to_text_item (output_item);
