projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into gtk3.
[pspp]
/
src
/
output
/
tab.c
diff --git
a/src/output/tab.c
b/src/output/tab.c
index f5f1f1f84b6ba5ea4535213d23f84948e7a1fb43..5bde1b7c418c57d05bdbb78d42dae37ec32e09ef 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
@@
-38,7
+38,6
@@
#include "output/table-provider.h"
#include "output/text-item.h"
#include "output/table-provider.h"
#include "output/text-item.h"
-#include "gl/error.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
@@
-379,9
+378,9
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
}
#endif
}
#endif
- contents = data_out_
pool
(v, var_get_encoding (var),
- f != NULL ? f : var_get_print_format (var),
- 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;
@@
-419,7
+418,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;
@@
-461,7
+460,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;
}
@@
-767,6
+766,6
@@
static const struct table_class tab_table_class =
struct tab_table *
tab_cast (const struct table *table)
{
struct tab_table *
tab_cast (const struct table *table)
{
- assert (table->
c
lass == &tab_table_class);
+ assert (table->
k
lass == &tab_table_class);
return UP_CAST (table, struct tab_table, table);
}
return UP_CAST (table, struct tab_table, table);
}