Closing bug #21760

diff --git a/po/de.po b/po/de.po
index 657647e6dc25e26d7169563674fc54cf2e073c14..0a475991cb18d11688f45f814811ac85d970e0c1 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2007-12-14 08:07+0900\n"
+"POT-Creation-Date: 2007-12-19 08:29+0900\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
@@ -2578,8 +2578,8 @@ msgstr ""
 #: src/language/stats/binomial.c:227 src/language/stats/crosstabs.q:870
 #: src/language/stats/examine.q:988 src/language/stats/frequencies.q:1405
 #: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:391
-#: src/language/stats/t-test.q:682 src/language/stats/t-test.q:705
-#: src/language/stats/t-test.q:831 src/language/stats/t-test.q:1368
+#: src/language/stats/t-test.q:693 src/language/stats/t-test.q:716
+#: src/language/stats/t-test.q:850 src/language/stats/t-test.q:1387
 msgid "N"
 msgstr ""
 
@@ -2630,8 +2630,8 @@ msgstr ""
 
 #: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1154
 #: src/language/stats/oneway.q:279 src/language/stats/oneway.q:680
-#: src/language/stats/regression.q:311 src/language/stats/t-test.q:982
-#: src/language/stats/t-test.q:1174 src/language/stats/t-test.q:1267
+#: src/language/stats/regression.q:311 src/language/stats/t-test.q:1001
+#: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286
 msgid "df"
 msgstr ""
 
@@ -2769,13 +2769,13 @@ msgstr ""
 msgid "95%% Confidence Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1201 src/language/stats/t-test.q:986
-#: src/language/stats/t-test.q:1171 src/language/stats/t-test.q:1270
+#: src/language/stats/crosstabs.q:1201 src/language/stats/t-test.q:1005
+#: src/language/stats/t-test.q:1190 src/language/stats/t-test.q:1289
 msgid "Lower"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1202 src/language/stats/t-test.q:987
-#: src/language/stats/t-test.q:1172 src/language/stats/t-test.q:1271
+#: src/language/stats/crosstabs.q:1202 src/language/stats/t-test.q:1006
+#: src/language/stats/t-test.q:1191 src/language/stats/t-test.q:1290
 msgid "Upper"
 msgstr ""
 
@@ -2920,9 +2920,9 @@ msgstr ""
 
 #: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1524
 #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125
-#: src/language/stats/oneway.q:392 src/language/stats/t-test.q:683
-#: src/language/stats/t-test.q:706 src/language/stats/t-test.q:830
-#: src/language/stats/t-test.q:1168 src/ui/gui/descriptives-dialog.c:40
+#: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694
+#: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849
+#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:40
 #: src/ui/gui/frequencies-dialog.c:41
 msgid "Mean"
 msgstr ""
@@ -3094,9 +3094,9 @@ msgid "Median"
 msgstr ""
 
 #: src/language/stats/examine.q:1616 src/language/stats/npar-summary.c:128
-#: src/language/stats/oneway.q:393 src/language/stats/t-test.q:684
-#: src/language/stats/t-test.q:707 src/language/stats/t-test.q:832
-#: src/language/stats/t-test.q:1169
+#: src/language/stats/oneway.q:393 src/language/stats/t-test.q:695
+#: src/language/stats/t-test.q:718 src/language/stats/t-test.q:851
+#: src/language/stats/t-test.q:1188
 msgid "Std. Deviation"
 msgstr ""
 
@@ -3330,7 +3330,7 @@ msgid ""
 "exactly %d values."
 msgstr ""
 
-#: src/language/stats/npar.q:425 src/language/stats/t-test.q:486
+#: src/language/stats/npar.q:425 src/language/stats/t-test.q:496
 #, c-format
 msgid ""
 "PAIRED was specified but the number of variables preceding WITH (%zu) did "
@@ -3376,7 +3376,7 @@ msgid "Mean Square"
 msgstr ""
 
 #: src/language/stats/oneway.q:281 src/language/stats/regression.q:313
-#: src/language/stats/t-test.q:979
+#: src/language/stats/t-test.q:998
 msgid "F"
 msgstr ""
 
@@ -3430,13 +3430,13 @@ msgid "Value of Contrast"
 msgstr ""
 
 #: src/language/stats/oneway.q:679 src/language/stats/regression.q:215
-#: src/language/stats/t-test.q:981 src/language/stats/t-test.q:1173
-#: src/language/stats/t-test.q:1266
+#: src/language/stats/t-test.q:1000 src/language/stats/t-test.q:1192
+#: src/language/stats/t-test.q:1285
 msgid "t"
 msgstr ""
 
-#: src/language/stats/oneway.q:681 src/language/stats/t-test.q:983
-#: src/language/stats/t-test.q:1175 src/language/stats/t-test.q:1268
+#: src/language/stats/oneway.q:681 src/language/stats/t-test.q:1002
+#: src/language/stats/t-test.q:1194 src/language/stats/t-test.q:1287
 msgid "Sig. (2-tailed)"
 msgstr ""
 
@@ -3589,111 +3589,111 @@ msgstr ""
 msgid "One or more VARIABLES must be specified."
 msgstr ""
 
-#: src/language/stats/t-test.q:380
+#: src/language/stats/t-test.q:381
 #, c-format
 msgid "Long string variable %s is not valid here."
 msgstr ""
 
-#: src/language/stats/t-test.q:400 src/language/stats/t-test.q:414
+#: src/language/stats/t-test.q:401 src/language/stats/t-test.q:415
 msgid ""
 "When applying GROUPS to a string variable, two values must be specified."
 msgstr ""
 
-#: src/language/stats/t-test.q:503
+#: src/language/stats/t-test.q:513
 msgid "At least two variables must be specified on PAIRS."
 msgstr ""
 
-#: src/language/stats/t-test.q:680
+#: src/language/stats/t-test.q:691
 msgid "One-Sample Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:685 src/language/stats/t-test.q:708
-#: src/language/stats/t-test.q:833
+#: src/language/stats/t-test.q:696 src/language/stats/t-test.q:719
+#: src/language/stats/t-test.q:852
 msgid "SE. Mean"
 msgstr ""
 
-#: src/language/stats/t-test.q:703
+#: src/language/stats/t-test.q:714
 msgid "Group Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:827
+#: src/language/stats/t-test.q:846
 msgid "Paired Sample Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:849 src/language/stats/t-test.q:1194
-#: src/language/stats/t-test.q:1385
+#: src/language/stats/t-test.q:868 src/language/stats/t-test.q:1213
+#: src/language/stats/t-test.q:1404
 #, c-format
 msgid "Pair %d"
 msgstr ""
 
-#: src/language/stats/t-test.q:967
+#: src/language/stats/t-test.q:986
 msgid "Independent Samples Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:975
+#: src/language/stats/t-test.q:994
 msgid "Levene's Test for Equality of Variances"
 msgstr ""
 
-#: src/language/stats/t-test.q:977
+#: src/language/stats/t-test.q:996
 msgid "t-test for Equality of Means"
 msgstr ""
 
-#: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1370
+#: src/language/stats/t-test.q:999 src/language/stats/t-test.q:1389
 msgid "Sig."
 msgstr ""
 
-#: src/language/stats/t-test.q:984 src/language/stats/t-test.q:1269
+#: src/language/stats/t-test.q:1003 src/language/stats/t-test.q:1288
 msgid "Mean Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:985
+#: src/language/stats/t-test.q:1004
 msgid "Std. Error Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:990 src/language/stats/t-test.q:1165
-#: src/language/stats/t-test.q:1261
+#: src/language/stats/t-test.q:1009 src/language/stats/t-test.q:1184
+#: src/language/stats/t-test.q:1280
 #, c-format
 msgid "%g%% Confidence Interval of the Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:1045
+#: src/language/stats/t-test.q:1064
 msgid "Equal variances assumed"
 msgstr ""
 
-#: src/language/stats/t-test.q:1097
+#: src/language/stats/t-test.q:1116
 msgid "Equal variances not assumed"
 msgstr ""
 
-#: src/language/stats/t-test.q:1155
+#: src/language/stats/t-test.q:1174
 msgid "Paired Samples Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:1158
+#: src/language/stats/t-test.q:1177
 msgid "Paired Differences"
 msgstr ""
 
-#: src/language/stats/t-test.q:1170
+#: src/language/stats/t-test.q:1189
 msgid "Std. Error Mean"
 msgstr ""
 
-#: src/language/stats/t-test.q:1250
+#: src/language/stats/t-test.q:1269
 msgid "One-Sample Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:1255
+#: src/language/stats/t-test.q:1274
 #, c-format
 msgid "Test Value = %f"
 msgstr ""
 
-#: src/language/stats/t-test.q:1365
+#: src/language/stats/t-test.q:1384
 msgid "Paired Samples Correlations"
 msgstr ""
 
-#: src/language/stats/t-test.q:1369
+#: src/language/stats/t-test.q:1388
 msgid "Correlation"
 msgstr ""
 
-#: src/language/stats/t-test.q:1388
+#: src/language/stats/t-test.q:1407
 #, c-format
 msgid "%s & %s"
 msgstr ""

diff --git a/po/en_GB.po b/po/en_GB.po
index 904fc572d5c0f145762e4d0316a307113b638674..2d66d5a7e032a7621ffb288b357dd9880c0fc6a7 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2007-12-14 08:07+0900\n"
+"POT-Creation-Date: 2007-12-19 08:29+0900\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -2569,8 +2569,8 @@ msgstr ""
 #: src/language/stats/binomial.c:227 src/language/stats/crosstabs.q:870
 #: src/language/stats/examine.q:988 src/language/stats/frequencies.q:1405
 #: src/language/stats/npar-summary.c:122 src/language/stats/oneway.q:391
-#: src/language/stats/t-test.q:682 src/language/stats/t-test.q:705
-#: src/language/stats/t-test.q:831 src/language/stats/t-test.q:1368
+#: src/language/stats/t-test.q:693 src/language/stats/t-test.q:716
+#: src/language/stats/t-test.q:850 src/language/stats/t-test.q:1387
 msgid "N"
 msgstr ""
 
@@ -2621,8 +2621,8 @@ msgstr ""
 
 #: src/language/stats/chisquare.c:312 src/language/stats/crosstabs.q:1154
 #: src/language/stats/oneway.q:279 src/language/stats/oneway.q:680
-#: src/language/stats/regression.q:311 src/language/stats/t-test.q:982
-#: src/language/stats/t-test.q:1174 src/language/stats/t-test.q:1267
+#: src/language/stats/regression.q:311 src/language/stats/t-test.q:1001
+#: src/language/stats/t-test.q:1193 src/language/stats/t-test.q:1286
 msgid "df"
 msgstr ""
 
@@ -2760,13 +2760,13 @@ msgstr ""
 msgid "95%% Confidence Interval"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1201 src/language/stats/t-test.q:986
-#: src/language/stats/t-test.q:1171 src/language/stats/t-test.q:1270
+#: src/language/stats/crosstabs.q:1201 src/language/stats/t-test.q:1005
+#: src/language/stats/t-test.q:1190 src/language/stats/t-test.q:1289
 msgid "Lower"
 msgstr ""
 
-#: src/language/stats/crosstabs.q:1202 src/language/stats/t-test.q:987
-#: src/language/stats/t-test.q:1172 src/language/stats/t-test.q:1271
+#: src/language/stats/crosstabs.q:1202 src/language/stats/t-test.q:1006
+#: src/language/stats/t-test.q:1191 src/language/stats/t-test.q:1290
 msgid "Upper"
 msgstr ""
 
@@ -2911,9 +2911,9 @@ msgstr ""
 
 #: src/language/stats/descriptives.c:102 src/language/stats/examine.q:1524
 #: src/language/stats/frequencies.q:123 src/language/stats/npar-summary.c:125
-#: src/language/stats/oneway.q:392 src/language/stats/t-test.q:683
-#: src/language/stats/t-test.q:706 src/language/stats/t-test.q:830
-#: src/language/stats/t-test.q:1168 src/ui/gui/descriptives-dialog.c:40
+#: src/language/stats/oneway.q:392 src/language/stats/t-test.q:694
+#: src/language/stats/t-test.q:717 src/language/stats/t-test.q:849
+#: src/language/stats/t-test.q:1187 src/ui/gui/descriptives-dialog.c:40
 #: src/ui/gui/frequencies-dialog.c:41
 msgid "Mean"
 msgstr ""
@@ -3085,9 +3085,9 @@ msgid "Median"
 msgstr ""
 
 #: src/language/stats/examine.q:1616 src/language/stats/npar-summary.c:128
-#: src/language/stats/oneway.q:393 src/language/stats/t-test.q:684
-#: src/language/stats/t-test.q:707 src/language/stats/t-test.q:832
-#: src/language/stats/t-test.q:1169
+#: src/language/stats/oneway.q:393 src/language/stats/t-test.q:695
+#: src/language/stats/t-test.q:718 src/language/stats/t-test.q:851
+#: src/language/stats/t-test.q:1188
 msgid "Std. Deviation"
 msgstr ""
 
@@ -3321,7 +3321,7 @@ msgid ""
 "exactly %d values."
 msgstr ""
 
-#: src/language/stats/npar.q:425 src/language/stats/t-test.q:486
+#: src/language/stats/npar.q:425 src/language/stats/t-test.q:496
 #, c-format
 msgid ""
 "PAIRED was specified but the number of variables preceding WITH (%zu) did "
@@ -3367,7 +3367,7 @@ msgid "Mean Square"
 msgstr ""
 
 #: src/language/stats/oneway.q:281 src/language/stats/regression.q:313
-#: src/language/stats/t-test.q:979
+#: src/language/stats/t-test.q:998
 msgid "F"
 msgstr ""
 
@@ -3421,13 +3421,13 @@ msgid "Value of Contrast"
 msgstr ""
 
 #: src/language/stats/oneway.q:679 src/language/stats/regression.q:215
-#: src/language/stats/t-test.q:981 src/language/stats/t-test.q:1173
-#: src/language/stats/t-test.q:1266
+#: src/language/stats/t-test.q:1000 src/language/stats/t-test.q:1192
+#: src/language/stats/t-test.q:1285
 msgid "t"
 msgstr ""
 
-#: src/language/stats/oneway.q:681 src/language/stats/t-test.q:983
-#: src/language/stats/t-test.q:1175 src/language/stats/t-test.q:1268
+#: src/language/stats/oneway.q:681 src/language/stats/t-test.q:1002
+#: src/language/stats/t-test.q:1194 src/language/stats/t-test.q:1287
 msgid "Sig. (2-tailed)"
 msgstr ""
 
@@ -3580,111 +3580,111 @@ msgstr ""
 msgid "One or more VARIABLES must be specified."
 msgstr ""
 
-#: src/language/stats/t-test.q:380
+#: src/language/stats/t-test.q:381
 #, c-format
 msgid "Long string variable %s is not valid here."
 msgstr ""
 
-#: src/language/stats/t-test.q:400 src/language/stats/t-test.q:414
+#: src/language/stats/t-test.q:401 src/language/stats/t-test.q:415
 msgid ""
 "When applying GROUPS to a string variable, two values must be specified."
 msgstr ""
 
-#: src/language/stats/t-test.q:503
+#: src/language/stats/t-test.q:513
 msgid "At least two variables must be specified on PAIRS."
 msgstr ""
 
-#: src/language/stats/t-test.q:680
+#: src/language/stats/t-test.q:691
 msgid "One-Sample Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:685 src/language/stats/t-test.q:708
-#: src/language/stats/t-test.q:833
+#: src/language/stats/t-test.q:696 src/language/stats/t-test.q:719
+#: src/language/stats/t-test.q:852
 msgid "SE. Mean"
 msgstr ""
 
-#: src/language/stats/t-test.q:703
+#: src/language/stats/t-test.q:714
 msgid "Group Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:827
+#: src/language/stats/t-test.q:846
 msgid "Paired Sample Statistics"
 msgstr ""
 
-#: src/language/stats/t-test.q:849 src/language/stats/t-test.q:1194
-#: src/language/stats/t-test.q:1385
+#: src/language/stats/t-test.q:868 src/language/stats/t-test.q:1213
+#: src/language/stats/t-test.q:1404
 #, c-format
 msgid "Pair %d"
 msgstr ""
 
-#: src/language/stats/t-test.q:967
+#: src/language/stats/t-test.q:986
 msgid "Independent Samples Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:975
+#: src/language/stats/t-test.q:994
 msgid "Levene's Test for Equality of Variances"
 msgstr ""
 
-#: src/language/stats/t-test.q:977
+#: src/language/stats/t-test.q:996
 msgid "t-test for Equality of Means"
 msgstr ""
 
-#: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1370
+#: src/language/stats/t-test.q:999 src/language/stats/t-test.q:1389
 msgid "Sig."
 msgstr ""
 
-#: src/language/stats/t-test.q:984 src/language/stats/t-test.q:1269
+#: src/language/stats/t-test.q:1003 src/language/stats/t-test.q:1288
 msgid "Mean Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:985
+#: src/language/stats/t-test.q:1004
 msgid "Std. Error Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:990 src/language/stats/t-test.q:1165
-#: src/language/stats/t-test.q:1261
+#: src/language/stats/t-test.q:1009 src/language/stats/t-test.q:1184
+#: src/language/stats/t-test.q:1280
 #, c-format
 msgid "%g%% Confidence Interval of the Difference"
 msgstr ""
 
-#: src/language/stats/t-test.q:1045
+#: src/language/stats/t-test.q:1064
 msgid "Equal variances assumed"
 msgstr ""
 
-#: src/language/stats/t-test.q:1097
+#: src/language/stats/t-test.q:1116
 msgid "Equal variances not assumed"
 msgstr ""
 
-#: src/language/stats/t-test.q:1155
+#: src/language/stats/t-test.q:1174
 msgid "Paired Samples Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:1158
+#: src/language/stats/t-test.q:1177
 msgid "Paired Differences"
 msgstr ""
 
-#: src/language/stats/t-test.q:1170
+#: src/language/stats/t-test.q:1189
 msgid "Std. Error Mean"
 msgstr ""
 
-#: src/language/stats/t-test.q:1250
+#: src/language/stats/t-test.q:1269
 msgid "One-Sample Test"
 msgstr ""
 
-#: src/language/stats/t-test.q:1255
+#: src/language/stats/t-test.q:1274
 #, c-format
 msgid "Test Value = %f"
 msgstr ""
 
-#: src/language/stats/t-test.q:1365
+#: src/language/stats/t-test.q:1384
 msgid "Paired Samples Correlations"
 msgstr ""
 
-#: src/language/stats/t-test.q:1369
+#: src/language/stats/t-test.q:1388
 msgid "Correlation"
 msgstr ""
 
-#: src/language/stats/t-test.q:1388
+#: src/language/stats/t-test.q:1407
 #, c-format
 msgid "%s & %s"
 msgstr ""

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index bc0240b5f8ad88cb7deb0feebb255bb47d35c572..5bb02e1767af92edd5267f4c2c9e42bbfcf9440a 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -362,7 +362,8 @@ cmd_t_test (struct lexer *lexer, struct dataset *ds)
 }
 
 static int
-tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *cmd UNUSED, void *aux UNUSED)
+tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *cmd UNUSED, 
+       void *aux UNUSED)
 {
   int n_group_values=0;
 
@@ -435,6 +436,15 @@ tts_custom_groups (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *c
     gp.criterion = CMP_LE ;
 
 
+  if ( var_is_alpha (indep_var))
+    {
+      buf_copy_rpad (gp.v.g_value [0].s, var_get_width (indep_var),
+                    gp.v.g_value [0].s, strlen (gp.v.g_value[0].s));
+
+      buf_copy_rpad (gp.v.g_value [1].s, var_get_width (indep_var),
+                    gp.v.g_value [1].s, strlen (gp.v.g_value[1].s));
+    }
+
   return 1;
 }
 
@@ -577,6 +587,7 @@ parse_value (struct lexer *lexer, union value * v, enum val_type type)
     {
       if (!lex_force_string (lexer))
        return 0;
+      memset  (v->s, ' ', MAX_SHORT_STRING);
       strncpy (v->s, ds_cstr (lex_tokstr (lexer)), ds_length (lex_tokstr (lexer)));
     }
 
@@ -716,21 +727,27 @@ ssbox_independent_samples_populate (struct ssbox *ssb,
 {
   int i;
 
-  const char *val_lab0;
-  const char *val_lab1;
+  char *val_lab[2] = {NULL, NULL};
   double indep_value[2];
 
   char prefix[2][3]={"",""};
 
   if ( var_is_numeric (indep_var) )
     {
-      val_lab0 = var_lookup_value_label (indep_var, &gp.v.g_value[0]);
-      val_lab1 = var_lookup_value_label (indep_var, &gp.v.g_value[1]);
+      const char *s;
+
+      s = var_lookup_value_label (indep_var, &gp.v.g_value[0]);
+      val_lab[0] = s ? strdup (s) : NULL;
+
+      s = var_lookup_value_label (indep_var, &gp.v.g_value[1]);
+      val_lab[1] = s ? strdup (s) : NULL;
     }
   else
     {
-      val_lab0 = gp.v.g_value[0].s;
-      val_lab1 = gp.v.g_value[1].s;
+      val_lab[0] = calloc (sizeof (char), MAX_SHORT_STRING + 1);
+      val_lab[1] = calloc (sizeof (char), MAX_SHORT_STRING + 1);
+      memcpy (val_lab[0], gp.v.g_value[0].s, MAX_SHORT_STRING);
+      memcpy (val_lab[1], gp.v.g_value[1].s, MAX_SHORT_STRING);
     }
 
   if (gp.criterion == CMP_LE )
@@ -757,17 +774,17 @@ ssbox_independent_samples_populate (struct ssbox *ssb,
       tab_text (ssb->t, 0, i*2+1, TAB_LEFT,
                 var_get_name (cmd->v_variables[i]));
 
-      if (val_lab0)
+      if (val_lab[0])
        tab_text (ssb->t, 1, i*2+1, TAB_LEFT | TAT_PRINTF,
-                 "%s%s", prefix[0], val_lab0);
+                 "%s%s", prefix[0], val_lab[0]);
       else
          tab_text (ssb->t, 1, i*2+1, TAB_LEFT | TAT_PRINTF,
                    "%s%g", prefix[0], indep_value[0]);
 
 
-      if (val_lab1)
+      if (val_lab[1])
        tab_text (ssb->t, 1, i*2+1+1, TAB_LEFT | TAT_PRINTF,
-                 "%s%s", prefix[1], val_lab1);
+                 "%s%s", prefix[1], val_lab[1]);
       else
          tab_text (ssb->t, 1, i*2+1+1, TAB_LEFT | TAT_PRINTF,
                    "%s%g", prefix[1], indep_value[1]);
@@ -807,6 +824,8 @@ ssbox_independent_samples_populate (struct ssbox *ssb,
          tab_float (ssb->t, 5 ,i*2+count+1, TAB_RIGHT, gs->se_mean, 8, 3);
        }
     }
+  free (val_lab[0]);
+  free (val_lab[1]);
 }
 
 

diff --git a/tests/automake.mk b/tests/automake.mk
index 712d76304318c2c6215c84b27359a257fd61c27e..be303c1f368c64857375d41c095555307d60216e 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -122,6 +122,7 @@ dist_TESTS = \
        tests/bugs/t-test.sh \
        tests/bugs/t-test-alpha.sh \
        tests/bugs/t-test-alpha2.sh \
+       tests/bugs/t-test-alpha3.sh \
        tests/bugs/temporary.sh \
        tests/bugs/unwritable-dir.sh \
        tests/bugs/val-labs.sh \

diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index f002d61f67a6f02cd6aa8c25464fc3e0fb9ebc37..663889138b573ca56660e759eaaaf5c9c1f62dbc 100755 (executable)
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -94,21 +94,21 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 |DEP2    |F8.0  |
 +--------+------+
 2.1 T-TEST.  Group Statistics
-#==========#=#====#==============#========#
-#     INDEP|N|Mean|Std. Deviation|SE. Mean#
-#==========#=#====#==============#========#
-#DEP1 a    |5|2.00|          .707|    .316#
-#     b    |5|4.00|          .707|    .316#
-#DEP2 a    |5|4.00|          .707|    .316#
-#     b    |5|2.00|          .707|    .316#
-#==========#=#====#==============#========#
+#=============#=#====#==============#========#
+#       INDEP |N|Mean|Std. Deviation|SE. Mean#
+#=============#=#====#==============#========#
+#DEP1 a       |5|2.00|          .707|    .316#
+#     b       |5|4.00|          .707|    .316#
+#DEP2 a       |5|4.00|          .707|    .316#
+#     b       |5|2.00|          .707|    .316#
+#=============#=#====#==============#========#
 2.2 T-TEST.  Independent Samples Test
 #===============================#==========#===============================================================================#
 #                               # Levene's |                          t-test for Equality of Means                         #
 #                               #----+-----+------+-----+---------------+---------------+---------------------+------------#
-#                               #    |     |      |     |               |               |                     |    95%     #
+#                               #    |     |      |     |               |               |                     |     95%    #
 #                               #    |     |      |     |               |               |                     +------+-----#
-#                               # F  | Sig.|   t  |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference| Lower|Upper#
+#                               #  F | Sig.|   t  |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference| Lower|Upper#
 #===============================#====#=====#======#=====#===============#===============#=====================#======#=====#
 #DEP1Equal variances assumed    #.000|1.000|-4.472|    8|           .002|         -2.000|                 .447|-3.031|-.969#
 #    Equal variances not assumed#    |     |-4.472|8.000|           .002|         -2.000|                 .447|-3.031|-.969#