projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Always use helper functions to access struct tab_table members.
[pspp-builds.git]
/
src
/
output
/
html.c
diff --git
a/src/output/html.c
b/src/output/html.c
index 3a8be8eb0b0e2cbf8db200b73bf5099244f5c2c3..dfa524a7cfd5f60cd6120023283d1106c635c35a 100644
(file)
--- a/
src/output/html.c
+++ b/
src/output/html.c
@@
-293,7
+293,7
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
{
struct html_driver_ext *x = this->ext;
{
struct html_driver_ext *x = this->ext;
- if (t
->nr == 1 && t->nc
== 1)
+ if (t
ab_nr (t) == 1 && tab_nc (t)
== 1)
{
fputs ("<P>", x->file);
html_put_cell_contents (this, t->ct[0], *t->cc);
{
fputs ("<P>", x->file);
html_put_cell_contents (this, t->ct[0], *t->cc);
@@
-315,18
+315,18
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
int r;
unsigned char *ct = t->ct;
int r;
unsigned char *ct = t->ct;
- for (r = 0; r < t
->nr
; r++)
+ for (r = 0; r < t
ab_nr (t)
; r++)
{
int c;
fputs (" <TR>\n", x->file);
{
int c;
fputs (" <TR>\n", x->file);
- for (c = 0; c < t
->nc
; c++, ct++)
+ for (c = 0; c < t
ab_nc (t)
; c++, ct++)
{
struct substring *cc;
const char *tag;
struct tab_joined_cell *j = NULL;
{
struct substring *cc;
const char *tag;
struct tab_joined_cell *j = NULL;
- cc = t->cc + c + r * t
->nc
;
+ cc = t->cc + c + r * t
ab_nc (t)
;
if (*ct & TAB_JOIN)
{
j = (struct tab_joined_cell *) ss_data (*cc);
if (*ct & TAB_JOIN)
{
j = (struct tab_joined_cell *) ss_data (*cc);
@@
-336,8
+336,8
@@
output_tab_table (struct outp_driver *this, struct tab_table *t)
}
/* Output <TD> or <TH> tag. */
}
/* Output <TD> or <TH> tag. */
- tag = (r < t
->t || r >= t->nr - t->b
- || c < t
->l || c >= t->nc - t->r
) ? "TH" : "TD";
+ tag = (r < t
ab_t (t) || r >= tab_nr (t) - tab_b (t)
+ || c < t
ab_l (t) || c >= tab_nc (t) - tab_r (t)
) ? "TH" : "TD";
fprintf (x->file, " <%s ALIGN=%s",
tag,
(*ct & TAB_ALIGN_MASK) == TAB_LEFT ? "LEFT"
fprintf (x->file, " <%s ALIGN=%s",
tag,
(*ct & TAB_ALIGN_MASK) == TAB_LEFT ? "LEFT"