X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fhtml.c;h=608de8a2d9c2f2ebc487a0cb4b39394d18f2792e;hb=304c185799902df1dd96a8ff2d13d279005a82e5;hp=ea11459d132d642449c348227a9d623a65829760;hpb=92bfefccd465052e492f669ce561aa25b0110283;p=pspp diff --git a/src/html.c b/src/html.c index ea11459d13..608de8a2d9 100644 --- a/src/html.c +++ b/src/html.c @@ -40,6 +40,7 @@ #include "som.h" #include "tab.h" #include "version.h" +#include "mkfile.h" /* Prototypes. */ static int postopen (struct file_ext *); @@ -122,6 +123,22 @@ html_close_driver (struct outp_driver *this) return 1; } + +/* Link the image contained in FILENAME to the + HTML stream in file F. */ +static int +link_image (struct file_ext *f, char *filename) +{ + fprintf (f->file, + "", filename); + + if (ferror (f->file)) + return 0; + + return 1; +} + + /* Generic option types. */ enum { @@ -392,7 +409,7 @@ html_close_page (struct outp_driver *this) static void output_tab_table (struct outp_driver *, struct tab_table *); static void -html_submit (struct outp_driver *this, struct som_table *s) +html_submit (struct outp_driver *this, struct som_entity *s) { extern struct som_table_class tab_table_class; struct html_driver_ext *x = this->ext; @@ -404,10 +421,21 @@ html_submit (struct outp_driver *this, struct som_table *s) return; } - if (s->class == &tab_table_class) - output_tab_table (this, (struct tab_table *) s->ext); - else - assert (0); + assert ( s->class == &tab_table_class ) ; + + switch (s->type) + { + case SOM_TABLE: + output_tab_table ( this, (struct tab_table *) s->ext); + break; + case SOM_CHART: + link_image( &x->file, ((struct chart *)s->ext)->filename); + break; + default: + assert(0); + break; + } + } /* Write string S of length LEN to file F, escaping characters as @@ -481,7 +509,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) fputs ("