From 2208e190bfd55a70a1b00b20278d7b710e184057 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 4 Aug 2022 16:22:36 -0700
Subject: [PATCH] FORMAT

---
 src/language/stats/ctables.c    |  1 +
 tests/language/stats/ctables.at | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 5393c1b838..f8c3f89f0d 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4788,6 +4788,7 @@ ctables_table_output (struct ctables *ct, struct ctables_table *t)
                   value = pivot_value_new_number (d);
                   value->numeric.format = format;
                 }
+              /* XXX should text values be right-justified? */
               pivot_table_put (pt, dindexes, n_dindexes, value);
             }
         }
diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at
index cfa39ec3a3..0453eeb1e8 100644
--- a/tests/language/stats/ctables.at
+++ b/tests/language/stats/ctables.at
@@ -17,7 +17,6 @@ dnl   * THRU (numeric ranges)
 dnl   * OTHERNM
 dnl - FORMAT:
 dnl   * MINCOLWIDTH, MAXCOLWIDTH, UNITS.
-dnl   * MISSING.
 dnl - HIDESMALLCOUNTS.
 dnl - Date/time variables and values
 dnl - Special formats for summary functions: NEGPAREN, NEQUAL, PAREN, PCTPAREN.
@@ -2253,4 +2252,36 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 │                             one             │               │               │
 ╰─────────────────────────────────────────────┴───────────────┴───────────────╯
 ])
+AT_CLEANUP
+
+AT_SETUP([CTABLES FORMAT=MISSING])
+AT_KEYWORDS([FORMAT MISSING])
+AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_DATA([ctables.sps],
+[[GET 'nhtsa.sav'.
+CTABLES /FORMAT MISSING='(no data)' /TABLE qnd5a[COLPCT] BY qnd5.
+]])
+AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
+                                 Custom Tables
+╭─────────────────────────────────────────────┬───────────────────────────────╮
+│                                             │   D5. ETHNICITY: Are you of   │
+│                                             │  Hispanic or Latino origin or │
+│                                             │            descent?           │
+│                                             ├───────────────┬───────────────┤
+│                                             │      Yes      │       No      │
+│                                             ├───────────────┼───────────────┤
+│                                             │    Column %   │    Column %   │
+├─────────────────────────────────────────────┼───────────────┼───────────────┤
+│D5a. What would you say is   Cuban           │           3.2%│(no data)      │
+│your primary ethnic          Mexican         │          50.3%│(no data)      │
+│background?                  Spanish         │           7.8%│(no data)      │
+│                             South American  │           5.5%│(no data)      │
+│                             Central American│           8.4%│(no data)      │
+│                             Puerto Rican, OR│          12.6%│(no data)      │
+│                             Something else  │          11.0%│(no data)      │
+│                             Multiple -      │           1.1%│(no data)      │
+│                             cannot choose   │               │               │
+│                             one             │               │               │
+╰─────────────────────────────────────────────┴───────────────┴───────────────╯
+])
 AT_CLEANUP
\ No newline at end of file
-- 
2.30.2