projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reform string library.
[pspp-builds.git]
/
src
/
output
/
html.c
diff --git
a/src/output/html.c
b/src/output/html.c
index d5b4f5d4fb8d2443fde655cf3a6334144d3e0deb..951208717f8ec7a47bc964f15262511f7c45294b 100644
(file)
--- a/
src/output/html.c
+++ b/
src/output/html.c
@@
-50,7
+50,7
@@
static void print_title_tag (FILE *file, const char *name,
const char *content);
static bool
const char *content);
static bool
-html_open_driver (struct outp_driver *this,
const struct string *
options)
+html_open_driver (struct outp_driver *this,
struct substring
options)
{
struct html_driver_ext *x;
{
struct html_driver_ext *x;
@@
-165,7
+165,7
@@
handle_option (struct outp_driver *this,
break;
case string_arg:
free (x->file_name);
break;
case string_arg:
free (x->file_name);
- x->file_name =
xstrdup (ds_c_str (val)
);
+ x->file_name =
ds_xstrdup (val
);
break;
default:
abort ();
break;
default:
abort ();
@@
-233,7
+233,7
@@
escape_string (FILE *file,
TEXT. */
void
html_put_cell_contents (struct outp_driver *this,
TEXT. */
void
html_put_cell_contents (struct outp_driver *this,
- unsigned int opts,
struct fixed_string *
text)
+ unsigned int opts,
const struct substring
text)
{
struct html_driver_ext *x = this->ext;
{
struct html_driver_ext *x = this->ext;
@@
-244,15
+244,15
@@
html_put_cell_contents (struct outp_driver *this,
if (opts & TAB_FIX)
{
fputs ("<TT>", x->file);
if (opts & TAB_FIX)
{
fputs ("<TT>", x->file);
- escape_string (x->file,
ls_c_str (text), l
s_length (text), " ");
+ escape_string (x->file,
ss_data (text), s
s_length (text), " ");
fputs ("</TT>", x->file);
}
else
{
fputs ("</TT>", x->file);
}
else
{
- size_t initial_spaces = s
trspn (ls_c_str (text), " \t"
);
+ size_t initial_spaces = s
s_span (text, ss_cstr (CC_SPACES)
);
escape_string (x->file,
escape_string (x->file,
-
ls_c_str
(text) + initial_spaces,
-
l
s_length (text) - initial_spaces,
+
ss_data
(text) + initial_spaces,
+
s
s_length (text) - initial_spaces,
" ");
}
if (opts & TAB_EMPH)
" ");
}
if (opts & TAB_EMPH)
@@
-269,7
+269,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
if (t->nr == 1 && t->nc == 1)
{
fputs ("<P>", x->file);
if (t->nr == 1 && t->nc == 1)
{
fputs ("<P>", x->file);
- html_put_cell_contents (this, t->ct[0], t->cc);
+ html_put_cell_contents (this, t->ct[0],
*
t->cc);
fputs ("</P>\n", x->file);
return;
fputs ("</P>\n", x->file);
return;
@@
-277,11
+277,10
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
fputs ("<TABLE BORDER=1>\n", x->file);
fputs ("<TABLE BORDER=1>\n", x->file);
- if (
!ls_empty_p (&t->title)
)
+ if (
t->title != NULL
)
{
fprintf (x->file, " <CAPTION>");
{
fprintf (x->file, " <CAPTION>");
- escape_string (x->file, ls_c_str (&t->title), ls_length (&t->title),
- " ");
+ escape_string (x->file, t->title, strlen (t->title), " ");
fputs ("</CAPTION>\n", x->file);
}
fputs ("</CAPTION>\n", x->file);
}
@@
-296,14
+295,14
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
fputs (" <TR>\n", x->file);
for (c = 0; c < t->nc; c++, ct++)
{
fputs (" <TR>\n", x->file);
for (c = 0; c < t->nc; c++, ct++)
{
- struct
fixed_
string *cc;
+ struct
sub
string *cc;
const char *tag;
struct tab_joined_cell *j = NULL;
cc = t->cc + c + r * t->nc;
if (*ct & TAB_JOIN)
{
const char *tag;
struct tab_joined_cell *j = NULL;
cc = t->cc + c + r * t->nc;
if (*ct & TAB_JOIN)
{
- j = (struct tab_joined_cell *)
ls_c_str (
cc);
+ j = (struct tab_joined_cell *)
ss_data (*
cc);
cc = &j->contents;
if (j->x1 != c || j->y1 != r)
continue;
cc = &j->contents;
if (j->x1 != c || j->y1 != r)
continue;
@@
-327,7
+326,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
putc ('>', x->file);
/* Output cell contents. */
putc ('>', x->file);
/* Output cell contents. */
- html_put_cell_contents (this, *ct, cc);
+ html_put_cell_contents (this, *ct,
*
cc);
/* Output </TH> or </TD>. */
fprintf (x->file, "</%s>\n", tag);
/* Output </TH> or </TD>. */
fprintf (x->file, "</%s>\n", tag);