version 1.380, 2020/04/06 10:16:17 |
version 1.382, 2022/09/11 09:13:48 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2020, 2022 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
Line 320 print_mdoc_node(DECL_ARGS) |
|
Line 320 print_mdoc_node(DECL_ARGS) |
|
(p->flags & TERMP_NONEWLINE) == 0) |
(p->flags & TERMP_NONEWLINE) == 0) |
term_newln(p); |
term_newln(p); |
p->flags |= TERMP_BRNEVER; |
p->flags |= TERMP_BRNEVER; |
} else |
} else { |
|
if (n->flags & NODE_LINE) |
|
term_tab_ref(p); |
p->flags &= ~TERMP_BRNEVER; |
p->flags &= ~TERMP_BRNEVER; |
|
} |
|
|
if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) |
if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) |
return; |
return; |
Line 566 a2width(const struct termp *p, const char *v) |
|
Line 569 a2width(const struct termp *p, const char *v) |
|
|
|
end = a2roffsu(v, &su, SCALE_MAX); |
end = a2roffsu(v, &su, SCALE_MAX); |
if (end == NULL || *end != '\0') { |
if (end == NULL || *end != '\0') { |
SCALE_HS_INIT(&su, term_strlen(p, v)); |
su.unit = SCALE_EN; |
su.scale /= term_strlen(p, "0"); |
su.scale = term_strlen(p, v) / term_strlen(p, "0"); |
} |
} |
return term_hen(p, &su); |
return term_hen(p, &su); |
} |
} |
Line 703 termp_it_pre(DECL_ARGS) |
|
Line 706 termp_it_pre(DECL_ARGS) |
|
for (i = 0, nn = n->prev; |
for (i = 0, nn = n->prev; |
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) { |
nn = nn->prev, i++) { |
SCALE_HS_INIT(&su, |
su.unit = SCALE_EN; |
term_strlen(p, bl->norm->Bl.cols[i])); |
su.scale = term_strlen(p, bl->norm->Bl.cols[i]) / |
su.scale /= term_strlen(p, "0"); |
term_strlen(p, "0"); |
offset += term_hen(p, &su) + dcol; |
offset += term_hen(p, &su) + dcol; |
} |
} |
|
|
Line 722 termp_it_pre(DECL_ARGS) |
|
Line 725 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i])); |
su.unit = SCALE_EN; |
su.scale /= term_strlen(p, "0"); |
su.scale = term_strlen(p, bl->norm->Bl.cols[i]) / |
|
term_strlen(p, "0"); |
width = term_hen(p, &su) + dcol; |
width = term_hen(p, &su) + dcol; |
break; |
break; |
default: |
default: |