X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fhtml.c;h=608de8a2d9c2f2ebc487a0cb4b39394d18f2792e;hb=b7e33825d30a18360f24a18faf4b7d2e9efb8142;hp=42d818b519f908004e0eb876cdfc089ffd53a67b;hpb=cb4033020c8a24d573814e6ac9192046bffdccac;p=pspp diff --git a/src/html.c b/src/html.c index 42d818b519..608de8a2d9 100644 --- a/src/html.c +++ b/src/html.c @@ -21,7 +21,8 @@ #if !NO_HTML #include -#include +#include "htmlP.h" +#include "error.h" #include #include #include @@ -35,29 +36,29 @@ #include "error.h" #include "filename.h" #include "getline.h" -#include "htmlP.h" #include "output.h" #include "som.h" #include "tab.h" #include "version.h" +#include "mkfile.h" /* Prototypes. */ static int postopen (struct file_ext *); static int preclose (struct file_ext *); -int -html_open_global (struct outp_class *this unused) +static int +html_open_global (struct outp_class *this UNUSED) { return 1; } -int -html_close_global (struct outp_class *this unused) +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 +88,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 +106,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; @@ -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 { @@ -141,7 +158,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; @@ -156,7 +173,7 @@ html_option (struct outp_driver *this, const char *key, const struct string *val break; case 1: free (x->file.filename); - x->file.filename = xstrdup (ds_value (val)); + x->file.filename = xstrdup (ds_c_str (val)); break; case string_arg: { @@ -168,10 +185,11 @@ html_option (struct outp_driver *this, const char *key, const struct string *val break; default: assert (0); + abort (); } if (*dest) free (*dest); - *dest = xstrdup (ds_value (val)); + *dest = xstrdup (ds_c_str (val)); } break; default: @@ -358,7 +376,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 +396,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,8 +408,8 @@ html_close_page (struct outp_driver *this) static void output_tab_table (struct outp_driver *, struct tab_table *); -void -html_submit (struct outp_driver *this, struct som_table *s) +static void +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; @@ -403,30 +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; + } -/* 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 ("", f); - if (*old_attr & OUTP_F_I) - fputs ("", f); - if (new_attr & OUTP_F_I) - fputs ("", f); - if (new_attr & OUTP_F_B) - fputs ("", f); - - *old_attr = new_attr; } /* Write string S of length LEN to file F, escaping characters as @@ -436,7 +445,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 +470,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,13 +478,11 @@ 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 ("

", x->file.file); if (!ls_empty_p (t->cc)) - escape_string (x->file.file, ls_value (t->cc), ls_length (t->cc)); + escape_string (x->file.file, ls_c_str (t->cc), ls_length (t->cc)); fputs ("

\n", x->file.file); return; @@ -490,14 +493,13 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) if (!ls_empty_p (&t->title)) { fprintf (x->file.file, " \n ", t->nc); - escape_string (x->file.file, ls_value (&t->title), + escape_string (x->file.file, ls_c_str (&t->title), ls_length (&t->title)); fputs ("\n \n", x->file.file); } { int r; - struct len_string *cc = t->cc; unsigned char *ct = t->ct; for (r = 0; r < t->nr; r++) @@ -505,15 +507,22 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) int c; fputs (" \n", x->file.file); - for (c = 0; c < t->nc; c++, cc++, ct++) + for (c = 0; c < t->nc; c++, ct++) { + struct fixed_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_c_str (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 +548,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, ">"); @@ -554,7 +561,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) if ( ! (*ct & TAB_EMPTY) ) { - char *s = ls_value (cc); + char *s = ls_c_str (cc); size_t l = ls_length (cc); while (l && isspace ((unsigned char) *s)) @@ -575,6 +582,36 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) fputs ("\n\n", x->file.file); } + +void html_initialise_chart(struct outp_class *c, struct chart *ch); +void html_finalise_chart(struct outp_class *c, struct chart *ch); + + +void +html_initialise_chart(struct outp_class *c UNUSED, struct chart *ch) +{ + + FILE *fp; + + make_unique_file_stream(&fp, &ch->filename); + +#ifdef NO_CHARTS + ch->lp = 0; +#else + ch->pl_params = pl_newplparams(); + ch->lp = pl_newpl_r ("png", 0, fp, stderr, ch->pl_params); +#endif + +} + +void +html_finalise_chart(struct outp_class *c UNUSED, struct chart *ch) +{ + free(ch->filename); +} + + + /* HTML driver class. */ struct outp_class html_class = { @@ -614,6 +651,10 @@ struct outp_class html_class = NULL, NULL, NULL, + + html_initialise_chart, + html_finalise_chart + }; #endif /* !NO_HTML */