X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable.h;h=a212aa4be2e3c7e09425911480daeb95d12648dd;hb=d950831f83004457e69c3e6e44131aef3e57efd3;hp=77315c9b9c381befda8af2c5f24e789442220172;hpb=2027a4ba5ec205a650e93ee17a8840824434184f;p=pspp diff --git a/src/output/table.h b/src/output/table.h index 77315c9b9c..a212aa4be2 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -19,7 +19,7 @@ /* Tables. -. A table is a rectangular grid of cells. Cells can be joined to form larger + A table is a rectangular grid of cells. Cells can be joined to form larger cells. Rows and columns can be separated by rules of various types. Rows at the top and bottom of a table and columns at the left and right edges of a table can be designated as headers, which means that if the table must be @@ -144,7 +144,7 @@ struct font_style bool bold, italic, underline, markup; struct cell_color fg[2], bg[2]; char *typeface; - int size; + int size; /* In 1/72" units. */ }; #define FONT_STYLE_INITIALIZER { FONT_STYLE_INITIALIZER__ } @@ -241,23 +241,6 @@ struct table *table_ref (const struct table *); void table_unref (struct table *); bool table_is_shared (const struct table *); -/* Returns the number of columns or rows, respectively, in T. */ -static inline int table_nc (const struct table *t) - { return t->n[TABLE_HORZ]; } -static inline int table_nr (const struct table *t) - { return t->n[TABLE_VERT]; } - -/* Returns the number of left, right, top, or bottom headers, respectively, in - T. */ -static inline int table_hl (const struct table *t) - { return t->h[TABLE_HORZ][0]; } -static inline int table_hr (const struct table *t) - { return t->h[TABLE_HORZ][1]; } -static inline int table_ht (const struct table *t) - { return t->h[TABLE_VERT][0]; } -static inline int table_hb (const struct table *t) - { return t->h[TABLE_VERT][1]; } - /* Rule masks. */ #define TAB_RULE_TYPE_MASK 7 #define TAB_RULE_TYPE_SHIFT 0 @@ -283,8 +266,6 @@ void table_joint_text (struct table *, int x1, int y1, int x2, int y2, void table_add_subscripts (struct table *, int x, int y, char **subscripts, size_t n_subscripts); -void table_add_superscript (struct table *, int x, int y, - const char *superscript); /* Footnotes. @@ -295,11 +276,9 @@ struct footnote *table_create_footnote (struct table *, size_t idx, const char *content, const char *marker, struct table_area_style *); -void table_add_footnote (struct table *, int x, int y, - const struct footnote *); +void table_add_footnote (struct table *, int x, int y, struct footnote *); -void table_add_style (struct table *, int x, int y, - const struct table_area_style *); +void table_add_style (struct table *, int x, int y, struct table_area_style *); bool table_cell_is_empty (const struct table *, int c, int r);