version 1.42, 2012/11/17 00:26:33 |
version 1.43, 2012/11/18 18:02:23 |
Line 254 static int outflags; |
|
Line 254 static int outflags; |
|
#define MMAN_An_split (1 << 8) /* author mode is "split" */ |
#define MMAN_An_split (1 << 8) /* author mode is "split" */ |
#define MMAN_An_nosplit (1 << 9) /* author mode is "nosplit" */ |
#define MMAN_An_nosplit (1 << 9) /* author mode is "nosplit" */ |
|
|
|
#define BL_STACK_MAX 32 |
|
|
|
static size_t Bl_stack[BL_STACK_MAX]; /* offsets [chars] */ |
|
static int Bl_stack_post[BL_STACK_MAX]; /* add final .RE */ |
|
static int Bl_stack_len; /* number of nested Bl blocks */ |
static int TPremain; /* characters before tag is full */ |
static int TPremain; /* characters before tag is full */ |
|
|
static struct { |
static struct { |
Line 390 print_offs(const char *v) |
|
Line 395 print_offs(const char *v) |
|
struct roffsu su; |
struct roffsu su; |
size_t sz; |
size_t sz; |
|
|
|
/* Convert v into a number (of characters). */ |
if (NULL == v || '\0' == *v || 0 == strcmp(v, "left")) |
if (NULL == v || '\0' == *v || 0 == strcmp(v, "left")) |
sz = 0; |
sz = 0; |
else if (0 == strcmp(v, "indent")) |
else if (0 == strcmp(v, "indent")) |
Line 397 print_offs(const char *v) |
|
Line 403 print_offs(const char *v) |
|
else if (0 == strcmp(v, "indent-two")) |
else if (0 == strcmp(v, "indent-two")) |
sz = 12; |
sz = 12; |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
print_word(v); |
if (SCALE_EN == su.unit) |
return; |
sz = su.scale; |
|
else { |
|
/* |
|
* XXX |
|
* If we are inside an enclosing list, |
|
* there is no easy way to add the two |
|
* indentations because they are provided |
|
* in terms of different units. |
|
*/ |
|
print_word(v); |
|
return; |
|
} |
} else |
} else |
sz = strlen(v); |
sz = strlen(v); |
|
|
|
/* |
|
* We are inside an enclosing list. |
|
* Add the two indentations. |
|
*/ |
|
if (Bl_stack_len) |
|
sz += Bl_stack[Bl_stack_len - 1]; |
|
|
snprintf(buf, sizeof(buf), "%ldn", sz); |
snprintf(buf, sizeof(buf), "%ldn", sz); |
print_word(buf); |
print_word(buf); |
} |
} |
Line 416 print_width(const char *v, const struct mdoc_node *chi |
|
Line 440 print_width(const char *v, const struct mdoc_node *chi |
|
|
|
numeric = 1; |
numeric = 1; |
remain = 0; |
remain = 0; |
|
|
|
/* Convert v into a number (of characters). */ |
if (NULL == v) |
if (NULL == v) |
sz = defsz; |
sz = defsz; |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
Line 432 print_width(const char *v, const struct mdoc_node *chi |
|
Line 458 print_width(const char *v, const struct mdoc_node *chi |
|
chsz = (NULL != child && MDOC_TEXT == child->type) ? |
chsz = (NULL != child && MDOC_TEXT == child->type) ? |
strlen(child->string) : 0; |
strlen(child->string) : 0; |
|
|
|
/* |
|
* If we are inside an enclosing list, |
|
* preserve its indentation. |
|
*/ |
|
if (Bl_stack_len && Bl_stack[Bl_stack_len - 1]) { |
|
print_line(".RS", 0); |
|
snprintf(buf, sizeof(buf), "%ldn", |
|
Bl_stack[Bl_stack_len - 1]); |
|
print_word(buf); |
|
} |
|
|
|
/* |
|
* Save our own indentation, |
|
* such that child lists can use it. |
|
*/ |
|
Bl_stack[Bl_stack_len++] = sz + 2; |
|
|
|
/* Set up the current list. */ |
if (defsz && chsz > sz) |
if (defsz && chsz > sz) |
print_block(".HP", 0); |
print_block(".HP", 0); |
else { |
else { |
Line 767 pre_bd(DECL_ARGS) |
|
Line 811 pre_bd(DECL_ARGS) |
|
static void |
static void |
post_bd(DECL_ARGS) |
post_bd(DECL_ARGS) |
{ |
{ |
|
char buf[24]; |
|
|
|
/* Close out this display. */ |
print_line(".RE", MMAN_nl); |
print_line(".RE", MMAN_nl); |
if (DISP_unfilled == n->norm->Bd.type || |
if (DISP_unfilled == n->norm->Bd.type || |
DISP_literal == n->norm->Bd.type) |
DISP_literal == n->norm->Bd.type) |
print_line(".fi", MMAN_nl); |
print_line(".fi", MMAN_nl); |
|
|
|
/* |
|
* If we are inside an enclosing list and the current |
|
* list item is not yet finished, restore the correct |
|
* indentation for what remains of that item. |
|
*/ |
|
if (NULL != n->parent->next && |
|
Bl_stack_len && Bl_stack[Bl_stack_len - 1]) { |
|
print_line(".RS", 0); |
|
snprintf(buf, sizeof(buf), "%ldn", |
|
Bl_stack[Bl_stack_len - 1]); |
|
print_word(buf); |
|
/* Remeber to close out this .RS block later. */ |
|
Bl_stack_post[Bl_stack_len - 1] = 1; |
|
} |
} |
} |
|
|
static int |
static int |
Line 1197 post_it(DECL_ARGS) |
|
Line 1258 post_it(DECL_ARGS) |
|
} |
} |
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
if (LIST_column == bln->norm->Bl.type && |
switch (bln->norm->Bl.type) { |
NULL != n->next) { |
case (LIST_bullet): |
putchar('\t'); |
/* FALLTHROUGH */ |
outflags &= ~MMAN_spc; |
case (LIST_dash): |
|
/* FALLTHROUGH */ |
|
case (LIST_hyphen): |
|
/* FALLTHROUGH */ |
|
case (LIST_enum): |
|
/* FALLTHROUGH */ |
|
case (LIST_hang): |
|
/* FALLTHROUGH */ |
|
case (LIST_tag): |
|
assert(Bl_stack_len); |
|
Bl_stack[--Bl_stack_len] = 0; |
|
|
|
/* |
|
* Our indentation had to be restored |
|
* after a child display. |
|
* Close out that indentation block now. |
|
*/ |
|
if (Bl_stack_post[Bl_stack_len]) { |
|
print_line(".RE", MMAN_nl); |
|
Bl_stack_post[Bl_stack_len] = 0; |
|
} |
|
|
|
/* |
|
* We are inside an enclosing list. |
|
* Restore the indentation of that list. |
|
*/ |
|
if (Bl_stack_len && Bl_stack[Bl_stack_len - 1]) |
|
print_line(".RE", MMAN_nl); |
|
break; |
|
case (LIST_column): |
|
if (NULL != n->next) { |
|
putchar('\t'); |
|
outflags &= ~MMAN_spc; |
|
} |
|
break; |
|
default: |
|
break; |
} |
} |
break; |
break; |
default: |
default: |