X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsplit-file.c;h=02e7696b4b1f339d2543242b862cf0c59db0af51;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=5d2b42d758eed2d1e305d05046d59cf0aa290877;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index 5d2b42d7..02e7696b 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2011 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 @@ -18,23 +18,22 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/data-out.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/procedure.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "output/tab.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -77,8 +76,7 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c) if (split_cnt == 0) return; - t = tab_create (3, split_cnt + 1, 0); - tab_dim (t, tab_natural_dimensions, NULL); + t = tab_create (3, split_cnt + 1); tab_vline (t, TAL_GAP, 1, 0, split_cnt); tab_vline (t, TAL_GAP, 2, 0, split_cnt); tab_text (t, 0, 0, TAB_NONE, _("Variable")); @@ -95,6 +93,7 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c) tab_text_format (t, 0, i + 1, TAB_LEFT, "%s", var_get_name (v)); s = data_out (case_data (c, v), dict_get_encoding (dict), print); + tab_text_format (t, 1, i + 1, 0, "%.*s", print->w, s); free (s); @@ -103,6 +102,5 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c) if (val_lab) tab_text (t, 2, i + 1, TAB_LEFT, val_lab); } - tab_flags (t, SOMF_NO_TITLE); tab_submit (t); }