version 1.37, 2009/03/03 22:17:19 |
version 1.43, 2009/03/06 14:13:47 |
Line 89 static int arg_getattr(int, size_t, |
|
Line 89 static int arg_getattr(int, size_t, |
|
const struct mdoc_arg *); |
const struct mdoc_arg *); |
static size_t arg_offset(const struct mdoc_arg *); |
static size_t arg_offset(const struct mdoc_arg *); |
static size_t arg_width(const struct mdoc_arg *); |
static size_t arg_width(const struct mdoc_arg *); |
|
static int arg_listtype(const struct mdoc_node *); |
|
|
/* |
/* |
* What follows describes prefix and postfix operations for the abstract |
* What follows describes prefix and postfix operations for the abstract |
Line 165 DECL_PRE(termp_xr); |
|
Line 166 DECL_PRE(termp_xr); |
|
DECL_POST(termp___); |
DECL_POST(termp___); |
DECL_POST(termp_bl); |
DECL_POST(termp_bl); |
DECL_POST(termp_bx); |
DECL_POST(termp_bx); |
|
DECL_POST(termp_lb); |
|
|
const struct termact __termacts[MDOC_MAX] = { |
const struct termact __termacts[MDOC_MAX] = { |
{ NULL, NULL }, /* \" */ |
{ NULL, NULL }, /* \" */ |
Line 273 const struct termact __termacts[MDOC_MAX] = { |
|
Line 275 const struct termact __termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ termp_ud_pre, NULL }, /* Ud */ |
|
{ NULL, termp_lb_post }, /* lb */ |
}; |
}; |
|
|
const struct termact *termacts = __termacts; |
const struct termact *termacts = __termacts; |
Line 294 arg_width(const struct mdoc_arg *arg) |
|
Line 297 arg_width(const struct mdoc_arg *arg) |
|
assert(len > 0); |
assert(len > 0); |
|
|
for (i = 0; i < len - 1; i++) |
for (i = 0; i < len - 1; i++) |
if ( ! isdigit((int)(*arg->value)[i])) |
if ( ! isdigit((u_char)(*arg->value)[i])) |
break; |
break; |
|
|
if (i == len - 1) { |
if (i == len - 1) { |
Line 308 arg_width(const struct mdoc_arg *arg) |
|
Line 311 arg_width(const struct mdoc_arg *arg) |
|
} |
} |
|
|
|
|
|
static int |
|
arg_listtype(const struct mdoc_node *n) |
|
{ |
|
const struct mdoc_block *bl; |
|
int i, len; |
|
|
|
bl = &n->data.block; |
|
len = (int)bl->argc; |
|
|
|
for (i = 0; i < len; i++) |
|
switch (bl->argv[i].arg) { |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ohang): |
|
return(bl->argv[i].arg); |
|
default: |
|
break; |
|
} |
|
|
|
errx(1, "list type not supported"); |
|
/* NOTREACHED */ |
|
} |
|
|
|
|
static size_t |
static size_t |
arg_offset(const struct mdoc_arg *arg) |
arg_offset(const struct mdoc_arg *arg) |
{ |
{ |
Line 371 termp_dq_post(DECL_ARGS) |
|
Line 412 termp_dq_post(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
termp_it_pre(DECL_ARGS) |
termp_it_pre_block(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *n, *it; |
const struct mdoc_node *n; |
const struct mdoc_block *bl; |
const struct mdoc_block *bl; |
char buf[7], *tp; |
|
int i, type; |
|
size_t width, offset; |
|
|
|
switch (node->type) { |
n = node->parent->parent; |
case (MDOC_BODY): |
|
/* FALLTHROUGH */ |
|
case (MDOC_HEAD): |
|
it = node->parent; |
|
break; |
|
case (MDOC_BLOCK): |
|
it = node; |
|
break; |
|
default: |
|
return(1); |
|
} |
|
|
|
n = it->parent->parent; |
|
bl = &n->data.block; |
bl = &n->data.block; |
|
|
if (MDOC_BLOCK == node->type) { |
newln(p); |
newln(p); |
if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv)) |
if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv)) |
if (node->prev || n->prev) |
if (node->prev || n->prev) |
vspace(p); |
vspace(p); |
|
return(1); |
|
} |
|
|
|
/* Get our list type. */ |
return(1); |
|
} |
|
|
for (type = -1, i = 0; i < (int)bl->argc; i++) |
|
switch (bl->argv[i].arg) { |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ohang): |
|
type = bl->argv[i].arg; |
|
i = (int)bl->argc; |
|
break; |
|
default: |
|
errx(1, "list type not supported"); |
|
/* NOTREACHED */ |
|
} |
|
|
|
assert(-1 != type); |
/* ARGSUSED */ |
|
static int |
|
termp_it_pre(DECL_ARGS) |
|
{ |
|
const struct mdoc_block *bl; |
|
char buf[7]; |
|
int i, type; |
|
size_t width, offset; |
|
|
/* Save our existing (inherited) margin and offset. */ |
if (MDOC_BLOCK == node->type) |
|
return(termp_it_pre_block(p, pair, meta, node)); |
|
|
|
/* Get ptr to list block, type, etc. */ |
|
|
|
bl = &node->parent->parent->parent->data.block; |
|
type = arg_listtype(node->parent->parent->parent); |
|
|
|
/* Save parent attributes. */ |
|
|
pair->offset = p->offset; |
pair->offset = p->offset; |
pair->rmargin = p->rmargin; |
pair->rmargin = p->rmargin; |
|
pair->flag = p->flags; |
|
|
/* Get list width and offset. */ |
/* Get list width and offset. */ |
|
|
Line 445 termp_it_pre(DECL_ARGS) |
|
Line 460 termp_it_pre(DECL_ARGS) |
|
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); |
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); |
offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; |
offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; |
|
|
/* Override the width. */ |
/* |
|
* List-type can override the width in the case of fixed-head |
|
* values (bullet, dash/hyphen, enum). Tags need a non-zero |
|
* offset. |
|
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
Line 455 termp_it_pre(DECL_ARGS) |
|
Line 474 termp_it_pre(DECL_ARGS) |
|
case (MDOC_Enum): |
case (MDOC_Enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
width = width > 6 ? width : 6; |
width = width > 4 ? width : 4; |
break; |
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (0 == width) |
if (width) |
errx(1, "need non-zero -width"); |
break; |
break; |
errx(1, "need non-zero %s for list type", |
|
mdoc_argnames[MDOC_Width]); |
default: |
default: |
break; |
break; |
} |
} |
|
|
/* Word-wrap control. */ |
/* |
|
* Whitespace control. Inset bodies need an initial space. |
|
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (MDOC_Diag): |
if (MDOC_HEAD == node->type) |
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_DIAG]); |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (MDOC_Inset): |
if (MDOC_HEAD == node->type) |
if (MDOC_BODY == node->type) |
|
p->flags &= ~TERMP_NOSPACE; |
|
else |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
|
default: |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
} |
|
|
|
/* |
|
* Style flags. Diagnostic heads need TTYPE_DIAG. |
|
*/ |
|
|
|
switch (type) { |
|
case (MDOC_Diag): |
|
if (MDOC_HEAD == node->type) |
|
p->flags |= ttypes[TTYPE_DIAG]; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Pad and break control. This is the tricker part. Lists with |
|
* set right-margins for the head get TERMP_NOBREAK because, if |
|
* they overrun the margin, they wrap to the new margin. |
|
* Correspondingly, the body for these types don't left-pad, as |
|
* the head will pad out to to the right. |
|
*/ |
|
|
|
switch (type) { |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (MDOC_Dash): |
Line 485 termp_it_pre(DECL_ARGS) |
|
Line 534 termp_it_pre(DECL_ARGS) |
|
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (MDOC_Tag): |
p->flags |= TERMP_NOSPACE; |
|
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else if (MDOC_BODY == node->type) |
else |
p->flags |= TERMP_NOLPAD; |
p->flags |= TERMP_NOLPAD; |
|
if (MDOC_HEAD == node->type && MDOC_Tag == type) |
|
if (NULL == node->next || |
|
NULL == node->next->child) |
|
p->flags |= TERMP_NONOBREAK; |
break; |
break; |
|
case (MDOC_Diag): |
|
if (MDOC_HEAD == node->type) |
|
p->flags |= TERMP_NOBREAK; |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
/* |
/* |
* Get a token to use as the HEAD lead-in. If NULL, we use the |
* Margin control. Set-head-width lists have their right |
* HEAD child. |
* margins shortened. The body for these lists has the offset |
|
* necessarily lengthened. Everybody gets the offset. |
*/ |
*/ |
|
|
tp = NULL; |
|
|
|
if (MDOC_HEAD == node->type) { |
|
if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv)) |
|
tp = "\\[bu]"; |
|
if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv)) |
|
tp = "\\-"; |
|
if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) { |
|
(pair->ppair->ppair->count)++; |
|
(void)snprintf(buf, sizeof(buf), "%d.", |
|
pair->ppair->ppair->count); |
|
tp = buf; |
|
} |
|
if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) |
|
tp = "\\-"; |
|
} |
|
|
|
/* Margin control. */ |
|
|
|
p->offset += offset; |
p->offset += offset; |
|
|
switch (type) { |
switch (type) { |
Line 533 termp_it_pre(DECL_ARGS) |
|
Line 571 termp_it_pre(DECL_ARGS) |
|
case (MDOC_Tag): |
case (MDOC_Tag): |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else if (MDOC_BODY == node->type) |
else |
p->offset += width; |
p->offset += width; |
break; |
/* FALLTHROUGH */ |
default: |
default: |
break; |
break; |
} |
} |
|
|
if (NULL == tp) |
/* |
return(1); |
* The dash, hyphen, bullet and enum lists all have a special |
|
* HEAD character. Print it now. |
|
*/ |
|
|
word(p, tp); |
if (MDOC_HEAD == node->type) |
return(0); |
switch (type) { |
|
case (MDOC_Bullet): |
|
word(p, "\\[bu]"); |
|
break; |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
word(p, "\\-"); |
|
break; |
|
case (MDOC_Enum): |
|
/* TODO: have a wordfmt or something. */ |
|
(pair->ppair->ppair->count)++; |
|
(void)snprintf(buf, sizeof(buf), "%d.", |
|
pair->ppair->ppair->count); |
|
word(p, buf); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* If we're not going to process our header children, indicate |
|
* so here. |
|
*/ |
|
|
|
if (MDOC_HEAD == node->type) |
|
switch (type) { |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Enum): |
|
return(0); |
|
default: |
|
break; |
|
} |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 552 termp_it_pre(DECL_ARGS) |
|
Line 633 termp_it_pre(DECL_ARGS) |
|
static void |
static void |
termp_it_post(DECL_ARGS) |
termp_it_post(DECL_ARGS) |
{ |
{ |
int type, i; |
int type; |
struct mdoc_block *bl; |
|
|
|
if (MDOC_BODY != node->type && MDOC_HEAD != node->type) |
if (MDOC_BODY != node->type && MDOC_HEAD != node->type) |
return; |
return; |
|
|
assert(MDOC_BLOCK == node->parent->parent->parent->type); |
type = arg_listtype(node->parent->parent->parent); |
assert(MDOC_Bl == node->parent->parent->parent->tok); |
|
bl = &node->parent->parent->parent->data.block; |
|
|
|
for (type = -1, i = 0; i < (int)bl->argc; i++) |
|
switch (bl->argv[i].arg) { |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ohang): |
|
type = bl->argv[i].arg; |
|
i = (int)bl->argc; |
|
break; |
|
default: |
|
errx(1, "list type not supported"); |
|
/* NOTREACHED */ |
|
} |
|
|
|
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (MDOC_Diag): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (MDOC_Inset): |
|
if (MDOC_BODY != node->type) |
|
break; |
|
flushln(p); |
break; |
break; |
default: |
default: |
flushln(p); |
flushln(p); |
Line 600 termp_it_post(DECL_ARGS) |
|
Line 657 termp_it_post(DECL_ARGS) |
|
|
|
p->offset = pair->offset; |
p->offset = pair->offset; |
p->rmargin = pair->rmargin; |
p->rmargin = pair->rmargin; |
|
p->flags = pair->flag; |
switch (type) { |
|
case (MDOC_Inset): |
|
break; |
|
default: |
|
if (MDOC_HEAD == node->type) |
|
p->flags &= ~TERMP_NOBREAK; |
|
else if (MDOC_BODY == node->type) |
|
p->flags &= ~TERMP_NOLPAD; |
|
break; |
|
} |
|
} |
} |
|
|
|
|
Line 648 termp_ar_pre(DECL_ARGS) |
|
Line 695 termp_ar_pre(DECL_ARGS) |
|
{ |
{ |
|
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); |
if (NULL == node->child) { |
|
word(p, "file"); |
|
word(p, "..."); |
|
} |
|
return(1); |
return(1); |
} |
} |
|
|
Line 680 termp_pp_pre(DECL_ARGS) |
|
Line 723 termp_pp_pre(DECL_ARGS) |
|
static int |
static int |
termp_st_pre(DECL_ARGS) |
termp_st_pre(DECL_ARGS) |
{ |
{ |
const char *tp; |
const char *cp; |
|
|
assert(1 == node->data.elem.argc); |
/* XXX - if child isn't text? */ |
|
if (node->child) |
tp = mdoc_st2a(node->data.elem.argv[0].arg); |
if ((cp = mdoc_a2st(node->child->data.text.string))) |
word(p, tp); |
word(p, cp); |
|
return(0); |
return(1); |
|
} |
} |
|
|
|
|
Line 927 termp_bt_pre(DECL_ARGS) |
|
Line 969 termp_bt_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
termp_lb_post(DECL_ARGS) |
|
{ |
|
|
|
newln(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
termp_ud_pre(DECL_ARGS) |
termp_ud_pre(DECL_ARGS) |
{ |
{ |
Line 968 termp_aq_pre(DECL_ARGS) |
|
Line 1019 termp_aq_pre(DECL_ARGS) |
|
|
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return(1); |
return(1); |
word(p, "<"); |
word(p, "\\(la"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} |
} |
Line 982 termp_aq_post(DECL_ARGS) |
|
Line 1033 termp_aq_post(DECL_ARGS) |
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return; |
return; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
word(p, ">"); |
word(p, "\\(ra"); |
} |
} |
|
|
|
|
Line 1439 termp_in_post(DECL_ARGS) |
|
Line 1490 termp_in_post(DECL_ARGS) |
|
static int |
static int |
termp_at_pre(DECL_ARGS) |
termp_at_pre(DECL_ARGS) |
{ |
{ |
enum mdoc_att c; |
const char *att; |
|
|
c = ATT_DEFAULT; |
att = NULL; |
|
|
if (node->child) { |
if (node->child) { |
assert(MDOC_TEXT == node->child->type); |
assert(MDOC_TEXT == node->child->type); |
c = mdoc_atoatt(node->child->data.text.string); |
att = mdoc_a2att(node->child->data.text.string); |
} |
} |
|
|
word(p, mdoc_att2a(c)); |
if (NULL == att) |
|
att = "AT&T UNIX"; |
|
|
|
word(p, att); |
return(0); |
return(0); |
} |
} |
|
|
|
|
termp__t_pre(DECL_ARGS) |
termp__t_pre(DECL_ARGS) |
{ |
{ |
|
|
|
/* FIXME: titles are underlined. */ |
word(p, "\""); |
word(p, "\""); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
Line 1633 termp__t_post(DECL_ARGS) |
|
Line 1689 termp__t_post(DECL_ARGS) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
/* FIXME: titles are underlined. */ |
word(p, "\""); |
word(p, "\""); |
word(p, node->next ? "," : "."); |
word(p, node->next ? "," : "."); |
} |
} |