version 1.55, 2017/06/27 18:25:02 |
version 1.57, 2017/07/31 16:14:10 |
Line 51 static void tbl_word(struct termp *, const struct tbl_ |
|
Line 51 static void tbl_word(struct termp *, const struct tbl_ |
|
static size_t |
static size_t |
term_tbl_sulen(const struct roffsu *su, void *arg) |
term_tbl_sulen(const struct roffsu *su, void *arg) |
{ |
{ |
return term_hen((const struct termp *)arg, su); |
int i; |
|
|
|
i = term_hen((const struct termp *)arg, su); |
|
return i > 0 ? i : 0; |
} |
} |
|
|
static size_t |
static size_t |
Line 170 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 173 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
if (dp == NULL) |
if (dp == NULL) |
continue; |
continue; |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (ic || sp->layout->first->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
|
|
/* Set up a column for a right vertical frame. */ |
/* Set up a column for a right vertical frame. */ |
Line 204 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 208 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
if (dp == NULL) |
if (dp == NULL) |
continue; |
continue; |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (cp->pos != TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
break; |
break; |
} |
} |
Line 304 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 309 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
if (dp != NULL) { |
if (dp != NULL) { |
spans = dp->spans; |
spans = dp->spans; |
dp = dp->next; |
if (ic || sp->layout->first->pos |
|
!= TBL_CELL_SPAN) |
|
dp = dp->next; |
} |
} |
|
|
/* |
/* |
Line 514 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 521 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
break; |
break; |
} |
} |
|
|
if (dp == NULL) { |
if (dp == NULL) |
tbl_char(tp, ASCII_NBRSP, col->width); |
|
return; |
return; |
} |
|
|
|
switch (dp->pos) { |
switch (dp->pos) { |
case TBL_DATA_NONE: |
case TBL_DATA_NONE: |
tbl_char(tp, ASCII_NBRSP, col->width); |
|
return; |
return; |
case TBL_DATA_HORIZ: |
case TBL_DATA_HORIZ: |
case TBL_DATA_NHORIZ: |
case TBL_DATA_NHORIZ: |
Line 546 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
Line 550 tbl_data(struct termp *tp, const struct tbl_opts *opts |
|
tbl_number(tp, opts, dp, col); |
tbl_number(tp, opts, dp, col); |
break; |
break; |
case TBL_CELL_DOWN: |
case TBL_CELL_DOWN: |
tbl_char(tp, ASCII_NBRSP, col->width); |
case TBL_CELL_SPAN: |
break; |
break; |
default: |
default: |
abort(); |
abort(); |