X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=f28476eae6661d05d27ce3fdfe0bcfb4af47b465;hb=086c00aa4c7e11ef10cdb20a3afc2ba9caa464ec;hp=e79cd8afea34180dfa279dc2ff6adfc0f98aa38f;hpb=f4bd801640ccaf1d41f45e0206e01e71d3e18604;p=pspp diff --git a/src/output/html.c b/src/output/html.c index e79cd8afea..f28476eae6 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -40,7 +40,8 @@ #include "output/table-item.h" #include "output/text-item.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -49,8 +50,8 @@ struct html_driver { struct output_driver driver; #ifdef HAVE_CAIRO - struct xr_color fg; - struct xr_color bg; + struct cell_color fg; + struct cell_color bg; #endif struct file_handle *handle; char *chart_file_name; @@ -199,7 +200,7 @@ print_title_tag (FILE *file, const char *name, const char *content) { if (content != NULL) { - fprintf (file, "<%s>", name); + fprintf (file, "<%s>", name); escape_string (file, content, strlen (content), " ", " - "); fprintf (file, "\n", name); } @@ -261,27 +262,15 @@ html_submit (struct output_driver *driver, switch (text_item_get_type (text_item)) { - case TEXT_ITEM_TITLE: - print_title_tag (html->file, "H1", s); - break; - - case TEXT_ITEM_SUBTITLE: - print_title_tag (html->file, "H2", s); - break; - - case TEXT_ITEM_COMMAND_OPEN: - fprintf (html->file, "
file, s, strlen (s), "_", "
"); - fprintf (html->file, "\">"); - print_title_tag (html->file, "H3", s); + case TEXT_ITEM_PAGE_TITLE: break; - case TEXT_ITEM_COMMAND_CLOSE: - fprintf (html->file, "
\n"); - break; - - case TEXT_ITEM_SUBHEAD: - print_title_tag (html->file, "H4", s); + case TEXT_ITEM_TITLE: + { + int level = MIN (5, output_get_group_level ()) + 1; + char tag[3] = { 'H', level + '1', '\0' }; + print_title_tag (html->file, tag, s); + } break; case TEXT_ITEM_SYNTAX: @@ -290,33 +279,19 @@ html_submit (struct output_driver *driver, fprintf (html->file, "\n"); break; - case TEXT_ITEM_PARAGRAPH: - print_title_tag (html->file, "P", s); - break; - - case TEXT_ITEM_MONOSPACE: + case TEXT_ITEM_LOG: print_title_tag (html->file, "PRE", s); /* should be

*/ break; - case TEXT_ITEM_BLANK_LINE: - fputs ("
", html->file); - break; - case TEXT_ITEM_EJECT_PAGE: /* Nothing to do. */ break; - - case TEXT_ITEM_COMMENT: - case TEXT_ITEM_ECHO: - /* We print out syntax anyway, so nothing to do here either. */ - break; } } else if (is_message_item (output_item)) { const struct message_item *message_item = to_message_item (output_item); - const struct msg *msg = message_item_get_msg (message_item); - char *s = msg_to_string (msg, message_item->command_name); + char *s = msg_to_string (message_item_get_msg (message_item)); print_title_tag (html->file, "P", s); free (s); } @@ -361,13 +336,45 @@ escape_string (FILE *file, } } +static const char * +border_to_css (int border) +{ + switch (border) + { + case TAL_NONE: + return NULL; + + case TAL_SOLID: + return "solid"; + + case TAL_DASHED: + return "dashed"; + + case TAL_THICK: + return "thick solid"; + + case TAL_THIN: + return "thin solid"; + + case TAL_DOUBLE: + return "double"; + + default: + return NULL; + } + +} + static void -put_border (FILE *file, int n_borders, int style, const char *border_name) +put_border (FILE *file, int *n_borders, int style, const char *border_name) { - fprintf (file, "%sborder-%s: %s", - n_borders == 0 ? " STYLE=\"" : "; ", - border_name, - style == TAL_1 ? "thin solid" : "double"); + const char *css = border_to_css (style); + if (css) + { + fprintf (file, "%sborder-%s: %s", + (*n_borders)++ == 0 ? " STYLE=\"" : "; ", + border_name, css); + } } static void @@ -382,67 +389,97 @@ put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot) fputs ("\n
", html->file); } +static void +html_put_footnote_markers (struct html_driver *html, + const struct footnote **footnotes, + size_t n_footnotes) +{ + if (n_footnotes > 0) + { + fputs ("", html->file); + for (size_t i = 0; i < n_footnotes; i++) + { + const struct footnote *f = footnotes[i]; + + if (i > 0) + putc (',', html->file); + escape_string (html->file, f->marker, + strlen (f->marker), " ", "
"); + } + fputs ("", html->file); + } +} + +static void +html_put_table_item_text (struct html_driver *html, + const struct table_item_text *text) +{ + escape_string (html->file, text->content, strlen (text->content), + " ", "
"); + html_put_footnote_markers (html, text->footnotes, text->n_footnotes); +} + +static void +html_put_table_item_layers (struct html_driver *html, + const struct table_item_layers *layers) +{ + for (size_t i = 0; i < layers->n_layers; i++) + { + if (i) + fputs ("
\n", html->file); + + const struct table_item_layer *layer = &layers->layers[i]; + escape_string (html->file, layer->content, strlen (layer->content), + " ", "
"); + html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes); + } +} + static void html_output_table (struct html_driver *html, const struct table_item *item) { const struct table *t = table_item_get_table (item); - const char *title = table_item_get_title (item); - const char *caption = table_item_get_caption (item); - int footnote_idx = 0; bool tfoot = false; int y; fputs ("", html->file); + const struct table_item_text *caption = table_item_get_caption (item); if (caption) { put_tfoot (html, t, &tfoot); - escape_string (html->file, caption, strlen (caption), " ", "
"); + html_put_table_item_text (html, caption); } - footnote_idx = 0; - for (y = 0; y < table_nr (t); y++) - { - int x; - for (x = 0; x < table_nc (t); ) - { - const struct cell_contents *c; - struct table_cell cell; + const struct footnote **f; + size_t n_footnotes = table_collect_footnotes (item, &f); - table_get_cell (t, x, y, &cell); - if (y != cell.d[TABLE_VERT][0]) - goto next_0; - - for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++) - { - int i; - - for (i = 0; i < c->n_footnotes; i++) - { - char marker[16]; - - put_tfoot (html, t, &tfoot); - str_format_26adic (++footnote_idx, false, marker, sizeof marker); - fprintf (html->file, "%s ", marker); - escape_string (html->file, c->footnotes[i], - strlen (c->footnotes[i]), " ", "
"); - } - } - - next_0: - x = cell.d[TABLE_HORZ][1]; - table_cell_free (&cell); - } + for (size_t i = 0; i < n_footnotes; i++) + { + put_tfoot (html, t, &tfoot); + fputs ("", html->file); + escape_string (html->file, f[i]->marker, strlen (f[i]->marker), + " ", "
"); + fputs (" ", html->file); + escape_string (html->file, f[i]->content, strlen (f[i]->content), + " ", "
"); } + free (f); if (tfoot) fputs ("\n", html->file); - footnote_idx = 0; fputs ("\n", html->file); - if (title != NULL) + const struct table_item_text *title = table_item_get_title (item); + const struct table_item_layers *layers = table_item_get_layers (item); + if (title || layers) { fputs (" \n", html->file); } @@ -453,12 +490,11 @@ html_output_table (struct html_driver *html, const struct table_item *item) fputs (" \n", html->file); for (x = 0; x < table_nc (t); ) { - const struct cell_contents *c; struct table_cell cell; const char *tag; bool is_header; - int alignment, colspan, rowspan; - int top, left, right, bottom, n_borders; + int colspan, rowspan; + int top, left, right, bottom; table_get_cell (t, x, y, &cell); if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0]) @@ -472,12 +508,23 @@ html_output_table (struct html_driver *html, const struct table_item *item) tag = is_header ? "TH" : "TD"; fprintf (html->file, " <%s", tag); - alignment = (cell.n_contents > 0 - ? cell.contents[0].options & TAB_ALIGNMENT - : TAB_LEFT); - if (alignment != TAB_LEFT) + enum table_halign halign = table_halign_interpret ( + cell.style->cell_style.halign, cell.options & TAB_NUMERIC); + if (halign != TABLE_HALIGN_LEFT) + { + fprintf (html->file, " ALIGN=\"%s\"", + (halign == TABLE_HALIGN_RIGHT ? "RIGHT" + : halign == TABLE_HALIGN_CENTER ? "CENTER" + : "CHAR")); + if (cell.style->cell_style.decimal_char) + fprintf (html->file, " CHAR=\"%c\"", + cell.style->cell_style.decimal_char); + } + + if (cell.style->cell_style.valign != TABLE_VALIGN_TOP) fprintf (html->file, " ALIGN=\"%s\"", - alignment == TAB_RIGHT ? "RIGHT" : "CENTER"); + (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM + ? "BOTTOM" : "MIDDLE")); colspan = table_cell_colspan (&cell); if (colspan > 1) @@ -490,28 +537,27 @@ html_output_table (struct html_driver *html, const struct table_item *item) if (html->borders) { /* Cell borders. */ - n_borders = 0; + int n_borders = 0; - top = table_get_rule (t, TABLE_VERT, x, y); - if (top > TAL_0) - put_border (html->file, n_borders++, top, "top"); + struct cell_color color; + top = table_get_rule (t, TABLE_VERT, x, y, &color); + put_border (html->file, &n_borders, top, "top"); if (y + rowspan == table_nr (t)) { - bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan); - if (bottom > TAL_0) - put_border (html->file, n_borders++, bottom, "bottom"); + bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan, + &color); + put_border (html->file, &n_borders, bottom, "bottom"); } - left = table_get_rule (t, TABLE_HORZ, x, y); - if (left > TAL_0) - put_border (html->file, n_borders++, left, "left"); + left = table_get_rule (t, TABLE_HORZ, x, y, &color); + put_border (html->file, &n_borders, left, "left"); if (x + colspan == table_nc (t)) { - right = table_get_rule (t, TABLE_HORZ, x + colspan, y); - if (right > TAL_0) - put_border (html->file, n_borders++, right, "right"); + right = table_get_rule (t, TABLE_HORZ, x + colspan, y, + &color); + put_border (html->file, &n_borders, right, "right"); } if (n_borders > 0) @@ -521,50 +567,26 @@ html_output_table (struct html_driver *html, const struct table_item *item) putc ('>', html->file); /* Output cell contents. */ - for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++) + const char *s = cell.text; + if (cell.options & TAB_FIX) + { + fputs ("", html->file); + escape_string (html->file, s, strlen (s), " ", "
"); + fputs ("", html->file); + } + else { - const char *s = c->text; - int i; - - if (c->options & TAB_EMPH) - fputs ("", html->file); - if (c->options & TAB_FIX) - { - fputs ("", html->file); - escape_string (html->file, s, strlen (s), " ", "
"); - fputs ("", html->file); - } - else - { - s += strspn (s, CC_SPACES); - escape_string (html->file, s, strlen (s), " ", "
"); - } - if (c->options & TAB_EMPH) - fputs ("", html->file); - - if (c->n_footnotes > 0) - { - fputs ("", html->file); - for (i = 0; i < c->n_footnotes; i++) - { - char marker[16]; - - if (i > 0) - putc (',', html->file); - str_format_26adic (++footnote_idx, false, - marker, sizeof marker); - fputs (marker, html->file); - } - fputs ("", html->file); - } + s += strspn (s, CC_SPACES); + escape_string (html->file, s, strlen (s), " ", "
"); } + html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes); + /* Output or . */ fprintf (html->file, "\n", tag); next_1: x = cell.d[TABLE_HORZ][1]; - table_cell_free (&cell); } fputs (" \n", html->file); }
", html->file); - escape_string (html->file, title, strlen (title), " ", "
"); + if (title) + html_put_table_item_text (html, title); + if (title && layers) + fputs ("
\n", html->file); + if (layers) + html_put_table_item_layers (html, layers); fputs ("