version 1.215, 2014/12/01 08:05:52 |
version 1.220, 2015/01/30 22:04:44 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2014, 2015 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 |
|
|
a2width(const char *p, struct roffsu *su) |
a2width(const char *p, struct roffsu *su) |
{ |
{ |
|
|
if ( ! a2roffsu(p, su, SCALE_MAX)) { |
if (a2roffsu(p, su, SCALE_MAX) < 2) { |
su->unit = SCALE_EN; |
su->unit = SCALE_EN; |
su->scale = html_strlen(p); |
su->scale = html_strlen(p); |
} |
} else if (su->scale < 0.0) |
|
su->scale = 0.0; |
} |
} |
|
|
/* |
/* |
|
|
print_mdoc_nodelist(MDOC_ARGS) |
print_mdoc_nodelist(MDOC_ARGS) |
{ |
{ |
|
|
print_mdoc_node(meta, n, h); |
while (n != NULL) { |
if (n->next) |
print_mdoc_node(meta, n, h); |
print_mdoc_nodelist(meta, n->next, h); |
n = n->next; |
|
} |
} |
} |
|
|
static void |
static void |
Line 1201 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1203 mdoc_bd_pre(MDOC_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
if (nn->next && nn->next->line == nn->line) |
if (h->flags & HTML_NONEWLINE || |
|
(nn->next && ! (nn->next->flags & MDOC_LINE))) |
continue; |
continue; |
else if (nn->next) |
else if (nn->next) |
print_text(h, "\n"); |
print_text(h, "\n"); |
Line 1565 mdoc_sp_pre(MDOC_ARGS) |
|
Line 1568 mdoc_sp_pre(MDOC_ARGS) |
|
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
|
|
if (MDOC_sp == n->tok) { |
if (MDOC_sp == n->tok) { |
if (NULL != (n = n->child)) |
if (NULL != (n = n->child)) { |
if ( ! a2roffsu(n->string, &su, SCALE_VS)) |
if ( ! a2roffsu(n->string, &su, SCALE_VS)) |
SCALE_VS_INIT(&su, atoi(n->string)); |
su.scale = 1.0; |
|
else if (su.scale < 0.0) |
|
su.scale = 0.0; |
|
} |
} else |
} else |
su.scale = 0.0; |
su.scale = 0.0; |
|
|
Line 2079 mdoc_quote_pre(MDOC_ARGS) |
|
Line 2085 mdoc_quote_pre(MDOC_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
print_text(h, n->parent->prev != NULL && |
print_text(h, n->nchild == 1 && |
n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 2157 mdoc_quote_post(MDOC_ARGS) |
|
Line 2163 mdoc_quote_post(MDOC_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
print_text(h, n->parent->prev != NULL && |
print_text(h, n->nchild == 1 && |
n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |