version 1.51, 2009/07/21 13:34:13 |
version 1.54, 2009/07/21 15:03:37 |
Line 65 const int ttypes[TTYPE_NMAX] = { |
|
Line 65 const int ttypes[TTYPE_NMAX] = { |
|
TERMP_UNDER, /* TTYPE_FUNC_ARG */ |
TERMP_UNDER, /* TTYPE_FUNC_ARG */ |
TERMP_UNDER, /* TTYPE_LINK */ |
TERMP_UNDER, /* TTYPE_LINK */ |
TERMP_BOLD, /* TTYPE_SSECTION */ |
TERMP_BOLD, /* TTYPE_SSECTION */ |
TERMP_UNDER, /* TTYPE_FILE */ |
0, /* TTYPE_FILE */ |
TERMP_UNDER, /* TTYPE_EMPH */ |
TERMP_UNDER, /* TTYPE_EMPH */ |
TERMP_BOLD, /* TTYPE_CONFIG */ |
TERMP_BOLD, /* TTYPE_CONFIG */ |
TERMP_BOLD, /* TTYPE_CMD */ |
TERMP_BOLD, /* TTYPE_CMD */ |
Line 154 static int termp_nd_pre(DECL_ARGS); |
|
Line 154 static int termp_nd_pre(DECL_ARGS); |
|
static int termp_nm_pre(DECL_ARGS); |
static int termp_nm_pre(DECL_ARGS); |
static int termp_ns_pre(DECL_ARGS); |
static int termp_ns_pre(DECL_ARGS); |
static int termp_op_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_pf_pre(DECL_ARGS); |
static int termp_pp_pre(DECL_ARGS); |
static int termp_pp_pre(DECL_ARGS); |
static int termp_pq_pre(DECL_ARGS); |
static int termp_pq_pre(DECL_ARGS); |
Line 210 static const struct termact termacts[MDOC_MAX] = { |
|
Line 209 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_nm_pre, NULL }, /* Nm */ |
{ termp_nm_pre, NULL }, /* Nm */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ termp_pa_pre, NULL }, /* Pa */ |
{ NULL, NULL }, /* Pa */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_va_pre, NULL }, /* Va */ |
{ termp_va_pre, NULL }, /* Va */ |
Line 309 static int arg_getattr(int, const struct mdoc_node * |
|
Line 308 static int arg_getattr(int, const struct mdoc_node * |
|
static size_t arg_offset(const struct mdoc_argv *); |
static size_t arg_offset(const struct mdoc_argv *); |
static size_t arg_width(const struct mdoc_argv *, int); |
static size_t arg_width(const struct mdoc_argv *, int); |
static int arg_listtype(const struct mdoc_node *); |
static int arg_listtype(const struct mdoc_node *); |
static int fmt_block_vspace(struct termp *, |
static void fmt_block_vspace(struct termp *, |
const struct mdoc_node *, |
const struct mdoc_node *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static void print_node(DECL_ARGS); |
static void print_node(DECL_ARGS); |
Line 660 arg_getattrs(const int *keys, int *vals, |
|
Line 659 arg_getattrs(const int *keys, int *vals, |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static void |
fmt_block_vspace(struct termp *p, |
fmt_block_vspace(struct termp *p, |
const struct mdoc_node *bl, |
const struct mdoc_node *bl, |
const struct mdoc_node *node) |
const struct mdoc_node *node) |
Line 670 fmt_block_vspace(struct termp *p, |
|
Line 669 fmt_block_vspace(struct termp *p, |
|
term_newln(p); |
term_newln(p); |
|
|
if (arg_hasattr(MDOC_Compact, bl)) |
if (arg_hasattr(MDOC_Compact, bl)) |
return(1); |
return; |
/* XXX - not documented! */ |
|
else if (arg_hasattr(MDOC_Column, bl)) |
|
return(1); |
|
|
|
|
/* |
|
* Search through our prior nodes. If we follow a `Ss' or `Sh', |
|
* then don't vspace. |
|
*/ |
|
|
for (n = node; n; n = n->parent) { |
for (n = node; n; n = n->parent) { |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
continue; |
continue; |
if (MDOC_Ss == n->tok) |
if (MDOC_Ss == n->tok) |
break; |
return; |
if (MDOC_Sh == n->tok) |
if (MDOC_Sh == n->tok) |
break; |
return; |
if (NULL == n->prev) |
if (NULL == n->prev) |
continue; |
continue; |
term_vspace(p); |
|
break; |
break; |
} |
} |
|
|
return(1); |
/* |
|
* XXX - not documented: a `-column' does not ever assert |
|
* vertical space within the list. |
|
*/ |
|
|
|
if (arg_hasattr(MDOC_Column, bl)) |
|
if (node->prev && MDOC_It == node->prev->tok) |
|
return; |
|
|
|
term_vspace(p); |
} |
} |
|
|
|
|
Line 728 termp_it_pre(DECL_ARGS) |
|
Line 737 termp_it_pre(DECL_ARGS) |
|
int i, type, keys[3], vals[3]; |
int i, type, keys[3], vals[3]; |
size_t width, offset; |
size_t width, offset; |
|
|
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type) { |
return(fmt_block_vspace(p, node->parent->parent, node)); |
fmt_block_vspace(p, node->parent->parent, node); |
|
return(1); |
|
} |
|
|
bl = node->parent->parent->parent; |
bl = node->parent->parent->parent; |
|
|
Line 1015 termp_it_post(DECL_ARGS) |
|
Line 1026 termp_it_post(DECL_ARGS) |
|
switch (type) { |
switch (type) { |
case (MDOC_Item): |
case (MDOC_Item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (MDOC_Inset): |
if (MDOC_BODY == node->type) |
if (MDOC_BODY == node->type) |
term_flushln(p); |
term_flushln(p); |
Line 1530 termp_bd_pre(DECL_ARGS) |
|
Line 1543 termp_bd_pre(DECL_ARGS) |
|
* line. Blank lines are allowed. |
* line. Blank lines are allowed. |
*/ |
*/ |
|
|
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type) { |
return(fmt_block_vspace(p, node, node)); |
fmt_block_vspace(p, node, node); |
else if (MDOC_BODY != node->type) |
|
return(1); |
return(1); |
|
} else if (MDOC_BODY != node->type) |
|
return(1); |
|
|
/* FIXME: display type should be mandated by parser. */ |
/* FIXME: display type should be mandated by parser. */ |
|
|
Line 1756 termp_ss_post(DECL_ARGS) |
|
Line 1770 termp_ss_post(DECL_ARGS) |
|
|
|
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
term_newln(p); |
term_newln(p); |
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_pa_pre(DECL_ARGS) |
|
{ |
|
|
|
pair->flag |= ttypes[TTYPE_FILE]; |
|
return(1); |
|
} |
} |
|
|
|
|