version 1.152, 2010/06/12 12:38:01 |
version 1.187, 2010/09/25 16:41:33 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
void (*post)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
}; |
}; |
|
|
static size_t a2width(const struct mdoc_argv *, int); |
static size_t a2width(const struct termp *, const char *); |
static size_t a2height(const struct mdoc_node *); |
static size_t a2height(const struct termp *, const char *); |
static size_t a2offs(const char *); |
static size_t a2offs(const struct termp *, const char *); |
|
|
static int arg_hasattr(int, const struct mdoc_node *); |
|
static int arg_getattrs(const int *, int *, size_t, |
|
const struct mdoc_node *); |
|
static int arg_getattr(int, const struct mdoc_node *); |
|
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct mdoc_node *, |
const struct mdoc_node *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
Line 74 static void termp____post(DECL_ARGS); |
|
Line 71 static void termp____post(DECL_ARGS); |
|
static void termp_an_post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
static void termp_aq_post(DECL_ARGS); |
static void termp_aq_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
|
static void termp_bk_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
static void termp_bq_post(DECL_ARGS); |
static void termp_bq_post(DECL_ARGS); |
static void termp_brq_post(DECL_ARGS); |
static void termp_brq_post(DECL_ARGS); |
Line 85 static void termp_fo_post(DECL_ARGS); |
|
Line 83 static void termp_fo_post(DECL_ARGS); |
|
static void termp_in_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
|
static void termp_nm_post(DECL_ARGS); |
static void termp_op_post(DECL_ARGS); |
static void termp_op_post(DECL_ARGS); |
static void termp_pf_post(DECL_ARGS); |
static void termp_pf_post(DECL_ARGS); |
static void termp_pq_post(DECL_ARGS); |
static void termp_pq_post(DECL_ARGS); |
Line 93 static void termp_sh_post(DECL_ARGS); |
|
Line 92 static void termp_sh_post(DECL_ARGS); |
|
static void termp_sq_post(DECL_ARGS); |
static void termp_sq_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
|
|
|
static int termp__a_pre(DECL_ARGS); |
static int termp_an_pre(DECL_ARGS); |
static int termp_an_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
static int termp_bd_pre(DECL_ARGS); |
static int termp_bd_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
|
static int termp_bk_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
Line 151 static const struct termact termacts[MDOC_MAX] = { |
|
Line 152 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ termp_it_pre, termp_it_post }, /* It */ |
{ termp_it_pre, termp_it_post }, /* It */ |
{ NULL, NULL }, /* Ad */ |
{ termp_under_pre, NULL }, /* Ad */ |
{ termp_an_pre, termp_an_post }, /* An */ |
{ termp_an_pre, termp_an_post }, /* An */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_cd_pre, NULL }, /* Cd */ |
{ termp_cd_pre, NULL }, /* Cd */ |
Line 169 static const struct termact termacts[MDOC_MAX] = { |
|
Line 170 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nm_pre, NULL }, /* Nm */ |
{ termp_nm_pre, termp_nm_post }, /* Nm */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_under_pre, NULL }, /* Pa */ |
Line 178 static const struct termact termacts[MDOC_MAX] = { |
|
Line 179 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ NULL, termp____post }, /* %A */ |
{ termp__a_pre, termp____post }, /* %A */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ NULL, termp____post }, /* %D */ |
{ NULL, termp____post }, /* %D */ |
{ termp_under_pre, termp____post }, /* %I */ |
{ termp_under_pre, termp____post }, /* %I */ |
Line 208 static const struct termact termacts[MDOC_MAX] = { |
|
Line 209 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_under_pre, NULL }, /* Em */ |
{ termp_under_pre, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ NULL, NULL }, /* No */ |
{ NULL, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Nx */ |
Line 237 static const struct termact termacts[MDOC_MAX] = { |
|
Line 238 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fc */ |
{ NULL, NULL }, /* Fc */ |
{ termp_op_pre, termp_op_post }, /* Oo */ |
{ termp_op_pre, termp_op_post }, /* Oo */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Bk */ |
{ termp_bk_pre, termp_bk_post }, /* Bk */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ termp_bt_pre, NULL }, /* Bt */ |
{ termp_bt_pre, NULL }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
Line 273 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 274 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
|
|
p->overstep = 0; |
p->overstep = 0; |
p->maxrmargin = p->defrmargin; |
p->maxrmargin = p->defrmargin; |
p->tabwidth = 5; |
p->tabwidth = term_len(p, 5); |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
Line 324 print_mdoc_node(DECL_ARGS) |
|
Line 325 print_mdoc_node(DECL_ARGS) |
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
npair.ppair = pair; |
npair.ppair = pair; |
|
|
if (MDOC_TEXT != n->type) { |
if (MDOC_TEXT == n->type) |
if (termacts[n->tok].pre) |
|
chld = (*termacts[n->tok].pre)(p, &npair, m, n); |
|
} else |
|
term_word(p, n->string); |
term_word(p, n->string); |
|
else if (termacts[n->tok].pre && ENDBODY_NOT == n->end) |
|
chld = (*termacts[n->tok].pre)(p, &npair, m, n); |
|
|
|
/* |
|
* Keeps only work until the end of a line. If a keep was |
|
* invoked in a prior line, revert it to PREKEEP. |
|
*/ |
|
|
|
if (TERMP_KEEP & p->flags) { |
|
if (n->prev && n->prev->line != n->line) { |
|
p->flags &= ~TERMP_KEEP; |
|
p->flags |= TERMP_PREKEEP; |
|
} else if (NULL == n->prev) { |
|
if (n->parent && n->parent->line != n->line) { |
|
p->flags &= ~TERMP_KEEP; |
|
p->flags |= TERMP_PREKEEP; |
|
} |
|
} |
|
} |
|
|
if (chld && n->child) |
if (chld && n->child) |
print_mdoc_nodelist(p, &npair, m, n->child); |
print_mdoc_nodelist(p, &npair, m, n->child); |
|
|
term_fontpopq(p, font); |
term_fontpopq(p, font); |
|
|
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type && termacts[n->tok].post && |
if (termacts[n->tok].post) |
! (MDOC_ENDED & n->flags)) { |
(*termacts[n->tok].post)(p, &npair, m, n); |
(void)(*termacts[n->tok].post)(p, &npair, m, n); |
|
|
|
/* |
|
* Explicit end tokens not only call the post |
|
* handler, but also tell the respective block |
|
* that it must not call the post handler again. |
|
*/ |
|
if (ENDBODY_NOT != n->end) |
|
n->pending->flags |= MDOC_ENDED; |
|
|
|
/* |
|
* End of line terminating an implicit block |
|
* while an explicit block is still open. |
|
* Continue the explicit block without spacing. |
|
*/ |
|
if (ENDBODY_NOSPACE == n->end) |
|
p->flags |= TERMP_NOSPACE; |
|
} |
|
|
if (MDOC_EOS & n->flags) |
if (MDOC_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
|
|
Line 371 print_mdoc_foot(struct termp *p, const void *arg) |
|
Line 405 print_mdoc_foot(struct termp *p, const void *arg) |
|
term_vspace(p); |
term_vspace(p); |
|
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; |
p->rmargin = (p->maxrmargin - |
|
term_strlen(p, buf) + term_len(p, 1)) / 2; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
|
|
term_word(p, os); |
term_word(p, os); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - strlen(os); |
p->rmargin = p->maxrmargin - term_strlen(p, os); |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
|
|
term_word(p, buf); |
term_word(p, buf); |
Line 434 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 469 print_mdoc_head(struct termp *p, const void *arg) |
|
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
|
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; |
p->rmargin = (p->maxrmargin - |
|
term_strlen(p, buf) + term_len(p, 1)) / 2; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - strlen(title); |
p->rmargin = p->maxrmargin - term_strlen(p, title); |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
|
|
term_word(p, buf); |
term_word(p, buf); |
Line 462 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 498 print_mdoc_head(struct termp *p, const void *arg) |
|
|
|
|
|
static size_t |
static size_t |
a2height(const struct mdoc_node *n) |
a2height(const struct termp *p, const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
assert(MDOC_TEXT == n->type); |
assert(v); |
assert(n->string); |
if ( ! a2roffsu(v, &su, SCALE_VS)) |
if ( ! a2roffsu(n->string, &su, SCALE_VS)) |
SCALE_VS_INIT(&su, term_len(p, 1)); |
SCALE_VS_INIT(&su, strlen(n->string)); |
|
|
|
return(term_vspan(&su)); |
return(term_vspan(p, &su)); |
} |
} |
|
|
|
|
static size_t |
static size_t |
a2width(const struct mdoc_argv *arg, int pos) |
a2width(const struct termp *p, const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
assert(arg->value[pos]); |
assert(v); |
if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX)) |
if ( ! a2roffsu(v, &su, SCALE_MAX)) |
SCALE_HS_INIT(&su, strlen(arg->value[pos])); |
SCALE_HS_INIT(&su, term_strlen(p, v)); |
|
|
return(term_hspan(&su)); |
return(term_hspan(p, &su)); |
} |
} |
|
|
|
|
static size_t |
static size_t |
a2offs(const char *v) |
a2offs(const struct termp *p, const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
Line 498 a2offs(const char *v) |
|
Line 533 a2offs(const char *v) |
|
else if (0 == strcmp(v, "left")) |
else if (0 == strcmp(v, "left")) |
return(0); |
return(0); |
else if (0 == strcmp(v, "indent")) |
else if (0 == strcmp(v, "indent")) |
return(INDENT + 1); |
return(term_len(p, INDENT + 1)); |
else if (0 == strcmp(v, "indent-two")) |
else if (0 == strcmp(v, "indent-two")) |
return((INDENT + 1) * 2); |
return(term_len(p, (INDENT + 1) * 2)); |
else if ( ! a2roffsu(v, &su, SCALE_MAX)) |
else if ( ! a2roffsu(v, &su, SCALE_MAX)) |
SCALE_HS_INIT(&su, strlen(v)); |
SCALE_HS_INIT(&su, term_strlen(p, v)); |
|
|
return(term_hspan(&su)); |
return(term_hspan(p, &su)); |
} |
} |
|
|
|
|
/* |
/* |
* Return 1 if an argument has a particular argument value or 0 if it |
|
* does not. See arg_getattr(). |
|
*/ |
|
static int |
|
arg_hasattr(int arg, const struct mdoc_node *n) |
|
{ |
|
|
|
return(-1 != arg_getattr(arg, n)); |
|
} |
|
|
|
|
|
/* |
|
* Get the index of an argument in a node's argument list or -1 if it |
|
* does not exist. See arg_getattrs(). |
|
*/ |
|
static int |
|
arg_getattr(int v, const struct mdoc_node *n) |
|
{ |
|
int val; |
|
|
|
return(arg_getattrs(&v, &val, 1, n) ? val : -1); |
|
} |
|
|
|
|
|
/* |
|
* Walk through the argument list for a node and fill an array "vals" |
|
* with the positions of the argument structures listed in "keys". |
|
* Return the number of elements that were written into "vals", which |
|
* can be zero. |
|
*/ |
|
static int |
|
arg_getattrs(const int *keys, int *vals, |
|
size_t sz, const struct mdoc_node *n) |
|
{ |
|
int i, j, k; |
|
|
|
if (NULL == n->args) |
|
return(0); |
|
|
|
for (k = i = 0; i < (int)n->args->argc; i++) |
|
for (j = 0; j < (int)sz; j++) |
|
if (n->args->argv[i].arg == keys[j]) { |
|
vals[j] = i; |
|
k++; |
|
} |
|
return(k); |
|
} |
|
|
|
|
|
/* |
|
* Determine how much space to print out before block elements of `It' |
* Determine how much space to print out before block elements of `It' |
* (and thus `Bl') and `Bd'. And then go ahead and print that space, |
* (and thus `Bl') and `Bd'. And then go ahead and print that space, |
* too. |
* too. |
Line 572 print_bvspace(struct termp *p, |
|
Line 557 print_bvspace(struct termp *p, |
|
|
|
term_newln(p); |
term_newln(p); |
|
|
if (MDOC_Bd == bl->tok && bl->data.Bd.comp) |
if (MDOC_Bd == bl->tok && bl->data.Bd->comp) |
return; |
return; |
if (MDOC_Bl == bl->tok && bl->data.Bl.comp) |
if (MDOC_Bl == bl->tok && bl->data.Bl->comp) |
return; |
return; |
|
|
/* Do not vspace directly after Ss/Sh. */ |
/* Do not vspace directly after Ss/Sh. */ |
Line 593 print_bvspace(struct termp *p, |
|
Line 578 print_bvspace(struct termp *p, |
|
|
|
/* A `-column' does not assert vspace within the list. */ |
/* A `-column' does not assert vspace within the list. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type) |
if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl->type) |
if (n->prev && MDOC_It == n->prev->tok) |
if (n->prev && MDOC_It == n->prev->tok) |
return; |
return; |
|
|
/* A `-diag' without body does not vspace. */ |
/* A `-diag' without body does not vspace. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type) |
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl->type) |
if (n->prev && MDOC_It == n->prev->tok) { |
if (n->prev && MDOC_It == n->prev->tok) { |
assert(n->prev->body); |
assert(n->prev->body); |
if (NULL == n->prev->body->child) |
if (NULL == n->prev->body->child) |
Line 643 termp_it_pre(DECL_ARGS) |
|
Line 628 termp_it_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *bl, *nn; |
const struct mdoc_node *bl, *nn; |
char buf[7]; |
char buf[7]; |
int i, keys[2], vals[2]; |
int i; |
size_t width, offset, ncols, dcol; |
size_t width, offset, ncols, dcol; |
enum mdoc_list type; |
enum mdoc_list type; |
|
|
Line 653 termp_it_pre(DECL_ARGS) |
|
Line 638 termp_it_pre(DECL_ARGS) |
|
} |
} |
|
|
bl = n->parent->parent->parent; |
bl = n->parent->parent->parent; |
|
assert(bl->data.Bl); |
|
type = bl->data.Bl->type; |
|
|
/* Get list width, offset, and list type from argument list. */ |
|
|
|
keys[0] = MDOC_Width; |
|
keys[1] = MDOC_Column; |
|
|
|
vals[0] = vals[1] = -1; |
|
|
|
arg_getattrs(keys, vals, 2, bl); |
|
|
|
type = bl->data.Bl.type; |
|
|
|
/* |
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
* we're a -column list, in which case all prior columns must |
* we're a -column list, in which case all prior columns must |
Line 673 termp_it_pre(DECL_ARGS) |
|
Line 649 termp_it_pre(DECL_ARGS) |
|
|
|
width = offset = 0; |
width = offset = 0; |
|
|
if (bl->data.Bl.offs) |
if (bl->data.Bl->offs) |
offset = a2offs(bl->data.Bl.offs); |
offset = a2offs(p, bl->data.Bl->offs); |
|
|
|
|
switch (type) { |
switch (type) { |
case (LIST_column): |
case (LIST_column): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
break; |
break; |
|
|
/* |
/* |
* Imitate groff's column handling: |
* Imitate groff's column handling: |
* - For each earlier column, add its width. |
* - For each earlier column, add its width. |
Line 690 termp_it_pre(DECL_ARGS) |
|
Line 666 termp_it_pre(DECL_ARGS) |
|
* column. |
* column. |
* - For more than 5 columns, add only one column. |
* - For more than 5 columns, add only one column. |
*/ |
*/ |
ncols = bl->args->argv[vals[1]].sz; |
ncols = bl->data.Bl->ncols; |
|
|
/* LINTED */ |
/* LINTED */ |
dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; |
dcol = ncols < 5 ? term_len(p, 4) : |
|
ncols == 5 ? term_len(p, 3) : term_len(p, 1); |
|
|
/* |
/* |
* Calculate the offset by applying all prior MDOC_BODY, |
* Calculate the offset by applying all prior MDOC_BODY, |
Line 703 termp_it_pre(DECL_ARGS) |
|
Line 681 termp_it_pre(DECL_ARGS) |
|
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) |
offset += dcol + a2width |
offset += dcol + a2width |
(&bl->args->argv[vals[1]], i); |
(p, bl->data.Bl->cols[i]); |
|
|
|
|
/* |
/* |
* When exceeding the declared number of columns, leave |
* When exceeding the declared number of columns, leave |
* the remaining widths at 0. This will later be |
* the remaining widths at 0. This will later be |
Line 719 termp_it_pre(DECL_ARGS) |
|
Line 696 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
width = a2width(&bl->args->argv[vals[1]], i) + dcol; |
width = a2width(p, bl->data.Bl->cols[i]) + dcol; |
break; |
break; |
default: |
default: |
if (vals[0] < 0) |
if (NULL == bl->data.Bl->width) |
break; |
break; |
|
|
/* |
/* |
Line 730 termp_it_pre(DECL_ARGS) |
|
Line 707 termp_it_pre(DECL_ARGS) |
|
* number for buffering single arguments. See the above |
* number for buffering single arguments. See the above |
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
width = a2width(&bl->args->argv[vals[0]], 0) + 2; |
assert(bl->data.Bl->width); |
|
width = a2width(p, bl->data.Bl->width) + term_len(p, 2); |
break; |
break; |
} |
} |
|
|
Line 746 termp_it_pre(DECL_ARGS) |
|
Line 724 termp_it_pre(DECL_ARGS) |
|
case (LIST_dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
if (width < 4) |
if (width < term_len(p, 4)) |
width = 4; |
width = term_len(p, 4); |
break; |
break; |
case (LIST_enum): |
case (LIST_enum): |
if (width < 5) |
if (width < term_len(p, 5)) |
width = 5; |
width = term_len(p, 5); |
break; |
break; |
case (LIST_hang): |
case (LIST_hang): |
if (0 == width) |
if (0 == width) |
width = 8; |
width = term_len(p, 8); |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_tag): |
case (LIST_tag): |
if (0 == width) |
if (0 == width) |
width = 10; |
width = term_len(p, 10); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 992 termp_it_post(DECL_ARGS) |
|
Line 970 termp_it_post(DECL_ARGS) |
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
return; |
return; |
|
|
type = n->parent->parent->parent->data.Bl.type; |
type = n->parent->parent->parent->data.Bl->type; |
|
|
switch (type) { |
switch (type) { |
case (LIST_item): |
case (LIST_item): |
|
|
termp_nm_pre(DECL_ARGS) |
termp_nm_pre(DECL_ARGS) |
{ |
{ |
|
|
if (NULL == n->child && NULL == m->name) |
if (MDOC_BLOCK == n->type) |
return(1); |
return(1); |
|
|
synopsis_pre(p, n); |
if (MDOC_BODY == n->type) { |
|
if (NULL == n->child) |
|
return(0); |
|
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
|
p->offset += term_len(p, 1) + |
|
(NULL == n->prev->child ? term_strlen(p, m->name) : |
|
MDOC_TEXT == n->prev->child->type ? |
|
term_strlen(p, n->prev->child->string) : |
|
term_len(p, 5)); |
|
return(1); |
|
} |
|
|
|
if (NULL == n->child && NULL == m->name) |
|
return(0); |
|
|
|
if (MDOC_HEAD == n->type) |
|
synopsis_pre(p, n->parent); |
|
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
|
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
|
p->rmargin = p->offset + term_len(p, 1); |
|
if (NULL == n->child) { |
|
p->rmargin += term_strlen(p, m->name); |
|
} else if (MDOC_TEXT == n->child->type) { |
|
p->rmargin += term_strlen(p, n->child->string); |
|
if (n->child->next) |
|
p->flags |= TERMP_HANG; |
|
} else { |
|
p->rmargin += term_len(p, 5); |
|
p->flags |= TERMP_HANG; |
|
} |
|
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
if (NULL == n->child) |
if (NULL == n->child) |
term_word(p, m->name); |
term_word(p, m->name); |
Line 1044 termp_nm_pre(DECL_ARGS) |
|
Line 1053 termp_nm_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
termp_nm_post(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
|
term_flushln(p); |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
|
} else if (MDOC_BODY == n->type && n->child) { |
|
term_flushln(p); |
|
p->flags &= ~TERMP_NOLPAD; |
|
} |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
termp_fl_pre(DECL_ARGS) |
termp_fl_pre(DECL_ARGS) |
{ |
{ |
Line 1062 termp_fl_pre(DECL_ARGS) |
|
Line 1086 termp_fl_pre(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
|
termp__a_pre(DECL_ARGS) |
|
{ |
|
|
|
if (n->prev && MDOC__A == n->prev->tok) |
|
if (NULL == n->next || MDOC__A != n->next->tok) |
|
term_word(p, "and"); |
|
|
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
termp_an_pre(DECL_ARGS) |
termp_an_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1107 termp_an_post(DECL_ARGS) |
|
Line 1144 termp_an_post(DECL_ARGS) |
|
return; |
return; |
} |
} |
|
|
if (arg_hasattr(MDOC_Split, n)) { |
if (AUTH_split == n->data.An.auth) { |
p->flags &= ~TERMP_NOSPLIT; |
p->flags &= ~TERMP_NOSPLIT; |
p->flags |= TERMP_SPLIT; |
p->flags |= TERMP_SPLIT; |
} else { |
} else if (AUTH_nosplit == n->data.An.auth) { |
p->flags &= ~TERMP_SPLIT; |
p->flags &= ~TERMP_SPLIT; |
p->flags |= TERMP_NOSPLIT; |
p->flags |= TERMP_NOSPLIT; |
} |
} |
Line 1301 synopsis_pre(struct termp *p, const struct mdoc_node * |
|
Line 1338 synopsis_pre(struct termp *p, const struct mdoc_node * |
|
* Obviously, if we're not in a SYNOPSIS or no prior macros |
* Obviously, if we're not in a SYNOPSIS or no prior macros |
* exist, do nothing. |
* exist, do nothing. |
*/ |
*/ |
if (NULL == n->prev || SEC_SYNOPSIS != n->sec) |
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
return; |
return; |
|
|
/* |
/* |
Line 1402 termp_sh_pre(DECL_ARGS) |
|
Line 1439 termp_sh_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
p->offset = INDENT; |
p->offset = term_len(p, INDENT); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 1487 termp_d1_pre(DECL_ARGS) |
|
Line 1524 termp_d1_pre(DECL_ARGS) |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
term_newln(p); |
term_newln(p); |
p->offset += (INDENT + 1); |
p->offset += term_len(p, (INDENT + 1)); |
return(1); |
return(1); |
} |
} |
|
|
Line 1566 termp_fn_pre(DECL_ARGS) |
|
Line 1603 termp_fn_pre(DECL_ARGS) |
|
|
|
term_word(p, ")"); |
term_word(p, ")"); |
|
|
if (SEC_SYNOPSIS == n->sec) |
if (MDOC_SYNPRETTY & n->flags) |
term_word(p, ";"); |
term_word(p, ";"); |
|
|
return(0); |
return(0); |
Line 1604 termp_fa_pre(DECL_ARGS) |
|
Line 1641 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
size_t tabwidth; |
size_t tabwidth, rm, rmax; |
size_t rm, rmax; |
|
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
Line 1614 termp_bd_pre(DECL_ARGS) |
|
Line 1650 termp_bd_pre(DECL_ARGS) |
|
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
if (n->data.Bd.offs) |
assert(n->data.Bd); |
p->offset += a2offs(n->data.Bd.offs); |
if (n->data.Bd->offs) |
|
p->offset += a2offs(p, n->data.Bd->offs); |
|
|
/* |
/* |
* If -ragged or -filled are specified, the block does nothing |
* If -ragged or -filled are specified, the block does nothing |
Line 1625 termp_bd_pre(DECL_ARGS) |
|
Line 1662 termp_bd_pre(DECL_ARGS) |
|
* lines are allowed. |
* lines are allowed. |
*/ |
*/ |
|
|
if (DISP_literal != n->data.Bd.type && |
if (DISP_literal != n->data.Bd->type && |
DISP_unfilled != n->data.Bd.type) |
DISP_unfilled != n->data.Bd->type) |
return(1); |
return(1); |
|
|
tabwidth = p->tabwidth; |
tabwidth = p->tabwidth; |
p->tabwidth = 8; |
p->tabwidth = term_len(p, 8); |
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
p->flags |= TERMP_NOSPACE; |
|
print_mdoc_node(p, pair, m, nn); |
print_mdoc_node(p, pair, m, nn); |
if (NULL == nn->prev || |
if (nn->next && nn->next->line == nn->line) |
nn->prev->line < nn->line || |
continue; |
NULL == nn->next) |
term_flushln(p); |
term_flushln(p); |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
p->tabwidth = tabwidth; |
p->tabwidth = tabwidth; |
Line 1663 termp_bd_post(DECL_ARGS) |
|
Line 1699 termp_bd_post(DECL_ARGS) |
|
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
|
|
if (DISP_literal == n->data.Bd.type || |
assert(n->data.Bd); |
DISP_unfilled == n->data.Bd.type) |
if (DISP_literal == n->data.Bd->type || |
|
DISP_unfilled == n->data.Bd->type) |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1805 termp_ss_pre(DECL_ARGS) |
|
Line 1842 termp_ss_pre(DECL_ARGS) |
|
break; |
break; |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
p->offset = HALFINDENT; |
p->offset = term_len(p, HALFINDENT); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 1843 termp_in_pre(DECL_ARGS) |
|
Line 1880 termp_in_pre(DECL_ARGS) |
|
|
|
synopsis_pre(p, n); |
synopsis_pre(p, n); |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) { |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "#include"); |
term_word(p, "#include"); |
term_word(p, "<"); |
term_word(p, "<"); |
|
|
termp_in_post(DECL_ARGS) |
termp_in_post(DECL_ARGS) |
{ |
{ |
|
|
if (SEC_SYNOPSIS == n->sec) |
if (MDOC_SYNPRETTY & n->flags) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
|
|
if (SEC_SYNOPSIS == n->sec) |
if (MDOC_SYNPRETTY & n->flags) |
term_fontpop(p); |
term_fontpop(p); |
} |
} |
|
|
Line 1881 termp_sp_pre(DECL_ARGS) |
|
Line 1918 termp_sp_pre(DECL_ARGS) |
|
|
|
switch (n->tok) { |
switch (n->tok) { |
case (MDOC_sp): |
case (MDOC_sp): |
len = n->child ? a2height(n->child) : 1; |
len = n->child ? a2height(p, n->child->string) : 1; |
break; |
break; |
case (MDOC_br): |
case (MDOC_br): |
len = 0; |
len = 0; |
break; |
break; |
default: |
default: |
|
assert(n->parent); |
|
if ((NULL == n->next || NULL == n->prev) && |
|
(MDOC_Ss == n->parent->tok || |
|
MDOC_Sh == n->parent->tok)) |
|
return(0); |
len = 1; |
len = 1; |
break; |
break; |
} |
} |
Line 1989 termp_fo_pre(DECL_ARGS) |
|
Line 2031 termp_fo_pre(DECL_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
if (NULL == n->child) |
|
return(0); |
|
|
/* XXX: we drop non-initial arguments as per groff. */ |
/* XXX: we drop non-initial arguments as per groff. */ |
|
|
assert(n->child); |
|
assert(n->child->string); |
assert(n->child->string); |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->child->string); |
term_word(p, n->child->string); |
Line 2010 termp_fo_post(DECL_ARGS) |
|
Line 2054 termp_fo_post(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ")"); |
term_word(p, ")"); |
|
|
if (SEC_SYNOPSIS == n->sec) { |
if (MDOC_SYNPRETTY & n->flags) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ";"); |
term_word(p, ";"); |
} |
} |
Line 2021 termp_fo_post(DECL_ARGS) |
|
Line 2065 termp_fo_post(DECL_ARGS) |
|
static int |
static int |
termp_bf_pre(DECL_ARGS) |
termp_bf_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
|
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
else if (MDOC_BLOCK != n->type) |
else if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
if (NULL == (nn = n->head->child)) { |
assert(n->data.Bf); |
if (arg_hasattr(MDOC_Emphasis, n)) |
|
term_fontpush(p, TERMFONT_UNDER); |
|
else if (arg_hasattr(MDOC_Symbolic, n)) |
|
term_fontpush(p, TERMFONT_BOLD); |
|
else |
|
term_fontpush(p, TERMFONT_NONE); |
|
|
|
return(1); |
if (FONT_Em == n->data.Bf->font) |
} |
|
|
|
assert(MDOC_TEXT == nn->type); |
|
if (0 == strcmp("Em", nn->string)) |
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
else if (0 == strcmp("Sy", nn->string)) |
else if (FONT_Sy == n->data.Bf->font) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
else |
else |
term_fontpush(p, TERMFONT_NONE); |
term_fontpush(p, TERMFONT_NONE); |
|
|
return(1); |
return(1); |
Line 2057 termp_sm_pre(DECL_ARGS) |
|
Line 2090 termp_sm_pre(DECL_ARGS) |
|
{ |
{ |
|
|
assert(n->child && MDOC_TEXT == n->child->type); |
assert(n->child && MDOC_TEXT == n->child->type); |
if (0 == strcmp("on", n->child->string)) |
if (0 == strcmp("on", n->child->string)) { |
|
if (p->col) |
|
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
else |
} else |
p->flags |= TERMP_NONOSPACE; |
p->flags |= TERMP_NONOSPACE; |
|
|
return(0); |
return(0); |
|
|
termp____post(DECL_ARGS) |
termp____post(DECL_ARGS) |
{ |
{ |
|
|
|
/* |
|
* Handle lists of authors. In general, print each followed by |
|
* a comma. Don't print the comma if there are only two |
|
* authors. |
|
*/ |
|
if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok) |
|
if (NULL == n->next->next || MDOC__A != n->next->next->tok) |
|
if (NULL == n->prev || MDOC__A != n->prev->tok) |
|
return; |
|
|
/* TODO: %U. */ |
/* TODO: %U. */ |
|
|
p->flags |= TERMP_NOSPACE; |
if (NULL == n->parent || MDOC_Rs != n->parent->tok) |
term_word(p, n->next ? "," : "."); |
return; |
|
|
|
if (NULL == n->next) { |
|
term_word(p, "."); |
|
p->flags |= TERMP_SENTENCE; |
|
} else |
|
term_word(p, ","); |
} |
} |
|
|
|
|
Line 2104 termp_li_pre(DECL_ARGS) |
|
Line 2155 termp_li_pre(DECL_ARGS) |
|
static int |
static int |
termp_lk_pre(DECL_ARGS) |
termp_lk_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn, *sv; |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
nn = n->child; |
|
|
|
|
nn = sv = n->child; |
|
|
if (NULL == nn->next) |
if (NULL == nn->next) |
return(1); |
return(1); |
|
|
term_word(p, nn->string); |
for (nn = nn->next; nn; nn = nn->next) |
|
term_word(p, nn->string); |
|
|
term_fontpop(p); |
term_fontpop(p); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ":"); |
term_word(p, ":"); |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
for (nn = nn->next; nn; nn = nn->next) |
term_word(p, sv->string); |
term_word(p, nn->string); |
|
term_fontpop(p); |
term_fontpop(p); |
|
|
return(0); |
return(0); |
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_bk_pre(DECL_ARGS) |
|
{ |
|
|
|
switch (n->type) { |
|
case (MDOC_BLOCK): |
|
break; |
|
case (MDOC_HEAD): |
|
return(0); |
|
case (MDOC_BODY): |
|
p->flags |= TERMP_PREKEEP; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static void |
|
termp_bk_post(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_BODY == n->type) |
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |