version 1.26, 2009/07/12 16:52:41 |
version 1.29, 2009/07/12 17:45:17 |
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. */ |
/* |
|
* This is used to preserve a style of value across a macro, instead of |
|
* losing it while the body is processed. |
|
*/ |
struct termpair { |
struct termpair { |
struct termpair *ppair; |
struct termpair *ppair; |
int type; |
|
#define TERMPAIR_FLAG (1 << 0) |
|
int flag; /* Whether being used. */ |
int flag; /* Whether being used. */ |
size_t offset; /* Left margin. */ |
|
size_t rmargin; /* Right margin. */ |
size_t rmargin; /* Right margin. */ |
int count; /* Enum count. */ |
int count; /* Enum count. */ |
}; |
}; |
|
|
#define TERMPAIR_SETFLAG(termp, p, fl) \ |
|
do { \ |
|
assert(! (TERMPAIR_FLAG & (p)->type)); \ |
|
(termp)->flags |= (fl); \ |
|
(p)->flag = (fl); \ |
|
(p)->type |= TERMPAIR_FLAG; \ |
|
} while ( /* CONSTCOND */ 0) |
|
|
|
#define DECL_ARGS \ |
#define DECL_ARGS \ |
struct termp *p, struct termpair *pair, \ |
struct termp *p, struct termpair *pair, \ |
const struct mdoc_meta *meta, \ |
const struct mdoc_meta *meta, \ |
Line 355 print_node(DECL_ARGS) |
|
Line 346 print_node(DECL_ARGS) |
|
{ |
{ |
int dochild; |
int dochild; |
struct termpair npair; |
struct termpair npair; |
|
size_t offset; |
|
|
/* Pre-processing. */ |
/* Pre-processing. */ |
|
|
dochild = 1; |
dochild = 1; |
|
offset = p->offset; |
|
|
npair.ppair = pair; |
npair.ppair = pair; |
npair.type = 0; |
npair.rmargin = 0; |
npair.offset = npair.rmargin = 0; |
|
npair.flag = 0; |
npair.flag = 0; |
npair.count = 0; |
npair.count = 0; |
|
|
Line 374 print_node(DECL_ARGS) |
|
Line 367 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->flags &= ~npair.flag; |
} |
} |
|
|
|
|
Line 716 termp_it_pre(DECL_ARGS) |
|
Line 708 termp_it_pre(DECL_ARGS) |
|
|
|
/* Save parent attributes. */ |
/* Save parent attributes. */ |
|
|
pair->offset = p->offset; |
|
pair->rmargin = p->rmargin; |
pair->rmargin = p->rmargin; |
pair->flag = p->flags; |
pair->flag = p->flags; |
|
|
Line 908 termp_it_pre(DECL_ARGS) |
|
Line 899 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 980 termp_it_post(DECL_ARGS) |
|
Line 971 termp_it_post(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
p->offset = pair->offset; |
|
p->rmargin = pair->rmargin; |
p->rmargin = pair->rmargin; |
p->flags = pair->flag; |
p->flags = pair->flag; |
} |
} |
Line 994 termp_nm_pre(DECL_ARGS) |
|
Line 984 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); |
} |
} |
|
|
Line 1137 termp_nd_pre(DECL_ARGS) |
|
Line 1130 termp_nd_pre(DECL_ARGS) |
|
* produces a minus sign after the Nd, which is wrong, but is |
* produces a minus sign after the Nd, which is wrong, but is |
* consistent with the historic OpenBSD tmac file. |
* consistent with the historic OpenBSD tmac file. |
*/ |
*/ |
#ifdef __OpenBSD__ |
#if defined(__OpenBSD__) || defined(__linux__) |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
#else |
#else |
term_word(p, "\\(em"); |
term_word(p, "\\(em"); |
Line 1196 termp_vt_pre(DECL_ARGS) |
|
Line 1189 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 1232 termp_fd_post(DECL_ARGS) |
|
Line 1221 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 1246 termp_sh_pre(DECL_ARGS) |
|
Line 1236 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 1348 termp_d1_pre(DECL_ARGS) |
|
Line 1338 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 1362 termp_d1_post(DECL_ARGS) |
|
Line 1351 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 1399 termp_ft_pre(DECL_ARGS) |
|
Line 1387 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); |
} |
} |
|
|
|
|
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 1475 termp_fa_pre(DECL_ARGS) |
|
Line 1463 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 1531 termp_bd_pre(DECL_ARGS) |
|
Line 1519 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 1602 termp_bd_post(DECL_ARGS) |
|
Line 1588 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 1736 termp_ss_pre(DECL_ARGS) |
|
Line 1721 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) |
{ |
{ |
|
|
/* XXX This conforms to new-groff style. */ |
pair->flag |= ttypes[TTYPE_INCLUDE]; |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); |
p->flags |= ttypes[TTYPE_INCLUDE]; |
|
|
if (SEC_SYNOPSIS == node->sec) |
if (SEC_SYNOPSIS == node->sec) |
term_word(p, "#include"); |
term_word(p, "#include"); |
Line 1993 termp_bf_pre(DECL_ARGS) |
|
Line 1972 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 2118 termp_lk_pre(DECL_ARGS) |
|
Line 2097 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); |
} |
} |
|
|