version 1.58, 2009/07/23 08:36:32 |
version 1.60, 2009/07/24 11:54:54 |
Line 670 fmt_block_vspace(struct termp *p, |
|
Line 670 fmt_block_vspace(struct termp *p, |
|
|
|
term_newln(p); |
term_newln(p); |
|
|
if (arg_hasattr(MDOC_Compact, bl)) |
if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl)) |
return; |
return; |
|
|
/* |
/* |
Line 695 fmt_block_vspace(struct termp *p, |
|
Line 695 fmt_block_vspace(struct termp *p, |
|
* within the list. |
* within the list. |
*/ |
*/ |
|
|
if (arg_hasattr(MDOC_Column, bl)) |
if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl)) |
if (node->prev && MDOC_It == node->prev->tok) |
if (node->prev && MDOC_It == node->prev->tok) |
return; |
return; |
|
|
Line 703 fmt_block_vspace(struct termp *p, |
|
Line 703 fmt_block_vspace(struct termp *p, |
|
* XXX - not documented: a `-diag' without a body does not |
* XXX - not documented: a `-diag' without a body does not |
* assert a vspace prior to the next element. |
* assert a vspace prior to the next element. |
*/ |
*/ |
if (arg_hasattr(MDOC_Diag, bl)) |
if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) |
if (node->prev && MDOC_It == node->prev->tok) { |
if (node->prev && MDOC_It == node->prev->tok) { |
assert(node->prev->body); |
assert(node->prev->body); |
if (NULL == node->prev->body->child) |
if (NULL == node->prev->body->child) |
Line 908 termp_it_pre(DECL_ARGS) |
|
Line 908 termp_it_pre(DECL_ARGS) |
|
else |
else |
p->flags |= TERMP_NOLPAD; |
p->flags |= TERMP_NOLPAD; |
|
|
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD != node->type) |
|
break; |
|
|
|
/* |
|
* This is ugly. If `-hang' is specified and the body |
|
* is a `Bl' or `Bd', then we want basically to nullify |
|
* the "overstep" effect in term_flushln() and treat |
|
* this as a `-ohang' list instead. |
|
*/ |
|
if (node->next->child && |
|
(MDOC_Bl == node->next->child->tok || |
|
MDOC_Bd == node->next->child->tok)) { |
|
p->flags &= ~TERMP_NOBREAK; |
|
p->flags &= ~TERMP_NOLPAD; |
|
} else |
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
break; |
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
Line 950 termp_it_pre(DECL_ARGS) |
|
Line 964 termp_it_pre(DECL_ARGS) |
|
p->offset += offset; |
p->offset += offset; |
|
|
switch (type) { |
switch (type) { |
|
case (MDOC_Hang): |
|
/* |
|
* Same stipulation as above, regarding `-hang'. We |
|
* don't want to recalculate rmargin and offsets when |
|
* using `Bd' or `Bl' within `-hang' overstep lists. |
|
*/ |
|
if (MDOC_HEAD == node->type && node->next->child && |
|
(MDOC_Bl == node->next->child->tok || |
|
MDOC_Bd == node->next->child->tok)) |
|
break; |
|
/* FALLTHROUGH */ |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (MDOC_Dash): |
Line 958 termp_it_pre(DECL_ARGS) |
|
Line 983 termp_it_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hang): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
case (MDOC_Tag): |
assert(width); |
assert(width); |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
Line 1559 termp_va_pre(DECL_ARGS) |
|
Line 1582 termp_va_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
int i, type, ln; |
int i, type; |
|
|
/* |
/* |
* This is fairly tricky due primarily to crappy documentation. |
* This is fairly tricky due primarily to crappy documentation. |
Line 1578 termp_bd_pre(DECL_ARGS) |
|
Line 1601 termp_bd_pre(DECL_ARGS) |
|
} else if (MDOC_BODY != node->type) |
} else if (MDOC_BODY != node->type) |
return(1); |
return(1); |
|
|
/* FIXME: display type should be mandated by parser. */ |
assert(node->parent->args); |
|
|
if (NULL == node->parent->args) |
for (type = -1, i = 0; -1 == type && |
errx(1, "missing display type"); |
|
|
|
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) { |
case (MDOC_Ragged): |
case (MDOC_Ragged): |
Line 1594 termp_bd_pre(DECL_ARGS) |
|
Line 1614 termp_bd_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Literal): |
case (MDOC_Literal): |
type = node->parent->args->argv[i].arg; |
type = node->parent->args->argv[i].arg; |
i = (int)node->parent->args->argc; |
|
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
|
|
|
assert(type > -1); |
|
|
if (NULL == node->parent->args) |
|
errx(1, "missing display type"); |
|
|
|
i = arg_getattr(MDOC_Offset, node->parent); |
i = arg_getattr(MDOC_Offset, node->parent); |
if (-1 != i) { |
if (-1 != i) |
if (1 != node->parent->args->argv[i].sz) |
|
errx(1, "expected single value"); |
|
p->offset += arg_offset(&node->parent->args->argv[i]); |
p->offset += arg_offset(&node->parent->args->argv[i]); |
} |
|
|
|
switch (type) { |
switch (type) { |
case (MDOC_Literal): |
case (MDOC_Literal): |
Line 1620 termp_bd_pre(DECL_ARGS) |
|
Line 1635 termp_bd_pre(DECL_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
/* |
|
* Tricky. Iterate through all children. If we're on a |
|
* different parse line, append a newline and then the contents. |
|
* Ew. |
|
*/ |
|
|
|
ln = node->child ? node->child->line : 0; |
|
|
|
for (node = node->child; node; node = node->next) { |
for (node = node->child; node; node = node->next) { |
if (ln < node->line) { |
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
|
p->flags |= TERMP_NOSPACE; |
|
} |
|
ln = node->line; |
|
print_node(p, pair, meta, node); |
print_node(p, pair, meta, node); |
|
if (node->next) |
|
term_flushln(p); |
} |
} |
|
|
return(0); |
return(0); |
Line 1648 termp_bd_post(DECL_ARGS) |
|
Line 1653 termp_bd_post(DECL_ARGS) |
|
|
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return; |
return; |
|
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|