segment: Make negative numbers into single segments.

[pspp] / src / data / format.h

diff --git a/src/data/format.h b/src/data/format.h
index 223ce1533d11f2185568d8f18f9e1c444277cde3..4cde16b17a0b1352356f6b522c602bc18150b70e 100644 (file)
--- a/src/data/format.h
+++ b/src/data/format.h
@@ -56,7 +56,7 @@ enum fmt_category
   };
 
 /* Format type. */
-enum fmt_type
+enum ATTRIBUTE ((packed)) fmt_type
   {
 #define FMT(NAME, METHOD, IMIN, OMIN, IO, CATEGORY) FMT_##NAME,
 #include "format.def"
@@ -75,8 +75,8 @@ enum fmt_type
 struct fmt_spec
   {
     enum fmt_type type;                /* One of FMT_*. */
-    int w;                     /* Width. */
-    int d;                     /* Number of decimal places. */
+    uint8_t d;                 /* Number of decimal places. */
+    uint16_t w;                        /* Width. */
   };
 
 /* Maximum width of any numeric format. */
@@ -175,6 +175,8 @@ struct fmt_number_style *fmt_number_style_clone (
   const struct fmt_number_style *);
 void fmt_number_style_destroy (struct fmt_number_style *);
 
+char *fmt_number_style_to_string (const struct fmt_number_style *);
+
 int fmt_affix_width (const struct fmt_number_style *);
 int fmt_neg_affix_width (const struct fmt_number_style *);
 \f
@@ -191,7 +193,7 @@ struct fmt_settings
 
 void fmt_settings_init (struct fmt_settings *);
 void fmt_settings_uninit (struct fmt_settings *);
-void fmt_settings_copy (struct fmt_settings *, const struct fmt_settings *);
+struct fmt_settings fmt_settings_copy (const struct fmt_settings *);
 
 const struct fmt_number_style *fmt_settings_get_style (
   const struct fmt_settings *, enum fmt_type);