version 1.17, 2009/06/22 12:38:07 |
version 1.31, 2009/07/12 19:13:12 |
Line 80 const int ttypes[TTYPE_NMAX] = { |
|
Line 80 const int ttypes[TTYPE_NMAX] = { |
|
TERMP_BOLD /* TTYPE_LIST */ |
TERMP_BOLD /* TTYPE_LIST */ |
}; |
}; |
|
|
/* XXX - clean this up. */ |
|
|
|
struct termpair { |
struct termpair { |
struct termpair *ppair; |
struct termpair *ppair; |
int type; |
int flag; |
#define TERMPAIR_FLAG (1 << 0) |
int count; |
int flag; /* Whether being used. */ |
|
size_t offset; /* Left margin. */ |
|
size_t rmargin; /* Right margin. */ |
|
int count; /* Enum count. */ |
|
}; |
}; |
|
|
#define TERMPAIR_SETFLAG(termp, p, fl) \ |
#define DECL_ARGS struct termp *p, \ |
do { \ |
struct termpair *pair, \ |
assert(! (TERMPAIR_FLAG & (p)->type)); \ |
const struct mdoc_meta *meta, \ |
(termp)->flags |= (fl); \ |
const struct mdoc_node *node |
(p)->flag = (fl); \ |
|
(p)->type |= TERMPAIR_FLAG; \ |
|
} while ( /* CONSTCOND */ 0) |
|
|
|
#define DECL_ARGS \ |
|
struct termp *p, struct termpair *pair, \ |
|
const struct mdoc_meta *meta, \ |
|
const struct mdoc_node *node |
|
|
|
#define DECL_PRE(name) \ |
|
static int name##_pre(DECL_ARGS) |
|
#define DECL_POST(name) \ |
|
static void name##_post(DECL_ARGS) |
|
#define DECL_PREPOST(name) \ |
|
DECL_PRE(name); \ |
|
DECL_POST(name); |
|
|
|
DECL_PREPOST(termp__t); |
|
DECL_PREPOST(termp_aq); |
|
DECL_PREPOST(termp_bd); |
|
DECL_PREPOST(termp_bq); |
|
DECL_PREPOST(termp_brq); |
|
DECL_PREPOST(termp_d1); |
|
DECL_PREPOST(termp_dq); |
|
DECL_PREPOST(termp_fd); |
|
DECL_PREPOST(termp_fn); |
|
DECL_PREPOST(termp_fo); |
|
DECL_PREPOST(termp_ft); |
|
DECL_PREPOST(termp_in); |
|
DECL_PREPOST(termp_it); |
|
DECL_PREPOST(termp_lb); |
|
DECL_PREPOST(termp_op); |
|
DECL_PREPOST(termp_pf); |
|
DECL_PREPOST(termp_pq); |
|
DECL_PREPOST(termp_qq); |
|
DECL_PREPOST(termp_sh); |
|
DECL_PREPOST(termp_ss); |
|
DECL_PREPOST(termp_sq); |
|
DECL_PREPOST(termp_vt); |
|
|
|
DECL_PRE(termp__j); |
|
DECL_PRE(termp_ap); |
|
DECL_PRE(termp_ar); |
|
DECL_PRE(termp_at); |
|
DECL_PRE(termp_bf); |
|
DECL_PRE(termp_bsx); |
|
DECL_PRE(termp_bt); |
|
DECL_PRE(termp_cd); |
|
DECL_PRE(termp_cm); |
|
DECL_PRE(termp_dx); |
|
DECL_PRE(termp_em); |
|
DECL_PRE(termp_ex); |
|
DECL_PRE(termp_fa); |
|
DECL_PRE(termp_fl); |
|
DECL_PRE(termp_fx); |
|
DECL_PRE(termp_ic); |
|
DECL_PRE(termp_lk); |
|
DECL_PRE(termp_ms); |
|
DECL_PRE(termp_mt); |
|
DECL_PRE(termp_nd); |
|
DECL_PRE(termp_nm); |
|
DECL_PRE(termp_ns); |
|
DECL_PRE(termp_nx); |
|
DECL_PRE(termp_ox); |
|
DECL_PRE(termp_pa); |
|
DECL_PRE(termp_pp); |
|
DECL_PRE(termp_rs); |
|
DECL_PRE(termp_rv); |
|
DECL_PRE(termp_sm); |
|
DECL_PRE(termp_st); |
|
DECL_PRE(termp_sx); |
|
DECL_PRE(termp_sy); |
|
DECL_PRE(termp_ud); |
|
DECL_PRE(termp_ux); |
|
DECL_PRE(termp_va); |
|
DECL_PRE(termp_xr); |
|
|
|
DECL_POST(termp___); |
|
DECL_POST(termp_bl); |
|
DECL_POST(termp_bx); |
|
|
|
struct termact { |
struct termact { |
int (*pre)(DECL_ARGS); |
int (*pre)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
}; |
}; |
|
|
|
static void termp____post(DECL_ARGS); |
|
static void termp__t_post(DECL_ARGS); |
|
static void termp_aq_post(DECL_ARGS); |
|
static void termp_bd_post(DECL_ARGS); |
|
static void termp_bl_post(DECL_ARGS); |
|
static void termp_bq_post(DECL_ARGS); |
|
static void termp_brq_post(DECL_ARGS); |
|
static void termp_bx_post(DECL_ARGS); |
|
static void termp_d1_post(DECL_ARGS); |
|
static void termp_dq_post(DECL_ARGS); |
|
static void termp_fd_post(DECL_ARGS); |
|
static void termp_fn_post(DECL_ARGS); |
|
static void termp_fo_post(DECL_ARGS); |
|
static void termp_ft_post(DECL_ARGS); |
|
static void termp_in_post(DECL_ARGS); |
|
static void termp_it_post(DECL_ARGS); |
|
static void termp_lb_post(DECL_ARGS); |
|
static void termp_op_post(DECL_ARGS); |
|
static void termp_pf_post(DECL_ARGS); |
|
static void termp_pq_post(DECL_ARGS); |
|
static void termp_qq_post(DECL_ARGS); |
|
static void termp_sh_post(DECL_ARGS); |
|
static void termp_sq_post(DECL_ARGS); |
|
static void termp_ss_post(DECL_ARGS); |
|
static void termp_vt_post(DECL_ARGS); |
|
|
|
static int termp__j_pre(DECL_ARGS); |
|
static int termp__t_pre(DECL_ARGS); |
|
static int termp_ap_pre(DECL_ARGS); |
|
static int termp_aq_pre(DECL_ARGS); |
|
static int termp_ar_pre(DECL_ARGS); |
|
static int termp_at_pre(DECL_ARGS); |
|
static int termp_bd_pre(DECL_ARGS); |
|
static int termp_bf_pre(DECL_ARGS); |
|
static int termp_bq_pre(DECL_ARGS); |
|
static int termp_brq_pre(DECL_ARGS); |
|
static int termp_bt_pre(DECL_ARGS); |
|
static int termp_cd_pre(DECL_ARGS); |
|
static int termp_cm_pre(DECL_ARGS); |
|
static int termp_d1_pre(DECL_ARGS); |
|
static int termp_dq_pre(DECL_ARGS); |
|
static int termp_em_pre(DECL_ARGS); |
|
static int termp_ex_pre(DECL_ARGS); |
|
static int termp_fa_pre(DECL_ARGS); |
|
static int termp_fd_pre(DECL_ARGS); |
|
static int termp_fl_pre(DECL_ARGS); |
|
static int termp_fn_pre(DECL_ARGS); |
|
static int termp_fo_pre(DECL_ARGS); |
|
static int termp_ft_pre(DECL_ARGS); |
|
static int termp_ic_pre(DECL_ARGS); |
|
static int termp_in_pre(DECL_ARGS); |
|
static int termp_it_pre(DECL_ARGS); |
|
static int termp_lb_pre(DECL_ARGS); |
|
static int termp_lk_pre(DECL_ARGS); |
|
static int termp_ms_pre(DECL_ARGS); |
|
static int termp_mt_pre(DECL_ARGS); |
|
static int termp_nd_pre(DECL_ARGS); |
|
static int termp_nm_pre(DECL_ARGS); |
|
static int termp_ns_pre(DECL_ARGS); |
|
static int termp_op_pre(DECL_ARGS); |
|
static int termp_pa_pre(DECL_ARGS); |
|
static int termp_pf_pre(DECL_ARGS); |
|
static int termp_pp_pre(DECL_ARGS); |
|
static int termp_pq_pre(DECL_ARGS); |
|
static int termp_qq_pre(DECL_ARGS); |
|
static int termp_rs_pre(DECL_ARGS); |
|
static int termp_rv_pre(DECL_ARGS); |
|
static int termp_sh_pre(DECL_ARGS); |
|
static int termp_sm_pre(DECL_ARGS); |
|
static int termp_sq_pre(DECL_ARGS); |
|
static int termp_ss_pre(DECL_ARGS); |
|
static int termp_st_pre(DECL_ARGS); |
|
static int termp_sx_pre(DECL_ARGS); |
|
static int termp_sy_pre(DECL_ARGS); |
|
static int termp_ud_pre(DECL_ARGS); |
|
static int termp_va_pre(DECL_ARGS); |
|
static int termp_vt_pre(DECL_ARGS); |
|
static int termp_xr_pre(DECL_ARGS); |
|
static int termp_xx_pre(DECL_ARGS); |
|
|
static const struct termact termacts[MDOC_MAX] = { |
static const struct termact termacts[MDOC_MAX] = { |
{ termp_ap_pre, NULL }, /* Ap */ |
{ termp_ap_pre, NULL }, /* Ap */ |
{ NULL, NULL }, /* Dd */ |
{ NULL, NULL }, /* Dd */ |
Line 243 static const struct termact termacts[MDOC_MAX] = { |
|
Line 237 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_bq_pre, termp_bq_post }, /* Bo */ |
{ termp_bq_pre, termp_bq_post }, /* Bo */ |
{ termp_bq_pre, termp_bq_post }, /* Bq */ |
{ termp_bq_pre, termp_bq_post }, /* Bq */ |
{ termp_bsx_pre, NULL }, /* Bsx */ |
{ termp_xx_pre, NULL }, /* Bsx */ |
{ NULL, termp_bx_post }, /* Bx */ |
{ NULL, termp_bx_post }, /* Bx */ |
{ NULL, NULL }, /* Db */ |
{ NULL, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
Line 253 static const struct termact termacts[MDOC_MAX] = { |
|
Line 247 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ termp_em_pre, NULL }, /* Em */ |
{ termp_em_pre, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ termp_fx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_ms_pre, NULL }, /* Ms */ |
{ termp_ms_pre, NULL }, /* Ms */ |
{ NULL, NULL }, /* No */ |
{ NULL, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_nx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_ox_pre, NULL }, /* Ox */ |
{ termp_xx_pre, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ termp_pf_pre, termp_pf_post }, /* Pf */ |
{ termp_pf_pre, termp_pf_post }, /* Pf */ |
{ termp_pq_pre, termp_pq_post }, /* Po */ |
{ termp_pq_pre, termp_pq_post }, /* Po */ |
Line 276 static const struct termact termacts[MDOC_MAX] = { |
|
Line 270 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_sx_pre, NULL }, /* Sx */ |
{ termp_sx_pre, NULL }, /* Sx */ |
{ termp_sy_pre, NULL }, /* Sy */ |
{ termp_sy_pre, NULL }, /* Sy */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ termp_ux_pre, NULL }, /* Ux */ |
{ termp_xx_pre, NULL }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xo */ |
{ NULL, NULL }, /* Xo */ |
{ termp_fo_pre, termp_fo_post }, /* Fo */ |
{ termp_fo_pre, termp_fo_post }, /* Fo */ |
Line 299 static const struct termact termacts[MDOC_MAX] = { |
|
Line 293 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* %C */ |
{ NULL, NULL }, /* %C */ |
{ NULL, NULL }, /* Es */ |
{ NULL, NULL }, /* Es */ |
{ NULL, NULL }, /* En */ |
{ NULL, NULL }, /* En */ |
{ termp_dx_pre, NULL }, /* Dx */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ NULL, NULL }, /* %Q */ |
{ NULL, NULL }, /* %Q */ |
}; |
}; |
|
|
Line 333 mdoc_run(struct termp *p, const struct mdoc *m) |
|
Line 327 mdoc_run(struct termp *p, const struct mdoc *m) |
|
* Main output function. When this is called, assume that the |
* Main output function. When this is called, assume that the |
* tree is properly formed. |
* tree is properly formed. |
*/ |
*/ |
|
|
print_head(p, mdoc_meta(m)); |
print_head(p, mdoc_meta(m)); |
assert(mdoc_node(m)); |
assert(mdoc_node(m)); |
assert(MDOC_ROOT == mdoc_node(m)->type); |
assert(MDOC_ROOT == mdoc_node(m)->type); |
Line 360 print_node(DECL_ARGS) |
|
Line 353 print_node(DECL_ARGS) |
|
{ |
{ |
int dochild; |
int dochild; |
struct termpair npair; |
struct termpair npair; |
|
size_t offset, rmargin; |
|
|
/* Pre-processing. */ |
|
|
|
dochild = 1; |
dochild = 1; |
|
offset = p->offset; |
|
rmargin = p->rmargin; |
|
|
npair.ppair = pair; |
npair.ppair = pair; |
npair.type = 0; |
|
npair.offset = npair.rmargin = 0; |
|
npair.flag = 0; |
npair.flag = 0; |
npair.count = 0; |
npair.count = 0; |
|
|
Line 379 print_node(DECL_ARGS) |
|
Line 372 print_node(DECL_ARGS) |
|
|
|
/* Children. */ |
/* Children. */ |
|
|
if (TERMPAIR_FLAG & npair.type) |
p->flags |= npair.flag; |
p->flags |= npair.flag; |
|
|
|
if (dochild && node->child) |
if (dochild && node->child) |
print_body(p, &npair, meta, node->child); |
print_body(p, &npair, meta, node->child); |
|
|
if (TERMPAIR_FLAG & npair.type) |
|
p->flags &= ~npair.flag; |
|
|
|
/* Post-processing. */ |
/* Post-processing. */ |
|
|
if (MDOC_TEXT != node->type) |
if (MDOC_TEXT != node->type) |
if (termacts[node->tok].post) |
if (termacts[node->tok].post) |
(*termacts[node->tok].post)(p, &npair, meta, node); |
(*termacts[node->tok].post)(p, &npair, meta, node); |
|
|
|
p->offset = offset; |
|
p->rmargin = rmargin; |
|
p->flags &= ~npair.flag; |
} |
} |
|
|
|
|
Line 532 arg_width(const struct mdoc_argv *arg, int pos) |
|
Line 525 arg_width(const struct mdoc_argv *arg, int pos) |
|
|
|
assert(pos < (int)arg->sz && pos >= 0); |
assert(pos < (int)arg->sz && pos >= 0); |
assert(arg->value[pos]); |
assert(arg->value[pos]); |
if (0 == strcmp(arg->value[pos], "indent")) |
|
return(INDENT + 3); |
|
if (0 == strcmp(arg->value[pos], "indent-two")) |
|
return(INDENT * 2 + 2); |
|
|
|
if (0 == (len = (int)strlen(arg->value[pos]))) |
if (0 == (len = (int)strlen(arg->value[pos]))) |
return(0); |
return(0); |
Line 604 arg_offset(const struct mdoc_argv *arg) |
|
Line 593 arg_offset(const struct mdoc_argv *arg) |
|
|
|
assert(*arg->value); |
assert(*arg->value); |
if (0 == strcmp(*arg->value, "left")) |
if (0 == strcmp(*arg->value, "left")) |
return(INDENT - 1); |
return(0); |
if (0 == strcmp(*arg->value, "indent")) |
if (0 == strcmp(*arg->value, "indent")) |
return(INDENT + 1); |
return(INDENT + 1); |
if (0 == strcmp(*arg->value, "indent-two")) |
if (0 == strcmp(*arg->value, "indent-two")) |
return(INDENT * 2); |
return((INDENT + 1) * 2); |
|
|
/* FIXME: needs to support field-widths (10n, etc.). */ |
/* FIXME: needs to support field-widths (10n, etc.). */ |
|
|
Line 725 termp_it_pre(DECL_ARGS) |
|
Line 714 termp_it_pre(DECL_ARGS) |
|
|
|
/* Save parent attributes. */ |
/* Save parent attributes. */ |
|
|
pair->offset = p->offset; |
|
pair->rmargin = p->rmargin; |
|
pair->flag = p->flags; |
pair->flag = p->flags; |
|
|
/* Get list width and offset. */ |
/* Get list width and offset. */ |
Line 761 termp_it_pre(DECL_ARGS) |
|
Line 748 termp_it_pre(DECL_ARGS) |
|
if (vals[0] >= 0) |
if (vals[0] >= 0) |
width = arg_width(&bl->args->argv[vals[0]], 0); |
width = arg_width(&bl->args->argv[vals[0]], 0); |
if (vals[1] >= 0) |
if (vals[1] >= 0) |
offset = arg_offset(&bl->args->argv[vals[1]]); |
offset += arg_offset(&bl->args->argv[vals[1]]); |
break; |
break; |
} |
} |
|
|
Line 917 termp_it_pre(DECL_ARGS) |
|
Line 904 termp_it_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
p->flags |= TERMP_BOLD; |
p->flags |= TERMP_BOLD; |
term_word(p, "\\-"); |
term_word(p, "\\(hy"); |
break; |
break; |
case (MDOC_Enum): |
case (MDOC_Enum): |
(pair->ppair->ppair->count)++; |
(pair->ppair->ppair->count)++; |
Line 989 termp_it_post(DECL_ARGS) |
|
Line 976 termp_it_post(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
p->offset = pair->offset; |
|
p->rmargin = pair->rmargin; |
|
p->flags = pair->flag; |
p->flags = pair->flag; |
} |
} |
|
|
Line 1003 termp_nm_pre(DECL_ARGS) |
|
Line 988 termp_nm_pre(DECL_ARGS) |
|
if (SEC_SYNOPSIS == node->sec) |
if (SEC_SYNOPSIS == node->sec) |
term_newln(p); |
term_newln(p); |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]); |
pair->flag |= ttypes[TTYPE_PROG]; |
|
p->flags |= ttypes[TTYPE_PROG]; |
|
|
if (NULL == node->child) |
if (NULL == node->child) |
term_word(p, meta->name); |
term_word(p, meta->name); |
|
|
|
|
termp_fl_pre(DECL_ARGS) |
termp_fl_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); |
pair->flag |= ttypes[TTYPE_CMD_FLAG]; |
|
p->flags |= ttypes[TTYPE_CMD_FLAG]; |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
|
|
termp_ar_pre(DECL_ARGS) |
termp_ar_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); |
pair->flag |= ttypes[TTYPE_CMD_ARG]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_nd_pre(DECL_ARGS) |
termp_nd_pre(DECL_ARGS) |
{ |
{ |
|
|
|
if (MDOC_BODY != node->type) |
|
return(1); |
|
|
|
/* |
|
* XXX: signed off by jmc@openbsd.org. This technically |
|
* produces a minus sign after the Nd, which is wrong, but is |
|
* consistent with the historic OpenBSD tmac file. |
|
*/ |
|
#if defined(__OpenBSD__) || defined(__linux__) |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
|
#else |
|
term_word(p, "\\(em"); |
|
#endif |
return(1); |
return(1); |
} |
} |
|
|
Line 1194 termp_vt_pre(DECL_ARGS) |
|
Line 1194 termp_vt_pre(DECL_ARGS) |
|
{ |
{ |
|
|
/* FIXME: this can be "type name". */ |
/* FIXME: this can be "type name". */ |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); |
pair->flag |= ttypes[TTYPE_VAR_DECL]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_fd_pre(DECL_ARGS) |
termp_fd_pre(DECL_ARGS) |
{ |
{ |
|
|
/* |
pair->flag |= ttypes[TTYPE_FUNC_DECL]; |
* FIXME: this naming is bad. This value is used, in general, |
|
* for the #include header or other preprocessor statement. |
|
*/ |
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1230 termp_fd_post(DECL_ARGS) |
|
Line 1226 termp_fd_post(DECL_ARGS) |
|
|
|
if (node->sec != SEC_SYNOPSIS) |
if (node->sec != SEC_SYNOPSIS) |
return; |
return; |
|
|
term_newln(p); |
term_newln(p); |
if (node->next && MDOC_Fd != node->next->tok) |
if (node->next && MDOC_Fd != node->next->tok) |
term_vspace(p); |
term_vspace(p); |
Line 1244 termp_sh_pre(DECL_ARGS) |
|
Line 1241 termp_sh_pre(DECL_ARGS) |
|
switch (node->type) { |
switch (node->type) { |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
term_vspace(p); |
term_vspace(p); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]); |
pair->flag |= ttypes[TTYPE_SECTION]; |
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
p->offset = INDENT; |
p->offset = INDENT; |
Line 1309 termp_lb_pre(DECL_ARGS) |
|
Line 1306 termp_lb_pre(DECL_ARGS) |
|
const char *lb; |
const char *lb; |
|
|
assert(node->child && MDOC_TEXT == node->child->type); |
assert(node->child && MDOC_TEXT == node->child->type); |
if ((lb = mdoc_a2lib(node->child->string))) { |
lb = mdoc_a2lib(node->child->string); |
|
if (lb) { |
term_word(p, lb); |
term_word(p, lb); |
return(0); |
return(0); |
} |
} |
Line 1345 termp_d1_pre(DECL_ARGS) |
|
Line 1343 termp_d1_pre(DECL_ARGS) |
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
term_newln(p); |
term_newln(p); |
pair->offset = INDENT + 1; |
p->offset += (INDENT + 1); |
p->offset += pair->offset; |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1359 termp_d1_post(DECL_ARGS) |
|
Line 1356 termp_d1_post(DECL_ARGS) |
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return; |
return; |
term_newln(p); |
term_newln(p); |
p->offset -= pair->offset; |
|
} |
} |
|
|
|
|
Line 1396 termp_ft_pre(DECL_ARGS) |
|
Line 1392 termp_ft_pre(DECL_ARGS) |
|
if (SEC_SYNOPSIS == node->sec) |
if (SEC_SYNOPSIS == node->sec) |
if (node->prev && MDOC_Fo == node->prev->tok) |
if (node->prev && MDOC_Fo == node->prev->tok) |
term_vspace(p); |
term_vspace(p); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]); |
pair->flag |= ttypes[TTYPE_FUNC_TYPE]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1452 termp_fn_post(DECL_ARGS) |
|
Line 1448 termp_fn_post(DECL_ARGS) |
|
|
|
if (node->sec == SEC_SYNOPSIS && node->next) |
if (node->sec == SEC_SYNOPSIS && node->next) |
term_vspace(p); |
term_vspace(p); |
|
|
} |
} |
|
|
|
|
|
|
termp_sx_pre(DECL_ARGS) |
termp_sx_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]); |
pair->flag |= ttypes[TTYPE_LINK]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1473 termp_fa_pre(DECL_ARGS) |
|
Line 1468 termp_fa_pre(DECL_ARGS) |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
if (node->parent->tok != MDOC_Fo) { |
if (node->parent->tok != MDOC_Fo) { |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]); |
pair->flag |= ttypes[TTYPE_FUNC_ARG]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_va_pre(DECL_ARGS) |
termp_va_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); |
pair->flag |= ttypes[TTYPE_VAR_DECL]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1529 termp_bd_pre(DECL_ARGS) |
|
Line 1524 termp_bd_pre(DECL_ARGS) |
|
if (NULL == node->parent->args) |
if (NULL == node->parent->args) |
errx(1, "missing display type"); |
errx(1, "missing display type"); |
|
|
pair->offset = p->offset; |
|
|
|
for (type = -1, i = 0; |
for (type = -1, i = 0; |
i < (int)node->parent->args->argc; i++) { |
i < (int)node->parent->args->argc; i++) { |
switch (node->parent->args->argv[i].arg) { |
switch (node->parent->args->argv[i].arg) { |
Line 1600 termp_bd_post(DECL_ARGS) |
|
Line 1593 termp_bd_post(DECL_ARGS) |
|
|
|
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_LITERAL; |
p->flags &= ~TERMP_LITERAL; |
p->offset = pair->offset; |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
Line 1631 termp_qq_post(DECL_ARGS) |
|
Line 1623 termp_qq_post(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
|
termp_bsx_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "BSDI BSD/OS"); |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
termp_bx_post(DECL_ARGS) |
termp_bx_post(DECL_ARGS) |
{ |
{ |
Line 1653 termp_bx_post(DECL_ARGS) |
|
Line 1635 termp_bx_post(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
termp_ox_pre(DECL_ARGS) |
termp_xx_pre(DECL_ARGS) |
{ |
{ |
|
const char *pp; |
|
|
term_word(p, "OpenBSD"); |
pp = NULL; |
return(1); |
switch (node->tok) { |
} |
case (MDOC_Bsx): |
|
pp = "BSDI BSD/OS"; |
|
break; |
|
case (MDOC_Dx): |
|
pp = "DragonFlyBSD"; |
|
break; |
|
case (MDOC_Fx): |
|
pp = "FreeBSD"; |
|
break; |
|
case (MDOC_Nx): |
|
pp = "NetBSD"; |
|
break; |
|
case (MDOC_Ox): |
|
pp = "OpenBSD"; |
|
break; |
|
case (MDOC_Ux): |
|
pp = "UNIX"; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
assert(pp); |
/* ARGSUSED */ |
term_word(p, pp); |
static int |
|
termp_dx_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "DragonFly"); |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
termp_ux_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "UNIX"); |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_fx_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "FreeBSD"); |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_nx_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "NetBSD"); |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_sq_pre(DECL_ARGS) |
termp_sq_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1758 termp_ss_pre(DECL_ARGS) |
|
Line 1726 termp_ss_pre(DECL_ARGS) |
|
term_vspace(p); |
term_vspace(p); |
break; |
break; |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]); |
pair->flag |= ttypes[TTYPE_SSECTION]; |
p->offset = HALFINDENT; |
p->offset = HALFINDENT; |
break; |
break; |
default: |
default: |
|
|
termp_ss_post(DECL_ARGS) |
termp_ss_post(DECL_ARGS) |
{ |
{ |
|
|
switch (node->type) { |
if (MDOC_HEAD == node->type) |
case (MDOC_HEAD): |
|
term_newln(p); |
term_newln(p); |
p->offset = INDENT; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
} |
|
|
|
|
|
|
termp_pa_pre(DECL_ARGS) |
termp_pa_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]); |
pair->flag |= ttypes[TTYPE_FILE]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_em_pre(DECL_ARGS) |
termp_em_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
pair->flag |= ttypes[TTYPE_EMPH]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_cd_pre(DECL_ARGS) |
termp_cd_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]); |
pair->flag |= ttypes[TTYPE_CONFIG]; |
term_newln(p); |
term_newln(p); |
return(1); |
return(1); |
} |
} |
|
|
termp_cm_pre(DECL_ARGS) |
termp_cm_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); |
pair->flag |= ttypes[TTYPE_CMD_FLAG]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_ic_pre(DECL_ARGS) |
termp_ic_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]); |
pair->flag |= ttypes[TTYPE_CMD]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); |
pair->flag |= ttypes[TTYPE_INCLUDE]; |
term_word(p, "#include"); |
p->flags |= ttypes[TTYPE_INCLUDE]; |
|
|
|
if (SEC_SYNOPSIS == node->sec) |
|
term_word(p, "#include"); |
|
|
term_word(p, "<"); |
term_word(p, "<"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
Line 1857 termp_in_post(DECL_ARGS) |
|
Line 1823 termp_in_post(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
|
|
term_newln(p); |
|
if (SEC_SYNOPSIS != node->sec) |
if (SEC_SYNOPSIS != node->sec) |
return; |
return; |
|
|
|
term_newln(p); |
|
/* |
|
* XXX Not entirely correct. If `.In foo bar' is specified in |
|
* the SYNOPSIS section, then it produces a single break after |
|
* the <foo>; mandoc asserts a vertical space. Since this |
|
* construction is rarely used, I think it's fine. |
|
*/ |
if (node->next && MDOC_In != node->next->tok) |
if (node->next && MDOC_In != node->next->tok) |
term_vspace(p); |
term_vspace(p); |
} |
} |
Line 2004 termp_bf_pre(DECL_ARGS) |
|
Line 1977 termp_bf_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (MDOC_HEAD == node->type) { |
if (MDOC_HEAD == node->type) |
return(0); |
return(0); |
} else if (MDOC_BLOCK != node->type) |
else if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
|
|
if (NULL == (n = node->head->child)) { |
if (NULL == (n = node->head->child)) { |
if (arg_hasattr(MDOC_Emphasis, node)) |
if (arg_hasattr(MDOC_Emphasis, node)) |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
pair->flag |= ttypes[TTYPE_EMPH]; |
else if (arg_hasattr(MDOC_Symbolic, node)) |
else if (arg_hasattr(MDOC_Symbolic, node)) |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); |
pair->flag |= ttypes[TTYPE_SYMB]; |
|
|
return(1); |
return(1); |
} |
} |
|
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
if (0 == strcmp("Em", n->string)) |
if (0 == strcmp("Em", n->string)) |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
pair->flag |= ttypes[TTYPE_EMPH]; |
else if (0 == strcmp("Sy", n->string)) |
else if (0 == strcmp("Sy", n->string)) |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
pair->flag |= ttypes[TTYPE_SYMB]; |
|
|
return(1); |
return(1); |
} |
} |
|
|
termp_sy_pre(DECL_ARGS) |
termp_sy_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); |
pair->flag |= ttypes[TTYPE_SYMB]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_ms_pre(DECL_ARGS) |
termp_ms_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]); |
pair->flag |= ttypes[TTYPE_SYMBOL]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp__j_pre(DECL_ARGS) |
termp__j_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_JOURNAL]); |
pair->flag |= ttypes[TTYPE_REF_JOURNAL]; |
return(1); |
return(1); |
} |
} |
|
|
Line 2129 termp_lk_pre(DECL_ARGS) |
|
Line 2102 termp_lk_pre(DECL_ARGS) |
|
n = node->child; |
n = node->child; |
|
|
if (NULL == n->next) { |
if (NULL == n->next) { |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]); |
pair->flag |= ttypes[TTYPE_LINK_ANCHOR]; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_mt_pre(DECL_ARGS) |
termp_mt_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]); |
pair->flag |= ttypes[TTYPE_LINK_ANCHOR]; |
return(1); |
return(1); |
} |
} |
|
|