version 1.29, 2009/02/28 20:13:06 |
version 1.32, 2009/03/01 23:14:15 |
Line 118 DECL_PREPOST(termp_fd); |
|
Line 118 DECL_PREPOST(termp_fd); |
|
DECL_PREPOST(termp_fn); |
DECL_PREPOST(termp_fn); |
DECL_PREPOST(termp_fo); |
DECL_PREPOST(termp_fo); |
DECL_PREPOST(termp_ft); |
DECL_PREPOST(termp_ft); |
|
DECL_PREPOST(termp_in); |
DECL_PREPOST(termp_it); |
DECL_PREPOST(termp_it); |
DECL_PREPOST(termp_op); |
DECL_PREPOST(termp_op); |
DECL_PREPOST(termp_pf); |
DECL_PREPOST(termp_pf); |
Line 133 DECL_PRE(termp_at); |
|
Line 134 DECL_PRE(termp_at); |
|
DECL_PRE(termp_bf); |
DECL_PRE(termp_bf); |
DECL_PRE(termp_bsx); |
DECL_PRE(termp_bsx); |
DECL_PRE(termp_bt); |
DECL_PRE(termp_bt); |
DECL_PRE(termp_bx); |
|
DECL_PRE(termp_cd); |
DECL_PRE(termp_cd); |
DECL_PRE(termp_cm); |
DECL_PRE(termp_cm); |
DECL_PRE(termp_em); |
DECL_PRE(termp_em); |
Line 142 DECL_PRE(termp_fa); |
|
Line 142 DECL_PRE(termp_fa); |
|
DECL_PRE(termp_fl); |
DECL_PRE(termp_fl); |
DECL_PRE(termp_fx); |
DECL_PRE(termp_fx); |
DECL_PRE(termp_ic); |
DECL_PRE(termp_ic); |
DECL_PRE(termp_in); |
|
DECL_PRE(termp_ms); |
DECL_PRE(termp_ms); |
DECL_PRE(termp_nd); |
DECL_PRE(termp_nd); |
DECL_PRE(termp_nm); |
DECL_PRE(termp_nm); |
Line 164 DECL_PRE(termp_xr); |
|
Line 163 DECL_PRE(termp_xr); |
|
|
|
DECL_POST(termp___); |
DECL_POST(termp___); |
DECL_POST(termp_bl); |
DECL_POST(termp_bl); |
|
DECL_POST(termp_bx); |
|
|
const struct termact __termacts[MDOC_MAX] = { |
const struct termact __termacts[MDOC_MAX] = { |
{ NULL, NULL }, /* \" */ |
{ NULL, NULL }, /* \" */ |
Line 195 const struct termact __termacts[MDOC_MAX] = { |
|
Line 195 const struct termact __termacts[MDOC_MAX] = { |
|
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_ft_pre, termp_ft_post }, /* Ft */ |
{ termp_ft_pre, termp_ft_post }, /* Ft */ |
{ termp_ic_pre, NULL }, /* Ic */ |
{ termp_ic_pre, NULL }, /* Ic */ |
{ termp_in_pre, NULL }, /* In */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ NULL, NULL }, /* Li */ |
{ NULL, NULL }, /* Li */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nm_pre, NULL }, /* Nm */ |
{ termp_nm_pre, NULL }, /* Nm */ |
Line 227 const struct termact __termacts[MDOC_MAX] = { |
|
Line 227 const struct termact __termacts[MDOC_MAX] = { |
|
{ 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_bsx_pre, NULL }, /* Bsx */ |
{ termp_bx_pre, NULL }, /* Bx */ |
{ NULL, termp_bx_post }, /* Bx */ |
{ NULL, NULL }, /* Db */ |
{ NULL, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ termp_dq_pre, termp_dq_post }, /* Do */ |
{ termp_dq_pre, termp_dq_post }, /* Do */ |
Line 303 arg_width(const struct mdoc_arg *arg) |
|
Line 303 arg_width(const struct mdoc_arg *arg) |
|
} |
} |
|
|
} |
} |
return(strlen(*arg->value) + 2); |
return(strlen(*arg->value) + 1); |
} |
} |
|
|
|
|
Line 550 termp_it_post(DECL_ARGS) |
|
Line 550 termp_it_post(DECL_ARGS) |
|
p->offset = pair->offset; |
p->offset = pair->offset; |
p->rmargin = pair->rmargin; |
p->rmargin = pair->rmargin; |
|
|
if (MDOC_HEAD == node->type) { |
if (MDOC_HEAD == node->type) |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NORPAD; |
else if (MDOC_BODY == node->type) |
} else if (MDOC_BODY == node->type) |
|
p->flags &= ~TERMP_NOLPAD; |
p->flags &= ~TERMP_NOLPAD; |
} |
} |
|
|
Line 566 termp_nm_pre(DECL_ARGS) |
|
Line 565 termp_nm_pre(DECL_ARGS) |
|
if (SEC_SYNOPSIS == node->sec) |
if (SEC_SYNOPSIS == node->sec) |
newln(p); |
newln(p); |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]); |
if (NULL == node->child) |
if (NULL == node->child) |
word(p, meta->name); |
word(p, meta->name); |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_fl_pre(DECL_ARGS) |
termp_fl_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); |
word(p, "\\-"); |
word(p, "\\-"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
|
|
termp_ar_pre(DECL_ARGS) |
termp_ar_pre(DECL_ARGS) |
{ |
{ |
|
|
if (node->child) { |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]); |
if (NULL == node->child) { |
return(1); |
word(p, "file"); |
|
word(p, "..."); |
} |
} |
p->flags |= ttypes[TTYPE_CMD_ARG]; |
|
word(p, "file"); |
|
word(p, "..."); |
|
p->flags &= ~ttypes[TTYPE_CMD_ARG]; |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_rs_pre(DECL_ARGS) |
termp_rs_pre(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type && node->prev) |
vspace(p); |
vspace(p); |
return(1); |
return(1); |
} |
} |
Line 764 termp_vt_pre(DECL_ARGS) |
|
Line 761 termp_vt_pre(DECL_ARGS) |
|
{ |
{ |
|
|
/* FIXME: this can be "type name". */ |
/* FIXME: this can be "type name". */ |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); |
return(1); |
return(1); |
} |
} |
|
|
Line 788 termp_fd_pre(DECL_ARGS) |
|
Line 785 termp_fd_pre(DECL_ARGS) |
|
* FIXME: this naming is bad. This value is used, in general, |
* FIXME: this naming is bad. This value is used, in general, |
* for the #include header or other preprocessor statement. |
* for the #include header or other preprocessor statement. |
*/ |
*/ |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_fd_post(DECL_ARGS) |
termp_fd_post(DECL_ARGS) |
{ |
{ |
|
|
if (node->sec == SEC_SYNOPSIS) |
if (node->sec != SEC_SYNOPSIS) |
|
return; |
|
newln(p); |
|
if (node->next && MDOC_Fd != node->next->tok) |
vspace(p); |
vspace(p); |
} |
} |
|
|
Line 811 termp_sh_pre(DECL_ARGS) |
|
Line 811 termp_sh_pre(DECL_ARGS) |
|
switch (node->type) { |
switch (node->type) { |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
vspace(p); |
vspace(p); |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]); |
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
p->offset = INDENT; |
p->offset = INDENT; |
|
|
termp_ft_pre(DECL_ARGS) |
termp_ft_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_fn_post(DECL_ARGS) |
termp_fn_post(DECL_ARGS) |
{ |
{ |
|
|
if (node->sec == SEC_SYNOPSIS) |
if (node->sec == SEC_SYNOPSIS && node->next) |
vspace(p); |
vspace(p); |
|
|
} |
} |
|
|
termp_sx_pre(DECL_ARGS) |
termp_sx_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]); |
return(1); |
return(1); |
} |
} |
|
|
Line 1013 termp_fa_pre(DECL_ARGS) |
|
Line 1013 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(pair, ttypes[TTYPE_FUNC_ARG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_va_pre(DECL_ARGS) |
termp_va_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); |
return(1); |
return(1); |
} |
} |
|
|
Line 1054 termp_bd_pre(DECL_ARGS) |
|
Line 1054 termp_bd_pre(DECL_ARGS) |
|
int i; |
int i; |
|
|
if (MDOC_BLOCK == node->type) { |
if (MDOC_BLOCK == node->type) { |
vspace(p); |
if (node->prev) |
|
vspace(p); |
return(1); |
return(1); |
} else if (MDOC_BODY != node->type) |
} else if (MDOC_BODY != node->type) |
return(1); |
return(1); |
Line 1064 termp_bd_pre(DECL_ARGS) |
|
Line 1065 termp_bd_pre(DECL_ARGS) |
|
|
|
bl = &node->parent->data.block; |
bl = &node->parent->data.block; |
|
|
|
|
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); |
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); |
if (-1 != i) { |
if (-1 != i) { |
assert(1 == bl->argv[i].sz); |
assert(1 == bl->argv[i].sz); |
p->offset += arg_offset(&bl->argv[i]); |
p->offset += arg_offset(&bl->argv[i]); |
} |
} |
|
|
if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv)) |
|
return(1); |
|
|
|
p->flags |= TERMP_LITERAL; |
p->flags |= TERMP_LITERAL; |
|
|
for (n = node->child; n; n = n->next) { |
for (n = node->child; n; n = n->next) { |
assert(MDOC_TEXT == n->type); /* FIXME */ |
if (MDOC_TEXT != n->type) |
|
errx(1, "non-text displays unsupported"); |
if ((*n->data.text.string)) { |
if ((*n->data.text.string)) { |
word(p, n->data.text.string); |
word(p, n->data.text.string); |
flushln(p); |
flushln(p); |
Line 1139 termp_bsx_pre(DECL_ARGS) |
|
Line 1137 termp_bsx_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static void |
termp_bx_pre(DECL_ARGS) |
termp_bx_post(DECL_ARGS) |
{ |
{ |
|
|
|
p->flags |= TERMP_NOSPACE; |
word(p, "BSD"); |
word(p, "BSD"); |
return(1); |
|
} |
} |
|
|
|
|
Line 1241 termp_ss_pre(DECL_ARGS) |
|
Line 1239 termp_ss_pre(DECL_ARGS) |
|
switch (node->type) { |
switch (node->type) { |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
vspace(p); |
vspace(p); |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]); |
p->offset = INDENT / 2; |
p->offset = INDENT / 2; |
break; |
break; |
default: |
default: |
|
|
termp_pa_pre(DECL_ARGS) |
termp_pa_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_em_pre(DECL_ARGS) |
termp_em_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_cd_pre(DECL_ARGS) |
termp_cd_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_cm_pre(DECL_ARGS) |
termp_cm_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_ic_pre(DECL_ARGS) |
termp_ic_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); |
|
word(p, "#include"); |
|
word(p, "<"); |
|
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
termp_in_post(DECL_ARGS) |
|
{ |
|
|
|
p->flags |= TERMP_NOSPACE; |
|
word(p, ">"); |
|
|
|
newln(p); |
|
if (SEC_SYNOPSIS != node->sec) |
|
return; |
|
if (node->next && MDOC_In != node->next->tok) |
|
vspace(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
termp_at_pre(DECL_ARGS) |
termp_at_pre(DECL_ARGS) |
{ |
{ |
Line 1352 termp_bq_pre(DECL_ARGS) |
|
Line 1369 termp_bq_pre(DECL_ARGS) |
|
|
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return(1); |
return(1); |
word(p, "\\["); |
word(p, "["); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} |
} |
Line 1450 termp_bf_pre(DECL_ARGS) |
|
Line 1467 termp_bf_pre(DECL_ARGS) |
|
|
|
if (NULL == (n = b->head->child)) { |
if (NULL == (n = b->head->child)) { |
if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv)) |
if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv)) |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv)) |
else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv)) |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); |
|
|
return(1); |
return(1); |
} |
} |
Line 1460 termp_bf_pre(DECL_ARGS) |
|
Line 1477 termp_bf_pre(DECL_ARGS) |
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
|
|
if (0 == strcmp("Em", n->data.text.string)) |
if (0 == strcmp("Em", n->data.text.string)) |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
else if (0 == strcmp("Sy", n->data.text.string)) |
else if (0 == strcmp("Sy", n->data.text.string)) |
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
|
|
return(1); |
return(1); |
} |
} |
|
|
termp_sy_pre(DECL_ARGS) |
termp_sy_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_ms_pre(DECL_ARGS) |
termp_ms_pre(DECL_ARGS) |
{ |
{ |
|
|
TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]); |
return(1); |
return(1); |
} |
} |
|
|