projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate quoting style in printed strings.
[pspp]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index c981bb1dcc2300f1053f741bc5dd9b93a7c8569e..d3d0972543a87f2b8f82e6eaf0eb634dd2a87b3c 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-38,8
+38,8
@@
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
-#include <output/
manager
.h>
-#include <output/tab
le
.h>
+#include <output/
text-item
.h>
+#include <output/tab.h>
#include "xalloc.h"
#include "xalloc.h"
@@
-396,8
+396,7
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
int row;
spec_cnt = ll_count (&trns->specs);
int row;
spec_cnt = ll_count (&trns->specs);
- t = tab_create (4, spec_cnt + 1, 0);
- tab_columns (t, TAB_COL_DOWN, 1);
+ t = tab_create (4, spec_cnt + 1);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
@@
-405,7
+404,6
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
- tab_dim (t, tab_natural_dimensions, NULL);
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
@@
-414,8
+412,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
switch (spec->type)
{
case PRT_LITERAL:
switch (spec->type)
{
case PRT_LITERAL:
- tab_text (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*s\"",
- (int) ds_length (&spec->string), ds_data (&spec->string));
+ tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "`%.*s'",
+ (int) ds_length (&spec->string),
+ ds_data (&spec->string));
width = ds_length (&spec->string);
break;
case PRT_VAR:
width = ds_length (&spec->string);
break;
case PRT_VAR:
@@
-427,19
+426,19
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
default:
NOT_REACHED ();
}
default:
NOT_REACHED ();
}
- tab_text
(t, 1, row, TAT_PRINTF
, "%d", spec->record);
- tab_text
(t, 2, row, TAT_PRINTF
, "%3d-%3d",
- spec->first_column, spec->first_column + width - 1);
+ tab_text
_format (t, 1, row, 0
, "%d", spec->record);
+ tab_text
_format (t, 2, row, 0
, "%3d-%3d",
+
spec->first_column, spec->first_column + width - 1);
row++;
}
if (fh != NULL)
row++;
}
if (fh != NULL)
- tab_title (t, ngettext ("Writing %
d
record to %s.",
- "Writing %
d
records to %s.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record to %s.",
+ "Writing %
zu
records to %s.", trns->record_cnt),
trns->record_cnt, fh_get_name (fh));
else
trns->record_cnt, fh_get_name (fh));
else
- tab_title (t, ngettext ("Writing %
d
record.",
- "Writing %
d
records.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record.",
+ "Writing %
zu
records.", trns->record_cnt),
trns->record_cnt);
tab_submit (t);
}
trns->record_cnt);
tab_submit (t);
}
@@
-515,14
+514,14
@@
flush_records (struct print_trns *trns, int target_record,
{
*eject = false;
if (trns->writer == NULL)
{
*eject = false;
if (trns->writer == NULL)
-
som_eject_page (
);
+
text_item_submit (text_item_create (TEXT_ITEM_EJECT_PAGE, "")
);
else
leader = '1';
}
line[0] = legacy_from_native (trns->encoding, leader);
if (trns->writer == NULL)
else
leader = '1';
}
line[0] = legacy_from_native (trns->encoding, leader);
if (trns->writer == NULL)
- tab_output_text (TAB_FIX
| TAT_NOWRAP
, &line[1]);
+ tab_output_text (TAB_FIX, &line[1]);
else
{
if (!trns->include_prefix)
else
{
if (!trns->include_prefix)