version 1.295, 2014/11/27 22:27:56 |
version 1.300, 2014/12/23 09:31:46 |
|
|
}; |
}; |
|
|
static size_t a2width(const struct termp *, const char *); |
static size_t a2width(const struct termp *, const char *); |
static size_t a2height(const struct termp *, const char *); |
|
|
|
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct mdoc_node *, |
const struct mdoc_node *, |
Line 527 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 526 print_mdoc_head(struct termp *p, const void *arg) |
|
} |
} |
|
|
static size_t |
static size_t |
a2height(const struct termp *p, const char *v) |
|
{ |
|
struct roffsu su; |
|
|
|
|
|
assert(v); |
|
if ( ! a2roffsu(v, &su, SCALE_VS)) |
|
SCALE_VS_INIT(&su, atoi(v)); |
|
|
|
return(term_vspan(p, &su)); |
|
} |
|
|
|
static size_t |
|
a2width(const struct termp *p, const char *v) |
a2width(const struct termp *p, const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
assert(v); |
if (a2roffsu(v, &su, SCALE_MAX) < 2) { |
if ( ! a2roffsu(v, &su, SCALE_MAX)) { |
|
SCALE_HS_INIT(&su, term_strlen(p, v)); |
SCALE_HS_INIT(&su, term_strlen(p, v)); |
su.scale /= term_strlen(p, "0"); |
su.scale /= term_strlen(p, "0"); |
} |
} |
Line 995 termp_it_post(DECL_ARGS) |
|
Line 980 termp_it_post(DECL_ARGS) |
|
static int |
static int |
termp_nm_pre(DECL_ARGS) |
termp_nm_pre(DECL_ARGS) |
{ |
{ |
|
const char *cp; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
Line 1005 termp_nm_pre(DECL_ARGS) |
|
Line 991 termp_nm_pre(DECL_ARGS) |
|
if (NULL == n->child) |
if (NULL == n->child) |
return(0); |
return(0); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset += term_len(p, 1) + |
cp = NULL; |
(NULL == n->prev->child ? |
if (n->prev->child != NULL) |
term_strlen(p, meta->name) : |
cp = n->prev->child->string; |
MDOC_TEXT == n->prev->child->type ? |
if (cp == NULL) |
term_strlen(p, n->prev->child->string) : |
cp = meta->name; |
term_len(p, 5)); |
if (cp == NULL) |
|
p->offset += term_len(p, 6); |
|
else |
|
p->offset += term_len(p, 1) + term_strlen(p, cp); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_nd_pre(DECL_ARGS) |
termp_nd_pre(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (n->type == MDOC_BODY) |
return(1); |
term_word(p, "\\(en"); |
|
|
#if defined(__OpenBSD__) || defined(__linux__) |
|
term_word(p, "\\(en"); |
|
#else |
|
term_word(p, "\\(em"); |
|
#endif |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1634 termp_bd_pre(DECL_ARGS) |
|
Line 1617 termp_bd_pre(DECL_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
if (nn->next && nn->next->line == nn->line) |
if (p->flags & TERMP_NONEWLINE || |
|
(nn->next && ! (nn->next->flags & MDOC_LINE))) |
continue; |
continue; |
term_flushln(p); |
term_flushln(p); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
termp_pf_post(DECL_ARGS) |
termp_pf_post(DECL_ARGS) |
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
if ( ! (n->next == NULL || n->next->flags & MDOC_LINE)) |
|
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
static int |
static int |
Line 1816 termp_in_post(DECL_ARGS) |
|
Line 1801 termp_in_post(DECL_ARGS) |
|
static int |
static int |
termp_sp_pre(DECL_ARGS) |
termp_sp_pre(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
size_t i, len; |
size_t i, len; |
|
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_sp: |
case MDOC_sp: |
len = n->child ? a2height(p, n->child->string) : 1; |
if (n->child) { |
|
if ( ! a2roffsu(n->child->string, &su, SCALE_VS)) |
|
su.scale = 1.0; |
|
len = term_vspan(p, &su); |
|
} else |
|
len = 1; |
break; |
break; |
case MDOC_br: |
case MDOC_br: |
len = 0; |
len = 0; |