X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=1027dea501037e5e74655ecb0a4d76b7c2357280;hb=f967d0e36a2193c1249799f463ea9109b753f7a8;hp=f9d45736ef0fe866537e97a9a068b5664acd68aa;hpb=0b676d85cb983fa0e719de9300935d2c8b549b14;p=pspp diff --git a/src/output/html.c b/src/output/html.c index f9d45736ef..1027dea501 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, "%s>\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, "
*/
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);
}
@@ -480,10 +455,16 @@ html_output_table (struct html_driver *html, const struct table_item *item)
fputs ("\n", html->file);
const struct table_item_text *title = table_item_get_title (item);
- if (title)
+ const struct table_item_text *layers = table_item_get_layers (item);
+ if (title || layers)
{
fputs ("
\n", html->file);
+ if (layers)
+ html_put_table_item_text (html, layers);
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;
@@ -513,19 +493,23 @@ html_output_table (struct html_driver *html, const struct table_item *item)
tag = is_header ? "TH" : "TD";
fprintf (html->file, " <%s", tag);
- int halign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_HALIGN
- : TAB_LEFT);
- if (halign != TAB_LEFT)
- fprintf (html->file, " ALIGN=\"%s\"",
- halign == TAB_RIGHT ? "RIGHT" : "CENTER");
+ 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);
+ }
- int valign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_VALIGN
- : TAB_LEFT);
- if (valign != TAB_TOP)
+ if (cell.style->cell_style.valign != TABLE_VALIGN_TOP)
fprintf (html->file, " ALIGN=\"%s\"",
- valign == TAB_BOTTOM ? "BOTTOM" : "MIDDLE");
+ (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM
+ ? "BOTTOM" : "MIDDLE"));
colspan = table_cell_colspan (&cell);
if (colspan > 1)
@@ -540,21 +524,24 @@ html_output_table (struct html_driver *html, const struct table_item *item)
/* Cell borders. */
int n_borders = 0;
- top = table_get_rule (t, TABLE_VERT, x, y);
+ 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);
+ 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);
+ 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);
+ right = table_get_rule (t, TABLE_HORZ, x + colspan, y,
+ &color);
put_border (html->file, &n_borders, right, "right");
}
@@ -565,28 +552,20 @@ 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)
{
- const char *s = c->text;
-
- 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);
-
- html_put_footnote_markers (html, c->footnotes, c->n_footnotes);
+ 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), " ", "
");
+ }
+
+ html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
/* Output or . */
fprintf (html->file, "%s>\n", tag);