version 1.292, 2014/11/21 01:52:53 |
version 1.299, 2014/12/02 10:08:06 |
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 994 termp_it_post(DECL_ARGS) |
|
Line 995 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 1006 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 1630 termp_bd_pre(DECL_ARGS) |
|
Line 1632 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 1835 termp_sp_pre(DECL_ARGS) |
|
Line 1839 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) { |