projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bc1026
)
tests pass (except render)
author
Ben Pfaff
<blp@cs.stanford.edu>
Wed, 30 Dec 2020 04:09:46 +0000
(20:09 -0800)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Thu, 31 Dec 2020 03:58:11 +0000
(19:58 -0800)
src/output/csv.c
patch
|
blob
|
history
src/output/pivot-output.c
patch
|
blob
|
history
tests/automake.mk
patch
|
blob
|
history
tests/language/stats/correlations.at
patch
|
blob
|
history
tests/language/stats/examine.at
patch
|
blob
|
history
tests/output/render.at
patch
|
blob
|
history
tests/perl-module.at
patch
|
blob
|
history
diff --git
a/src/output/csv.c
b/src/output/csv.c
index e6edfc6bfce74401a209a50a3c8b2d96bbecb5cb..e4b1000769e32c158afd0aabd99ae90403f3e545 100644
(file)
--- a/
src/output/csv.c
+++ b/
src/output/csv.c
@@
-216,9
+216,6
@@
csv_output_table_cell (struct csv_driver *csv, const struct table_cell *cell,
}
csv_output_field (csv, ds_cstr (&s));
ds_destroy (&s);
}
csv_output_field (csv, ds_cstr (&s));
ds_destroy (&s);
-
- if (leader)
- putc ('\n', csv->file);
}
}
}
}
@@
-226,6
+223,9
@@
static void
csv_output_table__ (struct csv_driver *csv, const struct table *t,
const char *leader)
{
csv_output_table__ (struct csv_driver *csv, const struct table *t,
const char *leader)
{
+ if (!t)
+ return;
+
for (int y = 0; y < t->n[TABLE_VERT]; y++)
{
for (int x = 0; x < t->n[TABLE_HORZ]; x++)
for (int y = 0; y < t->n[TABLE_VERT]; y++)
{
for (int x = 0; x < t->n[TABLE_HORZ]; x++)
diff --git
a/src/output/pivot-output.c
b/src/output/pivot-output.c
index 8c1aacc0a7ce8867871989516e0d01706f45db4c..a1fba1a3baf5ef5211cb5ebd7e5630ba244ba9be 100644
(file)
--- a/
src/output/pivot-output.c
+++ b/
src/output/pivot-output.c
@@
-583,7
+583,7
@@
pivot_output (const struct pivot_table *pt,
struct pivot_value *value = pivot_value_new_user_text_nocopy (
ds_steal_cstr (&s));
struct pivot_value *value = pivot_value_new_user_text_nocopy (
ds_steal_cstr (&s));
- fill_cell (
layer
s, 0, i, 0, i,
+ fill_cell (
footnote
s, 0, i, 0, i,
&pt->look->areas[PIVOT_AREA_FOOTER], PIVOT_AREA_FOOTER,
value, pt->show_values, pt->show_variables, false);
}
&pt->look->areas[PIVOT_AREA_FOOTER], PIVOT_AREA_FOOTER,
value, pt->show_values, pt->show_variables, false);
}
diff --git
a/tests/automake.mk
b/tests/automake.mk
index cb70fd3e8ec2f5ad645fde7b7a04dbb3e461a942..e15a8da66349a25b8a5a6cb9ccf20e41ad7fe825 100644
(file)
--- a/
tests/automake.mk
+++ b/
tests/automake.mk
@@
-236,13
+236,7
@@
tests_math_chart_get_ticks_format_test_LDADD = \
src/libpspp-core.la \
gl/libgl.la
src/libpspp-core.la \
gl/libgl.la
-check_PROGRAMS += tests/output/render-test
-tests_output_render_test_SOURCES = tests/output/render-test.c
-tests_output_render_test_LDADD = \
- src/libpspp.la \
- src/libpspp-core.la \
- $(CAIRO_LIBS)
-
+EXTRA_DIST += tests/output/render-test.c
check_PROGRAMS += tests/ui/syntax-gen-test
tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c
tests_ui_syntax_gen_test_LDADD = \
check_PROGRAMS += tests/ui/syntax-gen-test
tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c
tests_ui_syntax_gen_test_LDADD = \
diff --git
a/tests/language/stats/correlations.at
b/tests/language/stats/correlations.at
index 1662ee7499673dd8e41cee50f081470859932ded..9a24da63f2287ce6847a9f83599e40d0e605aab1 100644
(file)
--- a/
tests/language/stats/correlations.at
+++ b/
tests/language/stats/correlations.at
@@
-61,9
+61,7
@@
wiz,Pearson Correlation,.890[a],.519,1.000,-.344
,Sig. (2-tailed),.017,.291,,.505
bang,Pearson Correlation,-.308,.118,-.344,1.000
,Sig. (2-tailed),.553,.824,.505,
,Sig. (2-tailed),.017,.291,,.505
bang,Pearson Correlation,-.308,.118,-.344,1.000
,Sig. (2-tailed),.553,.824,.505,
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
Table: Correlations
,,bar,wiz
Table: Correlations
,,bar,wiz
@@
-86,9
+84,7
@@
wiz,Pearson Correlation,.883[a],.497,1.000,-.337
bang,Pearson Correlation,-.308,.164,-.337,1.000
,Sig. (2-tailed),.553,.725,.460,
,N,6,7,7,7
bang,Pearson Correlation,-.308,.164,-.337,1.000
,Sig. (2-tailed),.553,.725,.460,
,N,6,7,7,7
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
]])
AT_CLEANUP
]])
AT_CLEANUP
@@
-357,9
+353,7
@@
var2,Pearson Correlation,.3792[a],-.0407
var3,Pearson Correlation,.3699[a],-.0543
,Sig. (2-tailed),.000,.603
,N,95,94
var3,Pearson Correlation,.3699[a],-.0543
,Sig. (2-tailed),.000,.603
,N,95,94
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
Table: Correlations
,,var1,var2
Table: Correlations
,,var1,var2
@@
-372,9
+366,7
@@
var4,Pearson Correlation,.5693[a],.3792[a]
var5,Pearson Correlation,-.0519,-.0407
,Sig. (2-tailed),.623,.698
,N,92,93
var5,Pearson Correlation,-.0519,-.0407
,Sig. (2-tailed),.623,.698
,N,92,93
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
]])
AT_CLEANUP
]])
AT_CLEANUP
diff --git
a/tests/language/stats/examine.at
b/tests/language/stats/examine.at
index f22a4f5ce4d59c27df83446653397d9a018c98b7..6c76b62d6da04079236f72dfa6fd3590db48a9b4 100644
(file)
--- a/
tests/language/stats/examine.at
+++ b/
tests/language/stats/examine.at
@@
-860,9
+860,7
@@
x,.,4,100.0%,0,.0%,4,100.0%
,2,9,100.0%,0,.0%,9,100.0%
,9[a],4,100.0%,0,.0%,4,100.0%
,99[a],5,100.0%,0,.0%,5,100.0%
,2,9,100.0%,0,.0%,9,100.0%
,9[a],4,100.0%,0,.0%,4,100.0%
,99[a],5,100.0%,0,.0%,5,100.0%
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
Table: Extreme Values
,g,,,Case Number,Value
Table: Extreme Values
,g,,,Case Number,Value
@@
-916,9
+914,7
@@
x,.,Highest,1,31,4004
,,,3,25,701
,,,4,26,801
,,,5,27,901
,,,3,25,701
,,,4,26,801
,,,5,27,901
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
]])
AT_CLEANUP
]])
AT_CLEANUP
diff --git
a/tests/output/render.at
b/tests/output/render.at
index 8172e33571826748d493f3cf2ea7e9819fbceec2..0c461eb3fbee93fd70f23b22860467dfb4fc397d 100644
(file)
--- a/
tests/output/render.at
+++ b/
tests/output/render.at
@@
-262,13
+262,11
@@
f[b]"
h
i[c][d][e]",j,
,klm,
h
i[c][d][e]",j,
,klm,
-
-Footnotes:
-a,Approximation.
-b,This is a very long footnote that will have to wrap from one line to the next. Let's see if the rendering engine does it acceptably.
-c,One
-d,Two
-e,Three
+Footnote: a. Approximation.
+Footnote: b. This is a very long footnote that will have to wrap from one line to the next. Let's see if the rendering engine does it acceptably.
+Footnote: c. One
+Footnote: d. Two
+Footnote: e. Three
]])
AT_CLEANUP
]])
AT_CLEANUP
diff --git
a/tests/perl-module.at
b/tests/perl-module.at
index 58b3900cdfe1d04d4b4b57860bbf8445b2737c6e..5466dbc8b68cdb39e72eee19ec735b2c5054fc39 100644
(file)
--- a/
tests/perl-module.at
+++ b/
tests/perl-module.at
@@
-479,9
+479,7
@@
A Short String Variable,1111,ones
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
Table: Variable and Dataset Attributes
Variable and Name,,Value
Table: Variable and Dataset Attributes
Variable and Name,,Value
@@
-516,9
+514,7
@@
A Short String Variable,1111,ones
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
Table: Variable and Dataset Attributes
Variable and Name,,Value
Table: Variable and Dataset Attributes
Variable and Name,,Value