projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
table-item: Make caption into table_cell too.
[pspp]
/
src
/
output
/
html.c
diff --git
a/src/output/html.c
b/src/output/html.c
index 576b598427de831a4f8b4a09101d0ee6fa833fc5..9f9fc2db89df9804650921c282ddb5a650f58978 100644
(file)
--- a/
src/output/html.c
+++ b/
src/output/html.c
@@
-513,14
+513,6
@@
html_put_footnote_markers (struct html_driver *html,
}
}
}
}
-static void
-html_put_table_item_text (struct html_driver *html,
- const struct table_item_text *text)
-{
- escape_string (html->file, text->content, " ", "<br>");
- html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
-}
-
static void
html_put_table_cell_text (struct html_driver *html,
const struct table_cell *cell)
static void
html_put_table_cell_text (struct html_driver *html,
const struct table_cell *cell)
@@
-674,11
+666,11
@@
html_output_table (struct html_driver *html, const struct table_item *item)
}
fputs (">\n", html->file);
}
fputs (">\n", html->file);
- const struct table_
item_text
*caption = table_item_get_caption (item);
+ const struct table_
cell
*caption = table_item_get_caption (item);
if (caption)
{
put_tfoot (html, t, &tfoot);
if (caption)
{
put_tfoot (html, t, &tfoot);
- html_put_table_
item_text (html, caption
);
+ html_put_table_
cell (html, t, caption, "span", false
);
}
struct footnote **f;
size_t n_footnotes = table_collect_footnotes (item, &f);
}
struct footnote **f;
size_t n_footnotes = table_collect_footnotes (item, &f);