projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to latest Gnulib
[pspp]
/
src
/
language
/
tests
/
paper-size.c
diff --git
a/src/language/tests/paper-size.c
b/src/language/tests/paper-size.c
index d8c49a595c0250a30155080a5372c629a2da598f..5aea2c334f34f5157a7dbcd77d4fa0f4a478f6b7 100644
(file)
--- a/
src/language/tests/paper-size.c
+++ b/
src/language/tests/paper-size.c
@@
-21,19
+21,22
@@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
-#include <output/output.h>
+#include <libpspp/string-map.h>
+#include <output/measure.h>
/* Executes the DEBUG PAPER SIZE command. */
int
cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
{
/* Executes the DEBUG PAPER SIZE command. */
int
cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
{
+ const char *paper_size;
int h, v;
if (!lex_force_string (lexer))
return CMD_FAILURE;
int h, v;
if (!lex_force_string (lexer))
return CMD_FAILURE;
+ paper_size = ds_cstr (lex_tokstr (lexer));
- printf ("\"%s\" => ",
ds_cstr (lex_tokstr (lexer))
);
- if (
outp_get_paper_size (ds_cstr (lex_tokstr (lexer))
, &h, &v))
+ printf ("\"%s\" => ",
paper_size
);
+ if (
measure_paper (paper_size
, &h, &v))
printf ("%.1f x %.1f in, %.0f x %.0f mm\n",
h / 72000., v / 72000.,
h / (72000 / 25.4), v / (72000 / 25.4));
printf ("%.1f x %.1f in, %.0f x %.0f mm\n",
h / 72000., v / 72000.,
h / (72000 / 25.4), v / (72000 / 25.4));