version 1.75, 2021/08/10 12:55:04 |
version 1.78, 2022/04/26 14:52:05 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
|
* Copyright (c) 2011-2022 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2021 Ingo Schwarze <schwarze@openbsd.org> |
|
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#if DEBUG_MEMORY |
|
#include "mandoc_dbg.h" |
|
#endif |
#include "mandoc.h" |
#include "mandoc.h" |
#include "tbl.h" |
#include "tbl.h" |
#include "out.h" |
#include "out.h" |
Line 290 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
Line 293 term_tbl(struct termp *tp, const struct tbl_span *sp) |
|
} |
} |
tp->tcol++; |
tp->tcol++; |
tp->col = 0; |
tp->col = 0; |
|
tp->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); |
tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); |
tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic); |
if (dp != NULL && |
if (dp != NULL && |
(ic || sp->layout->first->pos != TBL_CELL_SPAN)) { |
(ic || sp->layout->first->pos != TBL_CELL_SPAN)) { |
Line 820 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
Line 824 tbl_literal(struct termp *tp, const struct tbl_dat *dp |
|
width = col->width; |
width = col->width; |
ic = dp->layout->col; |
ic = dp->layout->col; |
hspans = dp->hspans; |
hspans = dp->hspans; |
while (hspans--) |
while (hspans--) { |
width += tp->tbl.cols[++ic].width + 3; |
width += tp->tbl.cols[ic].spacing; |
|
ic++; |
|
width += tp->tbl.cols[ic].width; |
|
} |
|
|
padr = width > len ? width - len : 0; |
padr = width > len ? width - len : 0; |
padl = 0; |
padl = 0; |