version 1.36, 2012/07/13 14:19:49 |
version 1.39, 2012/07/14 09:07:18 |
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" */ |
|
|
|
static int TPremain; /* characters before tag is full */ |
|
|
static struct { |
static struct { |
char *head; |
char *head; |
char *tail; |
char *tail; |
Line 270 font_push(char newfont) |
|
Line 272 font_push(char newfont) |
|
fontqueue.size); |
fontqueue.size); |
} |
} |
*fontqueue.tail = newfont; |
*fontqueue.tail = newfont; |
print_word("\\f"); |
print_word(""); |
|
printf("\\f"); |
putchar(newfont); |
putchar(newfont); |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
} |
} |
|
|
if (fontqueue.tail > fontqueue.head) |
if (fontqueue.tail > fontqueue.head) |
fontqueue.tail--; |
fontqueue.tail--; |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
print_word("\\f"); |
print_word(""); |
|
printf("\\f"); |
putchar(*fontqueue.tail); |
putchar(*fontqueue.tail); |
} |
} |
|
|
Line 305 print_word(const char *s) |
|
Line 309 print_word(const char *s) |
|
else if (MMAN_nl & outflags) |
else if (MMAN_nl & outflags) |
putchar('\n'); |
putchar('\n'); |
outflags &= ~(MMAN_PP|MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc); |
outflags &= ~(MMAN_PP|MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc); |
} else if (MMAN_spc & outflags && '\0' != s[0]) |
if (1 == TPremain) |
|
printf(".br\n"); |
|
TPremain = 0; |
|
} else if (MMAN_spc & outflags) { |
/* |
/* |
* If we need a space, only print it if |
* If we need a space, only print it if |
* (1) it is forced by `No' or |
* (1) it is forced by `No' or |
* (2) what follows is not terminating punctuation or |
* (2) what follows is not terminating punctuation or |
* (3) what follows is longer than one character. |
* (3) what follows is longer than one character. |
*/ |
*/ |
if (MMAN_spc_force & outflags || |
if (MMAN_spc_force & outflags || '\0' == s[0] || |
NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) { |
NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) { |
if (MMAN_Bk & outflags) { |
if (MMAN_Bk & outflags) { |
putchar('\\'); |
putchar('\\'); |
putchar('~'); |
putchar('~'); |
} else |
} else |
putchar(' '); |
putchar(' '); |
|
if (TPremain) |
|
TPremain--; |
} |
} |
|
} |
|
|
/* |
/* |
* Reassign needing space if we're not following opening |
* Reassign needing space if we're not following opening |
* punctuation. |
* punctuation. |
*/ |
*/ |
if (MMAN_Sm & outflags && |
if (MMAN_Sm & outflags && ('\0' == s[0] || |
(('(' != s[0] && '[' != s[0]) || '\0' != s[1])) |
(('(' != s[0] && '[' != s[0]) || '\0' != s[1]))) |
outflags |= MMAN_spc; |
outflags |= MMAN_spc; |
else |
else |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
Line 344 print_word(const char *s) |
|
Line 354 print_word(const char *s) |
|
putchar((unsigned char)*s); |
putchar((unsigned char)*s); |
break; |
break; |
} |
} |
|
if (TPremain) |
|
TPremain--; |
} |
} |
} |
} |
|
|
Line 400 print_width(const char *v, const struct mdoc_node *chi |
|
Line 412 print_width(const char *v, const struct mdoc_node *chi |
|
char buf[24]; |
char buf[24]; |
struct roffsu su; |
struct roffsu su; |
size_t sz, chsz; |
size_t sz, chsz; |
|
int numeric, remain; |
|
|
/* XXX Rough estimation, might have multiple parts. */ |
numeric = 1; |
chsz = (NULL != child && MDOC_TEXT == child->type) ? |
remain = 0; |
strlen(child->string) : 0; |
|
|
|
if (NULL == v) |
if (NULL == v) |
sz = defsz; |
sz = defsz; |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
else if (a2roffsu(v, &su, SCALE_MAX)) { |
if (SCALE_EN == su.unit) |
if (SCALE_EN == su.unit) |
sz = su.scale; |
sz = su.scale; |
else { |
else { |
if (chsz) |
sz = 0; |
print_block(".HP", 0); |
numeric = 0; |
else |
|
print_block(".TP", 0); |
|
print_word(v); |
|
return; |
|
} |
} |
} else |
} else |
sz = strlen(v); |
sz = strlen(v); |
|
|
if (chsz > sz) |
/* XXX Rough estimation, might have multiple parts. */ |
|
chsz = (NULL != child && MDOC_TEXT == child->type) ? |
|
strlen(child->string) : 0; |
|
|
|
if (defsz && chsz > sz) |
print_block(".HP", 0); |
print_block(".HP", 0); |
else |
else { |
print_block(".TP", 0); |
print_block(".TP", 0); |
snprintf(buf, sizeof(buf), "%ldn", sz + 2); |
remain = sz + 2; |
print_word(buf); |
} |
|
if (numeric) { |
|
snprintf(buf, sizeof(buf), "%ldn", sz + 2); |
|
print_word(buf); |
|
} else |
|
print_word(v); |
|
TPremain = remain; |
} |
} |
|
|
void |
void |
Line 499 print_node(DECL_ARGS) |
|
Line 516 print_node(DECL_ARGS) |
|
*/ |
*/ |
if (MMAN_nl & outflags && ('.' == *n->string || |
if (MMAN_nl & outflags && ('.' == *n->string || |
'\'' == *n->string)) { |
'\'' == *n->string)) { |
print_word("\\&"); |
print_word(""); |
|
printf("\\&"); |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
} |
} |
print_word(n->string); |
print_word(n->string); |
Line 599 pre__t(DECL_ARGS) |
|
Line 617 pre__t(DECL_ARGS) |
|
|
|
if (n->parent && MDOC_Rs == n->parent->tok && |
if (n->parent && MDOC_Rs == n->parent->tok && |
n->parent->norm->Rs.quote_T) { |
n->parent->norm->Rs.quote_T) { |
print_word("\""); |
print_word(""); |
|
putchar('\"'); |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
} else |
} else |
font_push('I'); |
font_push('I'); |
Line 613 post__t(DECL_ARGS) |
|
Line 632 post__t(DECL_ARGS) |
|
if (n->parent && MDOC_Rs == n->parent->tok && |
if (n->parent && MDOC_Rs == n->parent->tok && |
n->parent->norm->Rs.quote_T) { |
n->parent->norm->Rs.quote_T) { |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
print_word("\""); |
print_word(""); |
|
putchar('\"'); |
} else |
} else |
font_pop(); |
font_pop(); |
post_percent(m, n); |
post_percent(m, n); |
Line 630 pre_sect(DECL_ARGS) |
|
Line 650 pre_sect(DECL_ARGS) |
|
return(1); |
return(1); |
outflags |= MMAN_sp; |
outflags |= MMAN_sp; |
print_block(manacts[n->tok].prefix, 0); |
print_block(manacts[n->tok].prefix, 0); |
print_word("\""); |
print_word(""); |
|
putchar('\"'); |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
return(1); |
return(1); |
} |
} |
Line 645 post_sect(DECL_ARGS) |
|
Line 666 post_sect(DECL_ARGS) |
|
if (MDOC_HEAD != n->type) |
if (MDOC_HEAD != n->type) |
return; |
return; |
outflags &= ~MMAN_spc; |
outflags &= ~MMAN_spc; |
print_word("\""); |
print_word(""); |
|
putchar('\"'); |
outflags |= MMAN_nl; |
outflags |= MMAN_nl; |
if (MDOC_Sh == n->tok && SEC_AUTHORS == n->sec) |
if (MDOC_Sh == n->tok && SEC_AUTHORS == n->sec) |
outflags &= ~(MMAN_An_split | MMAN_An_nosplit); |
outflags &= ~(MMAN_An_split | MMAN_An_nosplit); |
Line 1094 pre_it(DECL_ARGS) |
|
Line 1116 pre_it(DECL_ARGS) |
|
outflags |= MMAN_PP | MMAN_nl; |
outflags |= MMAN_PP | MMAN_nl; |
bln = n->parent->parent; |
bln = n->parent->parent; |
if (0 == bln->norm->Bl.comp || |
if (0 == bln->norm->Bl.comp || |
NULL == bln->parent->prev) |
(NULL == n->parent->prev && |
|
NULL == bln->parent->prev)) |
outflags |= MMAN_sp; |
outflags |= MMAN_sp; |
outflags &= ~MMAN_br; |
outflags &= ~MMAN_br; |
switch (bln->norm->Bl.type) { |
switch (bln->norm->Bl.type) { |
Line 1117 pre_it(DECL_ARGS) |
|
Line 1140 pre_it(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
print_width(bln->norm->Bl.width, NULL, 0); |
print_width(bln->norm->Bl.width, NULL, 0); |
|
TPremain = 0; |
outflags |= MMAN_nl; |
outflags |= MMAN_nl; |
font_push('B'); |
font_push('B'); |
if (LIST_bullet == bln->norm->Bl.type) |
if (LIST_bullet == bln->norm->Bl.type) |
Line 1127 pre_it(DECL_ARGS) |
|
Line 1151 pre_it(DECL_ARGS) |
|
break; |
break; |
case (LIST_enum): |
case (LIST_enum): |
print_width(bln->norm->Bl.width, NULL, 0); |
print_width(bln->norm->Bl.width, NULL, 0); |
|
TPremain = 0; |
outflags |= MMAN_nl; |
outflags |= MMAN_nl; |
print_count(&bln->norm->Bl.count); |
print_count(&bln->norm->Bl.count); |
break; |
break; |
case (LIST_hang): |
case (LIST_hang): |
print_width(bln->norm->Bl.width, n->child, 6); |
print_width(bln->norm->Bl.width, n->child, 6); |
|
TPremain = 0; |
break; |
break; |
case (LIST_tag): |
case (LIST_tag): |
print_width(bln->norm->Bl.width, NULL, 8); |
print_width(bln->norm->Bl.width, n->child, 0); |
break; |
putchar('\n'); |
|
outflags &= ~MMAN_spc; |
|
return(1); |
default: |
default: |
return(1); |
return(1); |
} |
} |
Line 1222 pre_li(DECL_ARGS) |
|
Line 1250 pre_li(DECL_ARGS) |
|
static int |
static int |
pre_nm(DECL_ARGS) |
pre_nm(DECL_ARGS) |
{ |
{ |
|
char *name; |
|
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
pre_syn(n); |
pre_syn(n); |
if (MDOC_ELEM != n->type && MDOC_HEAD != n->type) |
if (MDOC_ELEM != n->type && MDOC_HEAD != n->type) |
return(1); |
return(1); |
if (NULL == n->child && NULL == m->name) |
name = n->child ? n->child->string : m->name; |
|
if (NULL == name) |
return(0); |
return(0); |
|
if (MDOC_HEAD == n->type) { |
|
if (NULL == n->parent->prev) |
|
outflags |= MMAN_sp; |
|
print_block(".HP", 0); |
|
printf(" %ldn", strlen(name) + 1); |
|
outflags |= MMAN_nl; |
|
} |
font_push('B'); |
font_push('B'); |
if (NULL == n->child) |
if (NULL == n->child) |
print_word(m->name); |
print_word(m->name); |