"); - escape_string (html->file, s, strlen (s), " ", "\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
"); + escape_string (html->file, s, " ", "
"); 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);
}
}
-/* Write LENGTH characters in TEXT to file F, escaping characters as necessary
- for HTML. Spaces are replaced by SPACE, which should be " " or " "
- New-lines are replaced by NEWLINE, which might be "
" or "\n" or
- something else appropriate. */
+/* Write TEXT to file F, escaping characters as necessary for HTML. Spaces are
+ replaced by SPACE, which should be " " or " " New-lines are replaced by
+ NEWLINE, which might be "
" or "\n" or something else appropriate. */
static void
-escape_string (FILE *file,
- const char *text, size_t length,
+escape_string (FILE *file, const char *text,
const char *space, const char *newline)
{
- while (length-- > 0)
+ for (;;)
{
char c = *text++;
switch (c)
{
+ case 0:
+ return;
case '\n':
fputs (newline, file);
break;
@@ -361,27 +335,39 @@ escape_string (FILE *file,
}
}
+static void
+escape_tag (FILE *file, const char *tag,
+ const char *text, const char *space, const char *newline)
+{
+ if (!text || !*text)
+ return;
+
+ fprintf (file, "<%s>", tag);
+ escape_string (file, text, space, newline);
+ fprintf (file, "", tag);
+}
+
static const char *
border_to_css (int border)
{
switch (border)
{
- case TAL_NONE:
+ case TABLE_STROKE_NONE:
return NULL;
- case TAL_SOLID:
+ case TABLE_STROKE_SOLID:
return "solid";
- case TAL_DASHED:
+ case TABLE_STROKE_DASHED:
return "dashed";
- case TAL_THICK:
+ case TABLE_STROKE_THICK:
return "thick solid";
- case TAL_THIN:
+ case TABLE_STROKE_THIN:
return "thin solid";
- case TAL_DOUBLE:
+ case TABLE_STROKE_DOUBLE:
return "double";
default:
@@ -428,8 +414,7 @@ html_put_footnote_markers (struct html_driver *html,
if (i > 0)
putc (',', html->file);
- escape_string (html->file, f->marker,
- strlen (f->marker), " ", "
");
+ escape_string (html->file, f->marker, " ", "
");
}
fputs ("", html->file);
}
@@ -439,11 +424,25 @@ 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),
- " ", "
");
+ escape_string (html->file, 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, " ", "
");
+ html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes);
+ }
+}
+
static void
html_output_table (struct html_driver *html, const struct table_item *item)
{
@@ -463,16 +462,11 @@ html_output_table (struct html_driver *html, const struct table_item *item)
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 ("", 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),
- " ", "
");
- }
+ {
+ put_tfoot (html, t, &tfoot);
+ escape_tag (html->file, "SUP", f[i]->marker, " ", "
");
+ escape_string (html->file, f[i]->content, " ", "
");
+ }
free (f);
if (tfoot)
fputs ("\n", html->file);
@@ -480,10 +474,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_layers *layers = table_item_get_layers (item);
+ if (title || layers)
{
fputs ("
\n", html->file);
+ if (layers)
+ html_put_table_item_layers (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 +512,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 +543,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,35 +571,36 @@ 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)
+ escape_tag (html->file, "TT", s, " ", " \n", html->file);
}
");
+ else
{
- const char *s = c->text;
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "
");
+ }
- 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
+ if (cell.n_subscripts)
+ {
+ fputs ("", html->file);
+ for (size_t i = 0; i < cell.n_subscripts; i++)
{
- s += strspn (s, CC_SPACES);
- escape_string (html->file, s, strlen (s), " ", "
");
+ if (i)
+ putc (',', html->file);
+ escape_string (html->file, cell.subscripts[i],
+ " ", "
");
}
- if (c->options & TAB_EMPH)
- fputs ("", html->file);
-
- html_put_footnote_markers (html, c->footnotes, c->n_footnotes);
+ fputs ("", html->file);
}
+ if (cell.superscript)
+ escape_tag (html->file, "SUP", cell.superscript, " ", "
");
+ 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 ("