#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)
struct file_handle *handle;
char *chart_file_name;
- char *command_name;
FILE *file;
size_t chart_cnt;
{
if (content != NULL)
{
- fprintf (file, "<%s>", name);
+ fprintf (file, "<%s>", name);
escape_string (file, content, strlen (content), " ", " - ");
fprintf (file, "</%s>\n", name);
}
}
free (html->chart_file_name);
fh_unref (html->handle);
- free (html->command_name);
free (html);
}
{
struct html_driver *html = html_driver_cast (driver);
- output_driver_track_current_command (output_item, &html->command_name);
-
if (is_table_item (output_item))
{
struct table_item *table_item = to_table_item (output_item);
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, "<DIV class=\"");
- escape_string (html->file, s, strlen (s), "_", "<BR>");
- fprintf (html->file, "\">");
- print_title_tag (html->file, "H3", s);
- break;
-
- case TEXT_ITEM_COMMAND_CLOSE:
- fprintf (html->file, "</DIV>\n");
+ case TEXT_ITEM_PAGE_TITLE:
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:
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 <P><TT> */
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, html->command_name);
+ char *s = msg_to_string (message_item_get_msg (message_item));
print_title_tag (html->file, "P", s);
free (s);
}
}
}
+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
fputs ("\n<BR>", 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 ("<SUP>", 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), " ", "<BR>");
+ }
+ fputs ("</SUP>", 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),
+ " ", "<BR>");
+ html_put_footnote_markers (html, text->footnotes, text->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 ("<TABLE>", 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), " ", "<BR>");
- }
- 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;
-
- 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, "<SUP>%s</SUP> ", marker);
- escape_string (html->file, c->footnotes[i],
- strlen (c->footnotes[i]), " ", "<BR>");
- }
- }
-
- next_0:
- x = cell.d[TABLE_HORZ][1];
- table_cell_free (&cell);
- }
+ html_put_table_item_text (html, caption);
}
+ const struct footnote **f;
+ size_t n_footnotes = table_collect_footnotes (item, &f);
+
+ for (size_t i = 0; i < n_footnotes; i++)
+ if (f[i])
+ {
+ put_tfoot (html, t, &tfoot);
+ fputs ("<SUP>", html->file);
+ escape_string (html->file, f[i]->marker, strlen (f[i]->marker),
+ " ", "<BR>");
+ fputs ("</SUP> ", html->file);
+ escape_string (html->file, f[i]->content, strlen (f[i]->content),
+ " ", "<BR>");
+ }
+ free (f);
if (tfoot)
fputs ("</TD></TR></TFOOT>\n", html->file);
- footnote_idx = 0;
fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
- if (title != NULL)
+ const struct table_item_text *title = table_item_get_title (item);
+ const struct table_item_text *layers = table_item_get_layers (item);
+ if (title || layers)
{
fputs (" <CAPTION>", html->file);
- escape_string (html->file, title, strlen (title), " ", "<BR>");
+ if (title)
+ html_put_table_item_text (html, title);
+ if (title && layers)
+ fputs ("<BR>\n", html->file);
+ if (layers)
+ html_put_table_item_text (html, layers);
fputs ("</CAPTION>\n", html->file);
}
fputs (" <TR>\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])
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)
+ int halign = cell.options & TAB_HALIGN;
+ if (halign != TAB_LEFT)
+ fprintf (html->file, " ALIGN=\"%s\"",
+ halign == TAB_RIGHT ? "RIGHT" : "CENTER");
+
+ int valign = cell.options & TAB_VALIGN;
+ if (valign != TAB_TOP)
fprintf (html->file, " ALIGN=\"%s\"",
- alignment == TAB_RIGHT ? "RIGHT" : "CENTER");
+ valign == TAB_BOTTOM ? "BOTTOM" : "MIDDLE");
colspan = table_cell_colspan (&cell);
if (colspan > 1)
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)
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_EMPH)
+ fputs ("<EM>", html->file);
+ if (cell.options & TAB_FIX)
{
- const char *s = c->text;
- int i;
-
- if (c->options & TAB_EMPH)
- fputs ("<EM>", html->file);
- if (c->options & TAB_FIX)
- {
- fputs ("<TT>", html->file);
- escape_string (html->file, s, strlen (s), " ", "<BR>");
- fputs ("</TT>", html->file);
- }
- else
- {
- s += strspn (s, CC_SPACES);
- escape_string (html->file, s, strlen (s), " ", "<BR>");
- }
- if (c->options & TAB_EMPH)
- fputs ("</EM>", html->file);
-
- if (c->n_footnotes > 0)
- {
- fputs ("<SUP>", 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 ("</SUP>", html->file);
- }
+ fputs ("<TT>", html->file);
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ fputs ("</TT>", html->file);
}
+ else
+ {
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ }
+ if (cell.options & TAB_EMPH)
+ fputs ("</EM>", html->file);
+
+ html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
/* Output </TH> or </TD>. */
fprintf (html->file, "</%s>\n", tag);
projects / pspp / blobdiff