/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 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
#include <ctype.h>
#include <stdlib.h>
-#include <data/attributes.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/sys-file-reader.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <data/vector.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <output/manager.h>
-#include <output/output.h>
-#include <output/table.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/sys-file-reader.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "data/vector.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
static int describe_variable (const struct variable *v, struct tab_table *t,
int r, int pc, int flags);
-/* Sets the widths of all the columns and heights of all the rows in
- table T for driver D. */
-static void
-sysfile_info_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED)
-{
- static const int max[] = {20, 5, 35, 3, 0};
- const int *p;
- int i;
-
- for (p = max; *p; p++)
- t->w[p - max] = MIN (tab_natural_width (t, d, p - max),
- *p * d->prop_em_width);
- for (i = 0; i < t->nr; i++)
- t->h[i] = tab_natural_height (t, d, i);
-}
-
/* SYSFILE INFO utility. */
int
cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
int r, i;
lex_match_id (lexer, "FILE");
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
h = fh_parse (lexer, FH_REF_FILE);
if (!h)
}
casereader_destroy (reader);
- t = tab_create (2, 11, 0);
+ t = tab_create (2, 11);
tab_vline (t, TAL_GAP, 1, 0, 8);
tab_text (t, 0, 0, TAB_LEFT, _("File:"));
tab_text (t, 1, 0, TAB_LEFT, fh_get_file_name (h));
tab_text (t, 1, 1, TAB_LEFT, label);
}
tab_text (t, 0, 2, TAB_LEFT, _("Created:"));
- tab_text (t, 1, 2, TAB_LEFT | TAT_PRINTF, "%s %s by %s",
- info.creation_date, info.creation_time, info.product);
+ tab_text_format (t, 1, 2, TAB_LEFT, "%s %s by %s",
+ info.creation_date, info.creation_time, info.product);
tab_text (t, 0, 3, TAB_LEFT, _("Integer Format:"));
tab_text (t, 1, 3, TAB_LEFT,
- info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian.")
- : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian.")
- : _("Unknown."));
+ info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian")
+ : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian")
+ : _("Unknown"));
tab_text (t, 0, 4, TAB_LEFT, _("Real Format:"));
tab_text (t, 1, 4, TAB_LEFT,
info.float_format == FLOAT_IEEE_DOUBLE_LE ? _("IEEE 754 LE.")
: info.float_format == FLOAT_VAX_D ? _("VAX D.")
: info.float_format == FLOAT_VAX_G ? _("VAX G.")
: info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.")
- : _("Unknown."));
+ : _("Unknown"));
tab_text (t, 0, 5, TAB_LEFT, _("Variables:"));
- tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%zu", dict_get_var_cnt (d));
+ tab_text_format (t, 1, 5, TAB_LEFT, "%zu", dict_get_var_cnt (d));
tab_text (t, 0, 6, TAB_LEFT, _("Cases:"));
- tab_text (t, 1, 6, TAB_LEFT | TAT_PRINTF,
- info.case_cnt == -1 ? _("Unknown") : "%ld",
- (long int) info.case_cnt);
+ if (info.case_cnt == -1)
+ tab_text (t, 1, 6, TAB_LEFT, _("Unknown"));
+ else
+ tab_text_format (t, 1, 6, TAB_LEFT, "%ld", (long int) info.case_cnt);
tab_text (t, 0, 7, TAB_LEFT, _("Type:"));
- tab_text (t, 1, 7, TAB_LEFT, _("System File."));
+ tab_text (t, 1, 7, TAB_LEFT, _("System File"));
tab_text (t, 0, 8, TAB_LEFT, _("Weight:"));
{
struct variable *weight_var = dict_get_weight (d);
? var_get_name (weight_var) : _("Not weighted.")));
}
tab_text (t, 0, 9, TAB_LEFT, _("Mode:"));
- tab_text (t, 1, 9, TAB_LEFT | TAT_PRINTF,
- _("Compression %s."), info.compressed ? _("on") : _("off"));
+ tab_text_format (t, 1, 9, TAB_LEFT,
+ _("Compression %s."), info.compressed ? _("on") : _("off"));
tab_text (t, 0, 10, TAB_LEFT, _("Charset:"));
- tab_text (t, 1, 10, TAB_LEFT | TAT_PRINTF,
- dict_get_encoding(d) ? dict_get_encoding(d) : _("Unknown"));
+ tab_text (t, 1, 10, TAB_LEFT,
+ dict_get_encoding(d) ? dict_get_encoding(d) : _("Unknown"));
- tab_dim (t, tab_natural_dimensions, NULL);
tab_submit (t);
- t = tab_create (4, 1 + 2 * dict_get_var_cnt (d), 1);
- tab_dim (t, sysfile_info_dim, NULL);
+ t = tab_create (4, 1 + 2 * dict_get_var_cnt (d));
tab_headers (t, 0, 0, 1, 0);
tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE, _("Description"));
tab_vline (t, TAL_1, 3, 0, r);
tab_resize (t, -1, r);
- tab_flags (t, SOMF_NO_TITLE);
tab_submit (t);
dict_destroy (d);
display_documents (dataset_dict (ds));
else if (lex_match_id (lexer, "FILE"))
{
- som_blank_line ();
if (!lex_force_match_id (lexer, "LABEL"))
return CMD_FAILURE;
if (dict_get_label (dataset_dict (ds)) == NULL)
break;
}
- lex_match (lexer, '/');
+ lex_match (lexer, T_SLASH);
lex_match_id (lexer, "VARIABLES");
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- if (lex_token (lexer) != '.')
+ if (lex_token (lexer) != T_ENDCMD)
{
if (!parse_variables_const (lexer, dataset_dict (ds), &vl, &n,
PV_NONE))
static void
display_macros (void)
{
- som_blank_line ();
tab_output_text (TAB_LEFT, _("Macros not supported."));
}
{
const char *documents = dict_get_documents (dict);
- som_blank_line ();
if (documents == NULL)
tab_output_text (TAB_LEFT, _("The active file dictionary does not "
"contain any documents."));
tab_output_text (TAB_LEFT | TAT_TITLE,
_("Documents in the active file:"));
- som_blank_line ();
for (i = 0; i < dict_get_document_line_cnt (dict); i++)
{
dict_get_document_line (dict, i, &line);
- tab_output_text (TAB_LEFT | TAB_FIX | TAT_NOWRAP, ds_cstr (&line));
+ tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (&line));
}
ds_destroy (&line);
}
}
-static int _flags;
-
-/* Sets the widths of all the columns and heights of all the rows in
- table T for driver D. */
-static void
-variables_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED)
-{
- int pc;
- int i;
-
- t->w[0] = tab_natural_width (t, d, 0);
- if (_flags & (DF_VALUE_LABELS | DF_VARIABLE_LABELS | DF_MISSING_VALUES
- | DF_AT_ATTRIBUTES | DF_ATTRIBUTES))
- {
- t->w[1] = MAX (tab_natural_width (t, d, 1), d->prop_em_width * 5);
- t->w[2] = MAX (tab_natural_width (t, d, 2), d->prop_em_width * 35);
- pc = 3;
- }
- else
- pc = 1;
- if (_flags & DF_DICT_INDEX)
- t->w[pc] = tab_natural_width (t, d, pc);
-
- for (i = 0; i < t->nr; i++)
- t->h[i] = tab_natural_height (t, d, i);
-}
-
static void
display_variables (const struct variable **vl, size_t n, int flags)
{
int r; /* Current row. */
size_t i;
- _flags = flags;
-
/* One column for the name,
two columns for general description,
one column for dictionary index. */
if (flags & DF_DICT_INDEX)
nc++;
- t = tab_create (nc, n + 5, 1);
+ t = tab_create (nc, n + 5);
tab_headers (t, 0, 0, 1, 0);
tab_hline (t, TAL_2, 0, nc - 1, 1);
tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
? _("Description") : _("Label")));
if (flags & DF_DICT_INDEX)
tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position"));
- tab_dim (t, variables_dim, NULL);
r = 1;
for (i = 0; i < n; i++)
tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, nc - 1, r - 1);
tab_vline (t, TAL_1, 1, 0, r - 1);
}
- else
- tab_flags (t, SOMF_NO_TITLE);
if (flags & ~DF_DICT_INDEX)
tab_vline (t, TAL_1, nc - 1, 0, r - 1);
tab_resize (t, -1, r);
- tab_columns (t, TAB_COL_DOWN, 1);
tab_submit (t);
}
\f
for (i = 0; i < n_values; i++)
{
if (n_values > 1)
- tab_text (t, c, r, TAB_LEFT | TAT_PRINTF, "%s[%d]",
- name, i + 1);
+ tab_text_format (t, c, r, TAB_LEFT, "%s[%d]", name, i + 1);
else
tab_text (t, c, r, TAB_LEFT, name);
tab_text (t, c + 1, r, TAB_LEFT, attribute_get_value (attr, i));
if (!n_attrs)
return;
- t = tab_create (2, n_attrs + 1, 0);
+ t = tab_create (2, n_attrs + 1);
tab_headers (t, 0, 0, 1, 0);
tab_box (t, TAL_1, TAL_1, -1, TAL_1, 0, 0, tab_nc (t) - 1, tab_nr (t) - 1);
tab_hline (t, TAL_2, 0, 1, 1);
tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Attribute"));
tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Value"));
display_attributes (t, set, flags, 0, 1);
- tab_columns (t, TAB_COL_DOWN, 1);
- tab_dim (t, tab_natural_dimensions, NULL);
tab_title (t, "Custom data file attributes.");
tab_submit (t);
}
/* Put the name, var label, and position into the first row. */
tab_text (t, 0, r, TAB_LEFT, var_get_name (v));
if (flags & DF_DICT_INDEX)
- tab_text (t, pc, r, TAT_PRINTF, "%zu", var_get_dict_index (v) + 1);
+ tab_text_format (t, pc, r, 0, "%zu", var_get_dict_index (v) + 1);
if (flags & DF_VARIABLE_LABELS && var_has_label (v))
{
if (fmt_equal (print, write))
{
char str[FMT_STRING_LEN_MAX + 1];
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Format: %s"), fmt_to_string (print, str));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Format: %s"), fmt_to_string (print, str));
r++;
}
else
{
char str[FMT_STRING_LEN_MAX + 1];
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Print Format: %s"), fmt_to_string (print, str));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Print Format: %s"),
+ fmt_to_string (print, str));
r++;
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Write Format: %s"), fmt_to_string (write, str));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Write Format: %s"),
+ fmt_to_string (write, str));
r++;
}
}
enum measure m = var_get_measure (v);
enum alignment a = var_get_alignment (v);
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Measure: %s"),
- m == MEASURE_NOMINAL ? _("Nominal")
- : m == MEASURE_ORDINAL ? _("Ordinal")
- : _("Scale"));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Measure: %s"),
+ m == MEASURE_NOMINAL ? _("Nominal")
+ : m == MEASURE_ORDINAL ? _("Ordinal")
+ : _("Scale"));
r++;
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Display Alignment: %s"),
- a == ALIGN_LEFT ? _("Left")
- : a == ALIGN_CENTRE ? _("Center")
- : _("Right"));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Display Alignment: %s"),
+ a == ALIGN_LEFT ? _("Left")
+ : a == ALIGN_CENTRE ? _("Center")
+ : _("Right"));
r++;
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF,
- _("Display Width: %d"), var_get_display_width (v));
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Display Width: %d"),
+ var_get_display_width (v));
r++;
}
if (sorted)
qsort (vl, nvec, sizeof *vl, compare_vector_ptrs_by_name);
- t = tab_create (4, nrow + 1, 0);
+ t = tab_create (4, nrow + 1);
tab_headers (t, 0, 0, 1, 0);
- tab_columns (t, TAB_COL_DOWN, 1);
- tab_dim (t, tab_natural_dimensions, NULL);
tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, nrow);
tab_box (t, -1, -1, -1, TAL_1, 0, 0, 3, nrow);
tab_hline (t, TAL_2, 0, 3, 1);
tab_text (t, 1, 0, TAT_TITLE | TAB_LEFT, _("Position"));
tab_text (t, 2, 0, TAT_TITLE | TAB_LEFT, _("Variable"));
tab_text (t, 3, 0, TAT_TITLE | TAB_LEFT, _("Print Format"));
- tab_flags (t, SOMF_NO_TITLE);
row = 1;
for (i = 0; i < nvec; i++)
char fmt_string[FMT_STRING_LEN_MAX + 1];
fmt_to_string (var_get_print_format (var), fmt_string);
- tab_text (t, 1, row, TAB_RIGHT | TAT_PRINTF, "%zu", j + 1);
+ tab_text_format (t, 1, row, TAB_RIGHT, "%zu", j + 1);
tab_text (t, 2, row, TAB_LEFT, var_get_name (var));
tab_text (t, 3, row, TAB_LEFT, fmt_string);
row++;
projects / pspp-builds.git / blobdiff