work

[pspp] / src / output / table.h

diff --git a/src/output/table.h b/src/output/table.h
index 54995600cb1fa2313ebf9103b21a4a74180c2e4d..1229e9062f82051b94fc5a9ceb48a26675bcecca 100644 (file)
--- a/src/output/table.h
+++ b/src/output/table.h
@@ -56,8 +56,8 @@ struct variable;
 enum table_axis
   {
     TABLE_HORZ,
-    TABLE_VERT,
-    TABLE_N_AXES
+    TABLE_VERT
+#define TABLE_N_AXES 2
   };
 
 struct cell_color
@@ -199,9 +199,7 @@ enum
 /* Given line styles A and B (each one of the TAL_* enumeration constants
    above), returns a line style that "combines" them, that is, that gives a
    reasonable line style choice for a rule for different reasons should have
-   both styles A and B.
-
-   Used especially for pasting tables together (see table_paste()). */
+   both styles A and B. */
 static inline int table_rule_combine (int a, int b)
 {
   return a > b ? a : b;
@@ -241,7 +239,6 @@ struct table
 struct table *table_ref (const struct table *);
 void table_unref (struct table *);
 bool table_is_shared (const struct table *);
-struct table *table_unshare (struct table *);
 
 /* Returns the number of columns or rows, respectively, in T. */
 static inline int table_nc (const struct table *t)
@@ -265,25 +262,5 @@ void table_set_hl (struct table *, int hl);
 void table_set_hr (struct table *, int hr);
 void table_set_ht (struct table *, int ht);
 void table_set_hb (struct table *, int hb);
-\f
-/* Table classes. */
-
-/* Simple kinds of tables. */
-struct table *table_from_string (enum table_halign, const char *);
-
-/* Combining tables. */
-struct table *table_paste (struct table *, struct table *,
-                           enum table_axis orientation);
-struct table *table_hpaste (struct table *left, struct table *right);
-struct table *table_vpaste (struct table *top, struct table *bottom);
-
-/* Taking subsets of tables. */
-struct table *table_select (struct table *, int rect[TABLE_N_AXES][2]);
-struct table *table_select_slice (struct table *, enum table_axis,
-                                  int z0, int z1, bool add_headers);
-struct table *table_select_columns (struct table *,
-                                    int x0, int x1, bool add_headers);
-struct table *table_select_rows (struct table *,
-                                 int y0, int y1, bool add_headers);
 
 #endif /* output/table.h */