version 1.118, 2017/06/06 15:01:04 |
version 1.120, 2017/06/10 01:28:33 |
Line 196 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
Line 196 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
{ NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */ |
{ NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */ |
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */ |
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */ |
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */ |
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Bsx */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Bsx */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Bx */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Bx */ |
{ NULL, pre_skip, NULL, NULL, NULL }, /* Db */ |
{ NULL, pre_skip, NULL, NULL, NULL }, /* Db */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dc */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dc */ |
{ cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */ |
{ cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */ |
Line 206 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
Line 206 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
{ NULL, NULL, NULL, NULL, NULL }, /* Ef */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ef */ |
{ NULL, pre_em, post_font, NULL, NULL }, /* Em */ |
{ NULL, pre_em, post_font, NULL, NULL }, /* Em */ |
{ cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */ |
{ cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Fx */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Fx */ |
{ NULL, pre_sy, post_font, NULL, NULL }, /* Ms */ |
{ NULL, pre_sy, post_font, NULL, NULL }, /* Ms */ |
{ NULL, pre_no, NULL, NULL, NULL }, /* No */ |
{ NULL, pre_no, NULL, NULL, NULL }, /* No */ |
{ NULL, pre_ns, NULL, NULL, NULL }, /* Ns */ |
{ NULL, pre_ns, NULL, NULL, NULL }, /* Ns */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Nx */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Nx */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ox */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Ox */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Pc */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Pc */ |
{ NULL, NULL, post_pf, NULL, NULL }, /* Pf */ |
{ NULL, NULL, post_pf, NULL, NULL }, /* Pf */ |
{ cond_body, pre_enc, post_enc, "(", ")" }, /* Po */ |
{ cond_body, pre_enc, post_enc, "(", ")" }, /* Po */ |
Line 252 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
Line 252 static const struct manact __manacts[MDOC_MAX - MDOC_D |
|
{ NULL, NULL, post_percent, NULL, NULL }, /* %C */ |
{ NULL, NULL, post_percent, NULL, NULL }, /* %C */ |
{ NULL, pre_skip, NULL, NULL, NULL }, /* Es */ |
{ NULL, pre_skip, NULL, NULL, NULL }, /* Es */ |
{ cond_body, pre_en, post_en, NULL, NULL }, /* En */ |
{ cond_body, pre_en, post_en, NULL, NULL }, /* En */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dx */ |
{ NULL, pre_bk, post_bk, NULL, NULL }, /* Dx */ |
{ NULL, NULL, post_percent, NULL, NULL }, /* %Q */ |
{ NULL, NULL, post_percent, NULL, NULL }, /* %Q */ |
{ NULL, NULL, post_percent, NULL, NULL }, /* %U */ |
{ NULL, NULL, post_percent, NULL, NULL }, /* %U */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ta */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ta */ |
Line 476 print_offs(const char *v, int keywords) |
|
Line 476 print_offs(const char *v, int keywords) |
|
{ |
{ |
char buf[24]; |
char buf[24]; |
struct roffsu su; |
struct roffsu su; |
|
const char *end; |
int sz; |
int sz; |
|
|
print_line(".RS", MMAN_Bk_susp); |
print_line(".RS", MMAN_Bk_susp); |
Line 487 print_offs(const char *v, int keywords) |
|
Line 488 print_offs(const char *v, int keywords) |
|
sz = 6; |
sz = 6; |
else if (keywords && !strcmp(v, "indent-two")) |
else if (keywords && !strcmp(v, "indent-two")) |
sz = 12; |
sz = 12; |
else if (a2roffsu(v, &su, SCALE_EN) > 1) { |
else { |
if (SCALE_EN == su.unit) |
end = a2roffsu(v, &su, SCALE_EN); |
|
if (end == NULL || *end != '\0') |
|
sz = man_strlen(v); |
|
else if (SCALE_EN == su.unit) |
sz = su.scale; |
sz = su.scale; |
else { |
else { |
/* |
/* |
Line 502 print_offs(const char *v, int keywords) |
|
Line 506 print_offs(const char *v, int keywords) |
|
outflags |= MMAN_nl; |
outflags |= MMAN_nl; |
return; |
return; |
} |
} |
} else |
} |
sz = man_strlen(v); |
|
|
|
/* |
/* |
* We are inside an enclosing list. |
* We are inside an enclosing list. |
Line 525 print_width(const struct mdoc_bl *bl, const struct rof |
|
Line 528 print_width(const struct mdoc_bl *bl, const struct rof |
|
{ |
{ |
char buf[24]; |
char buf[24]; |
struct roffsu su; |
struct roffsu su; |
|
const char *end; |
int numeric, remain, sz, chsz; |
int numeric, remain, sz, chsz; |
|
|
numeric = 1; |
numeric = 1; |
Line 533 print_width(const struct mdoc_bl *bl, const struct rof |
|
Line 537 print_width(const struct mdoc_bl *bl, const struct rof |
|
/* Convert the width into a number (of characters). */ |
/* Convert the width into a number (of characters). */ |
if (bl->width == NULL) |
if (bl->width == NULL) |
sz = (bl->type == LIST_hang) ? 6 : 0; |
sz = (bl->type == LIST_hang) ? 6 : 0; |
else if (a2roffsu(bl->width, &su, SCALE_MAX) > 1) { |
else { |
if (SCALE_EN == su.unit) |
end = a2roffsu(bl->width, &su, SCALE_MAX); |
|
if (end == NULL || *end != '\0') |
|
sz = man_strlen(bl->width); |
|
else if (SCALE_EN == su.unit) |
sz = su.scale; |
sz = su.scale; |
else { |
else { |
sz = 0; |
sz = 0; |
numeric = 0; |
numeric = 0; |
} |
} |
} else |
} |
sz = man_strlen(bl->width); |
|
|
|
/* XXX Rough estimation, might have multiple parts. */ |
/* XXX Rough estimation, might have multiple parts. */ |
if (bl->type == LIST_enum) |
if (bl->type == LIST_enum) |
Line 984 post_bf(DECL_ARGS) |
|
Line 990 post_bf(DECL_ARGS) |
|
static int |
static int |
pre_bk(DECL_ARGS) |
pre_bk(DECL_ARGS) |
{ |
{ |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
return 1; |
return 1; |
case ROFFT_BODY: |
case ROFFT_BODY: |
|
case ROFFT_ELEM: |
outflags |= MMAN_Bk; |
outflags |= MMAN_Bk; |
return 1; |
return 1; |
default: |
default: |
Line 999 pre_bk(DECL_ARGS) |
|
Line 1005 pre_bk(DECL_ARGS) |
|
static void |
static void |
post_bk(DECL_ARGS) |
post_bk(DECL_ARGS) |
{ |
{ |
|
switch (n->type) { |
if (n->type == ROFFT_BODY) |
case ROFFT_ELEM: |
|
while ((n = n->parent) != NULL) |
|
if (n->tok == MDOC_Bk) |
|
return; |
|
/* FALLTHROUGH */ |
|
case ROFFT_BODY: |
outflags &= ~MMAN_Bk; |
outflags &= ~MMAN_Bk; |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
|
|
static int |
static int |