/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2012 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
if (mrset->name == NULL)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "NAME", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "NAME");
goto error;
}
else if (mrset->n_vars == 0)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "VARIABLES", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "VARIABLES");
goto error;
}
/* Check that VALUE is specified and is valid for the VARIABLES. */
if (!has_value)
{
- msg (SE, _("Required %s specification missing from %s subcommand."),
- "VALUE", subcommand_name);
+ lex_spec_missing (lexer, subcommand_name, "VALUE");
goto error;
}
else if (var_is_alpha (mrset->vars[0]))
msg (SW, _("Variables %s and %s specified as part of "
"multiple dichotomy group %s (which has "
"CATEGORYLABELS=COUNTEDVALUES) have the same "
- "value label for the the group's counted "
+ "value label for the group's counted "
"value. These categories will not be "
"distinguishable in output."),
other_name, name, mrset->name);
if (width == c->width
&& value_equal (value, &c->value, width))
{
- if (!c->warned && strcasecmp (c->label, label))
+ if (!c->warned && utf8_strcasecmp (c->label, label))
{
char *s = data_out (value, var_get_encoding (var),
var_get_print_format (var));
if (mrset->width == 0)
ds_put_format (&details, "%.0f\n", mrset->counted.f);
else
- ds_put_format (&details, "`%.*s'\n", mrset->width,
- value_str (&mrset->counted, mrset->width));
+ {
+ const uint8_t *raw = value_str (&mrset->counted, mrset->width);
+ char *utf8 = recode_string ("UTF-8", dict_get_encoding (dict),
+ CHAR_CAST (const char *, raw),
+ mrset->width);
+ ds_put_format (&details, "`%s'\n", utf8);
+ free (utf8);
+ }
ds_put_format (&details, "%s: %s\n", _("Category label source"),
(mrset->cat_source == MRSET_VARLABELS
? _("Variable labels")