projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[pspp]
/
src
/
output
/
tab.c
diff --git
a/src/output/tab.c
b/src/output/tab.c
index 7ce860f14e09c1e357eb11bafce1d3dba1d766b9..bc4ac534d0a30bb8d9ece455c79d1c5f414a063c 100644
(file)
--- a/
src/output/tab.c
+++ b/
src/output/tab.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011
, 2013
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-24,10
+24,10
@@
#include <stdlib.h>
#include "data/data-out.h"
#include <stdlib.h>
#include "data/data-out.h"
-#include "data/dictionary.h"
#include "data/format.h"
#include "data/settings.h"
#include "data/value.h"
#include "data/format.h"
#include "data/settings.h"
#include "data/value.h"
+#include "data/variable.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
#include "libpspp/i18n.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
#include "libpspp/i18n.h"
@@
-360,7
+360,7
@@
tab_box (struct tab_table *t, int f_h, int f_v, int i_h, int i_v,
from V, displayed with format spec F. */
void
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
from V, displayed with format spec F. */
void
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
- const union value *v, const struct
dictionary *dict,
+ const union value *v, const struct
variable *var,
const struct fmt_spec *f)
{
char *contents;
const struct fmt_spec *f)
{
char *contents;
@@
-379,7
+379,9
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
}
#endif
}
#endif
- contents = data_out_pool (v, dict_get_encoding (dict), f, table->container);
+ contents = data_out_stretchy (v, var_get_encoding (var),
+ f != NULL ? f : var_get_print_format (var),
+ table->container);
table->cc[c + r * table->cf] = contents;
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = contents;
table->ct[c + r * table->cf] = opt;
@@
-417,7
+419,7
@@
tab_fixed (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_
pool
(&double_value, C_ENCODING, &f, table->container);
+ s = data_out_
stretchy
(&double_value, C_ENCODING, &f, table->container);
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
@@
-459,7
+461,7
@@
tab_double (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_
pool
(&double_value, C_ENCODING, fmt, table->container);
+ s = data_out_
stretchy
(&double_value, C_ENCODING, fmt, table->container);
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
}
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
}