version 1.60, 2015/09/26 00:54:04 |
version 1.63, 2017/05/01 20:54:59 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2014, 2015, 2017 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 |
Line 51 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 51 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
dst->unit = def == SCALE_MAX ? SCALE_BU : def; |
dst->unit = def == SCALE_MAX ? SCALE_BU : def; |
dst->scale = strtod(src, &endptr); |
dst->scale = strtod(src, &endptr); |
if (endptr == src) |
if (endptr == src) |
return(0); |
return 0; |
|
|
switch (*endptr++) { |
switch (*endptr++) { |
case 'c': |
case 'c': |
Line 89 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
Line 89 a2roffsu(const char *src, struct roffsu *dst, enum rof |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
if (SCALE_MAX == def) |
if (SCALE_MAX == def) |
return(0); |
return 0; |
dst->unit = def; |
dst->unit = def; |
break; |
break; |
} |
} |
|
|
return(*endptr == '\0' ? 2 : 1); |
return *endptr == '\0' ? 2 : 1; |
} |
} |
|
|
/* |
/* |
Line 197 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
Line 197 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp |
|
*/ |
*/ |
|
|
if (nxcol && totalwidth) { |
if (nxcol && totalwidth) { |
xwidth = totalwidth - xwidth - 3*maxcol - |
xwidth += 3*maxcol + |
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? |
(opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ? |
2 : !!opts->lvert + !!opts->rvert); |
2 : !!opts->lvert + !!opts->rvert); |
|
if (xwidth >= totalwidth) |
|
return; |
|
xwidth = totalwidth - xwidth; |
|
|
/* |
/* |
* Emulate a bug in GNU tbl width calculation that |
* Emulate a bug in GNU tbl width calculation that |
Line 240 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
Line 243 tblcalc_data(struct rofftbl *tbl, struct roffcol *col, |
|
|
|
switch (dp->layout->pos) { |
switch (dp->layout->pos) { |
case TBL_CELL_HORIZ: |
case TBL_CELL_HORIZ: |
/* FALLTHROUGH */ |
|
case TBL_CELL_DHORIZ: |
case TBL_CELL_DHORIZ: |
sz = (*tbl->len)(1, tbl->arg); |
sz = (*tbl->len)(1, tbl->arg); |
if (col->width < sz) |
if (col->width < sz) |
col->width = sz; |
col->width = sz; |
break; |
break; |
case TBL_CELL_LONG: |
case TBL_CELL_LONG: |
/* FALLTHROUGH */ |
|
case TBL_CELL_CENTRE: |
case TBL_CELL_CENTRE: |
/* FALLTHROUGH */ |
|
case TBL_CELL_LEFT: |
case TBL_CELL_LEFT: |
/* FALLTHROUGH */ |
|
case TBL_CELL_RIGHT: |
case TBL_CELL_RIGHT: |
tblcalc_literal(tbl, col, dp); |
tblcalc_literal(tbl, col, dp); |
break; |
break; |