version 1.292, 2014/11/21 01:52:53 |
version 1.302, 2014/12/24 23:32:42 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
|
#include <limits.h> |
#include <stdint.h> |
#include <stdint.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
|
|
void (*post)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
}; |
}; |
|
|
static size_t a2width(const struct termp *, const char *); |
static int 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 91 static int termp_bt_pre(DECL_ARGS); |
|
Line 91 static int termp_bt_pre(DECL_ARGS); |
|
static int termp_bx_pre(DECL_ARGS); |
static int termp_bx_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_es_pre(DECL_ARGS); |
|
static int termp_ex_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fd_pre(DECL_ARGS); |
static int termp_fd_pre(DECL_ARGS); |
Line 111 static int termp_quote_pre(DECL_ARGS); |
|
Line 110 static int termp_quote_pre(DECL_ARGS); |
|
static int termp_rs_pre(DECL_ARGS); |
static int termp_rs_pre(DECL_ARGS); |
static int termp_rv_pre(DECL_ARGS); |
static int termp_rv_pre(DECL_ARGS); |
static int termp_sh_pre(DECL_ARGS); |
static int termp_sh_pre(DECL_ARGS); |
|
static int termp_skip_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sp_pre(DECL_ARGS); |
static int termp_sp_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
Line 183 static const struct termact termacts[MDOC_MAX] = { |
|
Line 183 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Bq */ |
{ termp_quote_pre, termp_quote_post }, /* Bq */ |
{ termp_xx_pre, NULL }, /* Bsx */ |
{ termp_xx_pre, NULL }, /* Bsx */ |
{ termp_bx_pre, NULL }, /* Bx */ |
{ termp_bx_pre, NULL }, /* Bx */ |
{ NULL, NULL }, /* Db */ |
{ termp_skip_pre, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ termp_quote_pre, termp_quote_post }, /* Do */ |
{ termp_quote_pre, termp_quote_post }, /* Do */ |
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
Line 235 static const struct termact termacts[MDOC_MAX] = { |
|
Line 235 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Bro */ |
{ termp_quote_pre, termp_quote_post }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, termp____post }, /* %C */ |
{ NULL, termp____post }, /* %C */ |
{ termp_es_pre, NULL }, /* Es */ |
{ termp_skip_pre, NULL }, /* Es */ |
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_quote_pre, termp_quote_post }, /* En */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ NULL, termp____post }, /* %Q */ |
{ NULL, termp____post }, /* %Q */ |
Line 350 print_mdoc_node(DECL_ARGS) |
|
Line 350 print_mdoc_node(DECL_ARGS) |
|
term_tbl(p, n->span); |
term_tbl(p, n->span); |
break; |
break; |
default: |
default: |
if (termacts[n->tok].pre && ENDBODY_NOT == n->end) |
if (termacts[n->tok].pre && |
|
(n->end == ENDBODY_NOT || n->nchild)) |
chld = (*termacts[n->tok].pre) |
chld = (*termacts[n->tok].pre) |
(p, &npair, meta, n); |
(p, &npair, meta, n); |
break; |
break; |
Line 525 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 526 print_mdoc_head(struct termp *p, const void *arg) |
|
free(volume); |
free(volume); |
} |
} |
|
|
static size_t |
static int |
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"); |
} |
} |
|
|
return(term_hspan(p, &su)); |
return(term_hspan(p, &su)); |
} |
} |
|
|
Line 619 termp_ll_pre(DECL_ARGS) |
|
Line 605 termp_ll_pre(DECL_ARGS) |
|
static int |
static int |
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *bl, *nn; |
|
char buf[24]; |
char buf[24]; |
int i; |
const struct mdoc_node *bl, *nn; |
size_t width, offset, ncols, dcol; |
size_t ncols, dcol; |
|
int i, offset, width; |
enum mdoc_list type; |
enum mdoc_list type; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
Line 634 termp_it_pre(DECL_ARGS) |
|
Line 620 termp_it_pre(DECL_ARGS) |
|
type = bl->norm->Bl.type; |
type = bl->norm->Bl.type; |
|
|
/* |
/* |
|
* Defaults for specific list types. |
|
*/ |
|
|
|
switch (type) { |
|
case LIST_bullet: |
|
/* FALLTHROUGH */ |
|
case LIST_dash: |
|
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
|
/* FALLTHROUGH */ |
|
case LIST_enum: |
|
width = term_len(p, 2); |
|
break; |
|
case LIST_hang: |
|
width = term_len(p, 8); |
|
break; |
|
case LIST_column: |
|
/* FALLTHROUGH */ |
|
case LIST_tag: |
|
width = term_len(p, 10); |
|
break; |
|
default: |
|
width = 0; |
|
break; |
|
} |
|
offset = 0; |
|
|
|
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
* we're a -column list, in which case all prior columns must |
* we're a -column list, in which case all prior columns must |
* be accounted for. |
* be accounted for. |
*/ |
*/ |
|
|
width = offset = 0; |
if (bl->norm->Bl.offs != NULL) { |
|
|
if (bl->norm->Bl.offs) |
|
offset = a2width(p, bl->norm->Bl.offs); |
offset = a2width(p, bl->norm->Bl.offs); |
|
if (offset < 0 && (size_t)(-offset) > p->offset) |
|
offset = -p->offset; |
|
else if (offset > SHRT_MAX) |
|
offset = 0; |
|
} |
|
|
switch (type) { |
switch (type) { |
case LIST_column: |
case LIST_column: |
Line 697 termp_it_pre(DECL_ARGS) |
|
Line 714 termp_it_pre(DECL_ARGS) |
|
* number for buffering single arguments. See the above |
* number for buffering single arguments. See the above |
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
assert(bl->norm->Bl.width); |
|
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
|
if (width < 0 && (size_t)(-width) > p->offset) |
|
width = -p->offset; |
|
else if (width > SHRT_MAX) |
|
width = 0; |
break; |
break; |
} |
} |
|
|
/* |
/* |
* List-type can override the width in the case of fixed-head |
|
* values (bullet, dash/hyphen, enum). Tags need a non-zero |
|
* offset. |
|
*/ |
|
|
|
switch (type) { |
|
case LIST_bullet: |
|
/* FALLTHROUGH */ |
|
case LIST_dash: |
|
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
|
/* FALLTHROUGH */ |
|
case LIST_enum: |
|
if (width < term_len(p, 2)) |
|
width = term_len(p, 2); |
|
break; |
|
case LIST_hang: |
|
if (0 == width) |
|
width = term_len(p, 8); |
|
break; |
|
case LIST_column: |
|
/* FALLTHROUGH */ |
|
case LIST_tag: |
|
if (0 == width) |
|
width = term_len(p, 10); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Whitespace control. Inset bodies need an initial space, |
* Whitespace control. Inset bodies need an initial space, |
* while diagonal bodies need two. |
* while diagonal bodies need two. |
*/ |
*/ |
Line 775 termp_it_pre(DECL_ARGS) |
|
Line 764 termp_it_pre(DECL_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
/* |
/* |
* Weird special case. |
* Weird special case. |
* Very narrow enum lists actually hang. |
* Some very narrow lists actually hang. |
*/ |
*/ |
if (width == term_len(p, 2)) |
|
p->flags |= TERMP_HANG; |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
|
if (width <= (int)term_len(p, 2)) |
|
p->flags |= TERMP_HANG; |
if (MDOC_HEAD != n->type) |
if (MDOC_HEAD != n->type) |
break; |
break; |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
Line 873 termp_it_pre(DECL_ARGS) |
|
Line 862 termp_it_pre(DECL_ARGS) |
|
case LIST_hyphen: |
case LIST_hyphen: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_tag: |
case LIST_tag: |
assert(width); |
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else |
else |
Line 994 termp_it_post(DECL_ARGS) |
|
Line 982 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 1004 termp_nm_pre(DECL_ARGS) |
|
Line 993 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); |
} |
} |
|
|
|
|
termp_sh_pre(DECL_ARGS) |
termp_sh_pre(DECL_ARGS) |
{ |
{ |
|
|
/* No vspace between consecutive `Sh' calls. */ |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MDOC_BLOCK: |
case MDOC_BLOCK: |
if (n->prev && MDOC_Sh == n->prev->tok) |
/* |
if (NULL == n->prev->body->child) |
* Vertical space before sections, except |
break; |
* when the previous section was empty. |
term_vspace(p); |
*/ |
|
if (n->prev == NULL || |
|
MDOC_Sh != n->prev->tok || |
|
(n->prev->body != NULL && |
|
n->prev->body->child != NULL)) |
|
term_vspace(p); |
break; |
break; |
case MDOC_HEAD: |
case MDOC_HEAD: |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
Line 1552 termp_bd_pre(DECL_ARGS) |
|
Line 1541 termp_bd_pre(DECL_ARGS) |
|
{ |
{ |
size_t tabwidth, lm, len, rm, rmax; |
size_t tabwidth, lm, len, rm, rmax; |
struct mdoc_node *nn; |
struct mdoc_node *nn; |
|
int offset; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n, n); |
print_bvspace(p, n, n); |
Line 1568 termp_bd_pre(DECL_ARGS) |
|
Line 1558 termp_bd_pre(DECL_ARGS) |
|
p->offset += term_len(p, p->defindent + 1); |
p->offset += term_len(p, p->defindent + 1); |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
p->offset += term_len(p, (p->defindent + 1) * 2); |
p->offset += term_len(p, (p->defindent + 1) * 2); |
else |
else { |
p->offset += a2width(p, n->norm->Bd.offs); |
offset = a2width(p, n->norm->Bd.offs); |
|
if (offset < 0 && (size_t)(-offset) > p->offset) |
|
p->offset = 0; |
|
else if (offset < SHRT_MAX) |
|
p->offset += offset; |
|
} |
|
|
/* |
/* |
* If -ragged or -filled are specified, the block does nothing |
* If -ragged or -filled are specified, the block does nothing |
Line 1630 termp_bd_pre(DECL_ARGS) |
|
Line 1625 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 1812 termp_in_post(DECL_ARGS) |
|
Line 1809 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; |
Line 1835 termp_sp_pre(DECL_ARGS) |
|
Line 1838 termp_sp_pre(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_es_pre(DECL_ARGS) |
termp_skip_pre(DECL_ARGS) |
{ |
{ |
|
|
return(0); |
return(0); |
|
|
termp_quote_post(DECL_ARGS) |
termp_quote_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type && MDOC_ELEM != n->type) |
if (n->type != MDOC_BODY && n->type != MDOC_ELEM) |
return; |
return; |
|
|
if (MDOC_En != n->tok) |
if ( ! (n->tok == MDOC_En || |
|
(n->tok == MDOC_Eo && n->end == ENDBODY_SPACE))) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
switch (n->tok) { |
switch (n->tok) { |