struct pool;
struct string;
+enum table_halign table_halign_interpret (enum table_halign, bool numeric);
+
struct footnote
{
size_t idx;
char *content;
char *marker;
- struct cell_style *style;
- };
-
-/* An item of contents within a table cell. */
-struct cell_contents
- {
- unsigned int options; /* TAB_*. */
- char *text; /* A paragraph of text. */
-
- /* Optional footnote(s). */
- const struct footnote **footnotes;
- size_t n_footnotes;
- };
-
-void cell_contents_format_footnote_markers (const struct cell_contents *,
- struct string *);
-
-struct cell_color
- {
- uint8_t r, g, b;
- };
-
-#define CELL_COLOR(r, g, b) (struct cell_color) { r, g, b }
-#define CELL_COLOR_BLACK CELL_COLOR (0, 0, 0)
-#define CELL_COLOR_WHITE CELL_COLOR (255, 255, 255)
-
-static inline bool
-cell_color_equal (const struct cell_color *a, const struct cell_color *b)
-{
- return a->r == b->r && a->g == b->g && a->b == b->b;
-}
-
-struct cell_style
- {
- struct cell_color fg, bg;
- int margin[TABLE_N_AXES][2];
- char *font;
- int font_size;
- bool bold, italic, underline;
+ struct area_style *style;
};
-#define CELL_STYLE_INITIALIZER \
- { \
- .fg = CELL_COLOR_BLACK, \
- .bg = CELL_COLOR_WHITE, \
- .margin = { [TABLE_HORZ][0] = 8, [TABLE_HORZ][1] = 11, \
- [TABLE_VERT][0] = 1, [TABLE_VERT][1] = 1 }, \
- .font = NULL, \
- .font_size = 0, \
- .bold = false, \
- .italic = false, \
- .underline = false, \
- }
-
-struct cell_style *cell_style_clone (struct pool *, const struct cell_style *);
-void cell_style_free (struct cell_style *);
-
/* A cell in a table. */
struct table_cell
{
or both. */
int d[TABLE_N_AXES][2];
- /* The cell's contents.
-
- Most table cells contain only one item (a paragraph of text), but cells
- are allowed to be empty (n_contents == 0) or contain a nested table, or
- multiple items.
+ unsigned int options; /* TAB_*. */
+ char *text; /* A paragraph of text. */
- 'inline_contents' provides a place to store a single item to handle the
- common case.
- */
- const struct cell_contents *contents;
- size_t n_contents;
- struct cell_contents inline_contents;
+ /* Optional footnote(s). */
+ const struct footnote **footnotes;
+ size_t n_footnotes;
- const struct cell_style *style;
+ const struct area_style *style;
/* Called to free the cell's data, if nonnull. */
void (*destructor) (void *destructor_aux);
void table_cell_free (struct table_cell *);
+void table_cell_format_footnote_markers (const struct table_cell *,
+ struct string *);
+
/* Returns the number of columns that CELL spans. This is 1 for an ordinary
cell and greater than one for a cell that joins multiple columns. */
static inline int