=================================================================== RCS file: /cvs/mandoc/mdoc_man.c,v retrieving revision 1.18 retrieving revision 1.25 diff -u -p -r1.18 -r1.25 --- mandoc/mdoc_man.c 2012/07/08 11:10:13 1.18 +++ mandoc/mdoc_man.c 2012/07/09 09:31:48 1.25 @@ -1,4 +1,4 @@ -/* $Id: mdoc_man.c,v 1.18 2012/07/08 11:10:13 schwarze Exp $ */ +/* $Id: mdoc_man.c,v 1.25 2012/07/09 09:31:48 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Ingo Schwarze * @@ -29,16 +29,8 @@ #include "main.h" #define DECL_ARGS const struct mdoc_meta *m, \ - const struct mdoc_node *n, \ - struct mman *mm + const struct mdoc_node *n -struct mman { - int mode_space; /* spacing mode: 1 = on */ - int need_space; /* next word needs prior ws */ - int mode_keep; /* currently inside a keep */ - int need_nl; /* next word needs prior nl */ -}; - struct manact { int (*cond)(DECL_ARGS); /* DON'T run actions */ int (*pre)(DECL_ARGS); /* pre-node action */ @@ -64,6 +56,7 @@ static void post_pf(DECL_ARGS); static void post_sect(DECL_ARGS); static void post_sp(DECL_ARGS); static void post_vt(DECL_ARGS); +static int pre_an(DECL_ARGS); static int pre_ap(DECL_ARGS); static int pre_bd(DECL_ARGS); static int pre_bk(DECL_ARGS); @@ -74,19 +67,23 @@ static int pre_enc(DECL_ARGS); static int pre_fa(DECL_ARGS); static int pre_fn(DECL_ARGS); static int pre_fo(DECL_ARGS); +static int pre_ft(DECL_ARGS); static int pre_in(DECL_ARGS); static int pre_it(DECL_ARGS); +static int pre_lk(DECL_ARGS); static int pre_nm(DECL_ARGS); +static int pre_no(DECL_ARGS); static int pre_ns(DECL_ARGS); static int pre_pp(DECL_ARGS); static int pre_sm(DECL_ARGS); static int pre_sp(DECL_ARGS); static int pre_sect(DECL_ARGS); +static void pre_syn(const struct mdoc_node *); static int pre_vt(DECL_ARGS); static int pre_ux(DECL_ARGS); static int pre_xr(DECL_ARGS); -static void print_word(struct mman *, const char *); -static void print_offs(struct mman *, const char *); +static void print_word(const char *); +static void print_offs(const char *); static void print_node(DECL_ARGS); static const struct manact manacts[MDOC_MAX + 1] = { @@ -105,7 +102,7 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, NULL, NULL, NULL, NULL }, /* El */ { NULL, pre_it, NULL, NULL, NULL }, /* _It */ { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ad */ - { NULL, NULL, NULL, NULL, NULL }, /* _An */ + { NULL, pre_an, NULL, NULL, NULL }, /* An */ { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ar */ { NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Cd */ { NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Cm */ @@ -119,7 +116,7 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, NULL, NULL, NULL, NULL }, /* _Fd */ { NULL, pre_enc, post_enc, "\\fB-", "\\fP" }, /* Fl */ { NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */ - { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ft */ + { NULL, pre_ft, post_enc, NULL, "\\fP" }, /* Ft */ { NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ic */ { NULL, pre_in, post_in, NULL, NULL }, /* In */ { NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Li */ @@ -134,7 +131,7 @@ static const struct manact manacts[MDOC_MAX + 1] = { "variable \\fIerrno\\fP is set to indicate the error." }, /* Rv */ { NULL, NULL, NULL, NULL, NULL }, /* St */ - { NULL, NULL, NULL, NULL, NULL }, /* _Va */ + { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Va */ { NULL, pre_vt, post_vt, NULL, NULL }, /* Vt */ { NULL, pre_xr, NULL, NULL, NULL }, /* Xr */ { NULL, NULL, post_percent, NULL, NULL }, /* _%A */ @@ -168,7 +165,7 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, NULL, NULL, NULL, NULL }, /* _Eo */ { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */ { NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ms */ - { NULL, NULL, NULL, NULL, NULL }, /* No */ + { NULL, pre_no, NULL, NULL, NULL }, /* No */ { NULL, pre_ns, NULL, NULL, NULL }, /* Ns */ { NULL, pre_ux, NULL, "NetBSD", NULL }, /* Nx */ { NULL, pre_ux, NULL, "OpenBSD", NULL }, /* Ox */ @@ -204,8 +201,8 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */ { NULL, NULL, post_lb, NULL, NULL }, /* Lb */ { NULL, pre_pp, NULL, NULL, NULL }, /* Lp */ - { NULL, NULL, NULL, NULL, NULL }, /* _Lk */ - { NULL, NULL, NULL, NULL, NULL }, /* _Mt */ + { NULL, pre_lk, NULL, NULL, NULL }, /* Lk */ + { NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Mt */ { cond_body, pre_enc, post_enc, "{", "}" }, /* Brq */ { cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */ { NULL, NULL, NULL, NULL, NULL }, /* Brc */ @@ -221,26 +218,42 @@ static const struct manact manacts[MDOC_MAX + 1] = { { NULL, NULL, NULL, NULL, NULL }, /* ROOT */ }; +static int outflags; +#define MMAN_spc (1 << 0) +#define MMAN_spc_force (1 << 1) +#define MMAN_nl (1 << 2) +#define MMAN_br (1 << 3) +#define MMAN_sp (1 << 4) +#define MMAN_Sm (1 << 5) +#define MMAN_Bk (1 << 6) +#define MMAN_An_split (1 << 7) +#define MMAN_An_nosplit (1 << 8) + static void -print_word(struct mman *mm, const char *s) +print_word(const char *s) { - if (mm->need_nl) { + if ((MMAN_sp | MMAN_br | MMAN_nl) & outflags) { /* * If we need a newline, print it now and start afresh. */ - putchar('\n'); - mm->need_space = 0; - mm->need_nl = 0; - } else if (mm->need_space && '\0' != s[0]) + if (MMAN_sp & outflags) + printf("\n.sp\n"); + else if (MMAN_br & outflags) + printf("\n.br\n"); + else if (MMAN_nl & outflags) + putchar('\n'); + outflags &= ~(MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc); + } else if (MMAN_spc & outflags && '\0' != s[0]) /* - * If we need a space, only print it before - * (1) a nonzero length word; - * (2) a word that is non-punctuation; and - * (3) if punctuation, non-terminating puncutation. + * If we need a space, only print it if + * (1) it is forced by `No' or + * (2) what follows is not terminating punctuation or + * (3) what follows is longer than one character. */ - if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) { - if (mm->mode_keep) { + if (MMAN_spc_force & outflags || + NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) { + if (MMAN_Bk & outflags) { putchar('\\'); putchar('~'); } else @@ -251,8 +264,12 @@ print_word(struct mman *mm, const char *s) * Reassign needing space if we're not following opening * punctuation. */ - mm->need_space = mm->mode_space && - (('(' != s[0] && '[' != s[0]) || '\0' != s[1]); + if (MMAN_Sm & outflags && + (('(' != s[0] && '[' != s[0]) || '\0' != s[1])) + outflags |= MMAN_spc; + else + outflags &= ~MMAN_spc; + outflags &= ~MMAN_spc_force; for ( ; *s; s++) { switch (*s) { @@ -270,7 +287,7 @@ print_word(struct mman *mm, const char *s) } static void -print_offs(struct mman *mm, const char *v) +print_offs(const char *v) { char buf[24]; struct roffsu su; @@ -283,13 +300,13 @@ print_offs(struct mman *mm, const char *v) else if (0 == strcmp(v, "indent-two")) sz = 12; else if (a2roffsu(v, &su, SCALE_MAX)) { - print_word(mm, v); + print_word(v); return; } else sz = strlen(v); snprintf(buf, sizeof(buf), "%ldn", sz); - print_word(mm, buf); + print_word(buf); } void @@ -310,7 +327,6 @@ man_mdoc(void *arg, const struct mdoc *mdoc) { const struct mdoc_meta *m; const struct mdoc_node *n; - struct mman mm; m = mdoc_meta(mdoc); n = mdoc_node(mdoc); @@ -318,11 +334,8 @@ man_mdoc(void *arg, const struct mdoc *mdoc) printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", m->title, m->msec, m->date, m->os, m->vol); - memset(&mm, 0, sizeof(struct mman)); - - mm.mode_space = 1; - mm.need_nl = 1; - print_node(m, n, &mm); + outflags = MMAN_nl | MMAN_Sm; + print_node(m, n); putchar('\n'); } @@ -340,7 +353,7 @@ print_node(DECL_ARGS) prev = n->prev ? n->prev : n->parent; if (prev && prev->line < n->line && MDOC_Fo != prev->tok && MDOC_Ns != prev->tok) - mm->need_nl = 1; + outflags |= MMAN_nl; act = NULL; cond = 0; @@ -351,21 +364,21 @@ print_node(DECL_ARGS) * Make sure that we don't happen to start with a * control character at the start of a line. */ - if (mm->need_nl && ('.' == *n->string || + if (MMAN_nl & outflags && ('.' == *n->string || '\'' == *n->string)) { - print_word(mm, "\\&"); - mm->need_space = 0; + print_word("\\&"); + outflags &= ~MMAN_spc; } - print_word(mm, n->string); + print_word(n->string); } else { /* * Conditionally run the pre-node action handler for a * node. */ act = manacts + n->tok; - cond = NULL == act->cond || (*act->cond)(m, n, mm); + cond = NULL == act->cond || (*act->cond)(m, n); if (cond && act->pre) - do_sub = (*act->pre)(m, n, mm); + do_sub = (*act->pre)(m, n); } /* @@ -375,13 +388,13 @@ print_node(DECL_ARGS) */ if (do_sub) for (sub = n->child; sub; sub = sub->next) - print_node(m, sub, mm); + print_node(m, sub); /* * Lastly, conditionally run the post-node handler. */ if (cond && act->post) - (*act->post)(m, n, mm); + (*act->post)(m, n); } static int @@ -410,8 +423,8 @@ pre_enc(DECL_ARGS) prefix = manacts[n->tok].prefix; if (NULL == prefix) return(1); - print_word(mm, prefix); - mm->need_space = 0; + print_word(prefix); + outflags &= ~MMAN_spc; return(1); } @@ -426,10 +439,10 @@ post_enc(DECL_ARGS) suffix = manacts[n->tok].suffix; if (NULL == suffix) return; - mm->need_space = 0; - print_word(mm, suffix); + outflags &= ~MMAN_spc; + print_word(suffix); if (MDOC_Fl == n->tok && 0 == n->nchild) - mm->need_space = 0; + outflags &= ~MMAN_spc; } /* @@ -441,12 +454,12 @@ static void post_percent(DECL_ARGS) { - post_enc(m, n, mm); + post_enc(m, n); if (n->next) - print_word(mm, ","); + print_word(","); else { - print_word(mm, "."); - mm->need_nl = 1; + print_word("."); + outflags |= MMAN_nl; } } @@ -459,10 +472,10 @@ pre_sect(DECL_ARGS) if (MDOC_HEAD != n->type) return(1); - mm->need_nl = 1; - print_word(mm, manacts[n->tok].prefix); - print_word(mm, "\""); - mm->need_space = 0; + outflags |= MMAN_nl; + print_word(manacts[n->tok].prefix); + print_word("\""); + outflags &= ~MMAN_spc; return(1); } @@ -475,18 +488,83 @@ post_sect(DECL_ARGS) if (MDOC_HEAD != n->type) return; - mm->need_space = 0; - print_word(mm, "\""); - mm->need_nl = 1; + outflags &= ~MMAN_spc; + print_word("\""); + outflags |= MMAN_nl; + if (MDOC_Sh == n->tok && SEC_AUTHORS == n->sec) + outflags &= ~(MMAN_An_split | MMAN_An_nosplit); } +/* See mdoc_term.c, synopsis_pre() for comments. */ +static void +pre_syn(const struct mdoc_node *n) +{ + + if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) + return; + + if (n->prev->tok == n->tok && + MDOC_Ft != n->tok && + MDOC_Fo != n->tok && + MDOC_Fn != n->tok) { + outflags |= MMAN_br; + return; + } + + switch (n->prev->tok) { + case (MDOC_Fd): + /* FALLTHROUGH */ + case (MDOC_Fn): + /* FALLTHROUGH */ + case (MDOC_Fo): + /* FALLTHROUGH */ + case (MDOC_In): + /* FALLTHROUGH */ + case (MDOC_Vt): + outflags |= MMAN_sp; + break; + case (MDOC_Ft): + if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { + outflags |= MMAN_sp; + break; + } + /* FALLTHROUGH */ + default: + outflags |= MMAN_br; + break; + } +} + static int +pre_an(DECL_ARGS) +{ + + switch (n->norm->An.auth) { + case (AUTH_split): + outflags &= ~MMAN_An_nosplit; + outflags |= MMAN_An_split; + return(0); + case (AUTH_nosplit): + outflags &= ~MMAN_An_split; + outflags |= MMAN_An_nosplit; + return(0); + default: + if (MMAN_An_split & outflags) + outflags |= MMAN_br; + else if (SEC_AUTHORS == n->sec && + ! (MMAN_An_nosplit & outflags)) + outflags |= MMAN_An_split; + return(1); + } +} + +static int pre_ap(DECL_ARGS) { - mm->need_space = 0; - print_word(mm, "'"); - mm->need_space = 0; + outflags &= ~MMAN_spc; + print_word("'"); + outflags &= ~MMAN_spc; return(0); } @@ -494,19 +572,17 @@ static int pre_bd(DECL_ARGS) { - if (0 == n->norm->Bd.comp) { - mm->need_nl = 1; - print_word(mm, ".sp"); - } + if (0 == n->norm->Bd.comp) + outflags |= MMAN_sp; if (DISP_unfilled == n->norm->Bd.type || DISP_literal == n->norm->Bd.type) { - mm->need_nl = 1; - print_word(mm, ".nf"); + outflags |= MMAN_nl; + print_word(".nf"); } - mm->need_nl = 1; - print_word(mm, ".RS"); - print_offs(mm, n->norm->Bd.offs); - mm->need_nl = 1; + outflags |= MMAN_nl; + print_word(".RS"); + print_offs(n->norm->Bd.offs); + outflags |= MMAN_nl; return(1); } @@ -514,14 +590,14 @@ static void post_bd(DECL_ARGS) { - mm->need_nl = 1; - print_word(mm, ".RE"); + outflags |= MMAN_nl; + print_word(".RE"); if (DISP_unfilled == n->norm->Bd.type || DISP_literal == n->norm->Bd.type) { - mm->need_nl = 1; - print_word(mm, ".fi"); + outflags |= MMAN_nl; + print_word(".fi"); } - mm->need_nl = 1; + outflags |= MMAN_nl; } static int @@ -532,7 +608,7 @@ pre_bk(DECL_ARGS) case (MDOC_BLOCK): return(1); case (MDOC_BODY): - mm->mode_keep = 1; + outflags |= MMAN_Bk; return(1); default: return(0); @@ -544,16 +620,14 @@ post_bk(DECL_ARGS) { if (MDOC_BODY == n->type) - mm->mode_keep = 0; + outflags &= ~MMAN_Bk; } static int pre_br(DECL_ARGS) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; + outflags |= MMAN_br; return(0); } @@ -563,17 +637,17 @@ pre_bx(DECL_ARGS) n = n->child; if (n) { - print_word(mm, n->string); - mm->need_space = 0; + print_word(n->string); + outflags &= ~MMAN_spc; n = n->next; } - print_word(mm, "BSD"); + print_word("BSD"); if (NULL == n) return(0); - mm->need_space = 0; - print_word(mm, "-"); - mm->need_space = 0; - print_word(mm, n->string); + outflags &= ~MMAN_spc; + print_word("-"); + outflags &= ~MMAN_spc; + print_word(n->string); return(0); } @@ -581,9 +655,9 @@ static int pre_dl(DECL_ARGS) { - mm->need_nl = 1; - print_word(mm, ".RS 6n"); - mm->need_nl = 1; + outflags |= MMAN_nl; + print_word(".RS 6n"); + outflags |= MMAN_nl; return(1); } @@ -591,9 +665,9 @@ static void post_dl(DECL_ARGS) { - mm->need_nl = 1; - print_word(mm, ".RE"); - mm->need_nl = 1; + outflags |= MMAN_nl; + print_word(".RE"); + outflags |= MMAN_nl; } static int @@ -604,13 +678,13 @@ pre_fa(DECL_ARGS) n = n->child; while (NULL != n) { - print_word(mm, "\\fI"); - mm->need_space = 0; - print_node(m, n, mm); - mm->need_space = 0; - print_word(mm, "\\fP"); + print_word("\\fI"); + outflags &= ~MMAN_spc; + print_node(m, n); + outflags &= ~MMAN_spc; + print_word("\\fP"); if (NULL != (n = n->next)) - print_word(mm, ","); + print_word(","); } return(0); } @@ -620,41 +694,36 @@ post_fa(DECL_ARGS) { if (NULL != n->next && MDOC_Fa == n->next->tok) - print_word(mm, ","); + print_word(","); } static int pre_fn(DECL_ARGS) { + pre_syn(n); + n = n->child; if (NULL == n) return(0); - if (MDOC_SYNPRETTY & n->flags) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; - } - print_word(mm, "\\fB"); - mm->need_space = 0; - print_node(m, n, mm); - mm->need_space = 0; - print_word(mm, "\\fP("); - mm->need_space = 0; - return(pre_fa(m, n->next, mm)); + print_word("\\fB"); + outflags &= ~MMAN_spc; + print_node(m, n); + outflags &= ~MMAN_spc; + print_word("\\fP("); + outflags &= ~MMAN_spc; + return(pre_fa(m, n->next)); } static void post_fn(DECL_ARGS) { - print_word(mm, ")"); + print_word(")"); if (MDOC_SYNPRETTY & n->flags) { - print_word(mm, ";"); - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; + print_word(";"); + outflags |= MMAN_br; } } @@ -663,19 +732,17 @@ pre_fo(DECL_ARGS) { switch (n->type) { + case (MDOC_BLOCK): + pre_syn(n); + break; case (MDOC_HEAD): - if (MDOC_SYNPRETTY & n->flags) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; - } - print_word(mm, "\\fB"); - mm->need_space = 0; + print_word("\\fB"); + outflags &= ~MMAN_spc; break; case (MDOC_BODY): - mm->need_space = 0; - print_word(mm, "("); - mm->need_space = 0; + outflags &= ~MMAN_spc; + print_word("("); + outflags &= ~MMAN_spc; break; default: break; @@ -689,11 +756,11 @@ post_fo(DECL_ARGS) switch (n->type) { case (MDOC_HEAD): - mm->need_space = 0; - print_word(mm, "\\fP"); + outflags &= ~MMAN_spc; + print_word("\\fP"); break; case (MDOC_BODY): - post_fn(m, n, mm); + post_fn(m, n); break; default: break; @@ -701,17 +768,25 @@ post_fo(DECL_ARGS) } static int +pre_ft(DECL_ARGS) +{ + + pre_syn(n); + print_word("\\fI"); + outflags &= ~MMAN_spc; + return(1); +} + +static int pre_in(DECL_ARGS) { if (MDOC_SYNPRETTY & n->flags) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; - print_word(mm, "\\fB#include <"); + pre_syn(n); + print_word("\\fB#include <"); } else - print_word(mm, "<\\fI"); - mm->need_space = 0; + print_word("<\\fI"); + outflags &= ~MMAN_spc; return(1); } @@ -719,14 +794,12 @@ static void post_in(DECL_ARGS) { - mm->need_space = 0; + outflags &= ~MMAN_spc; if (MDOC_SYNPRETTY & n->flags) { - print_word(mm, ">\\fP"); - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; + print_word(">\\fP"); + outflags |= MMAN_br; } else - print_word(mm, "\\fP>"); + print_word("\\fP>"); } static int @@ -735,21 +808,21 @@ pre_it(DECL_ARGS) const struct mdoc_node *bln; if (MDOC_HEAD == n->type) { - mm->need_nl = 1; - print_word(mm, ".TP"); + outflags |= MMAN_nl; + print_word(".TP"); bln = n->parent->parent->prev; switch (bln->norm->Bl.type) { case (LIST_bullet): - print_word(mm, "4n"); - mm->need_nl = 1; - print_word(mm, "\\fBo\\fP"); + print_word("4n"); + outflags |= MMAN_nl; + print_word("\\fBo\\fP"); break; default: if (bln->norm->Bl.width) - print_word(mm, bln->norm->Bl.width); + print_word(bln->norm->Bl.width); break; } - mm->need_nl = 1; + outflags |= MMAN_nl; } return(1); } @@ -758,28 +831,52 @@ static void post_lb(DECL_ARGS) { - if (SEC_LIBRARY == n->sec) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; + if (SEC_LIBRARY == n->sec) + outflags |= MMAN_br; +} + +static int +pre_lk(DECL_ARGS) +{ + const struct mdoc_node *link, *descr; + + if (NULL == (link = n->child)) + return(0); + + if (NULL != (descr = link->next)) { + print_word("\\fI"); + outflags &= ~MMAN_spc; + while (NULL != descr) { + print_word(descr->string); + descr = descr->next; + } + print_word(":"); + outflags &= ~MMAN_spc; + print_word("\\fP"); } + + print_word("\\fB"); + outflags &= ~MMAN_spc; + print_word(link->string); + outflags &= ~MMAN_spc; + print_word("\\fP"); + return(0); } static int pre_nm(DECL_ARGS) { + if (MDOC_BLOCK == n->type) + pre_syn(n); if (MDOC_ELEM != n->type && MDOC_HEAD != n->type) return(1); - if (MDOC_SYNPRETTY & n->flags) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; - } - print_word(mm, "\\fB"); - mm->need_space = 0; + if (NULL == n->child && NULL == m->name) + return(0); + print_word("\\fB"); + outflags &= ~MMAN_spc; if (NULL == n->child) - print_word(mm, m->name); + print_word(m->name); return(1); } @@ -789,15 +886,23 @@ post_nm(DECL_ARGS) if (MDOC_ELEM != n->type && MDOC_HEAD != n->type) return; - mm->need_space = 0; - print_word(mm, "\\fP"); + outflags &= ~MMAN_spc; + print_word("\\fP"); } static int +pre_no(DECL_ARGS) +{ + + outflags |= MMAN_spc_force; + return(1); +} + +static int pre_ns(DECL_ARGS) { - mm->need_space = 0; + outflags &= ~MMAN_spc; return(0); } @@ -805,19 +910,19 @@ static void post_pf(DECL_ARGS) { - mm->need_space = 0; + outflags &= ~MMAN_spc; } static int pre_pp(DECL_ARGS) { - mm->need_nl = 1; + outflags |= MMAN_nl; if (MDOC_It == n->parent->tok) - print_word(mm, ".sp"); + print_word(".sp"); else - print_word(mm, ".PP"); - mm->need_nl = 1; + print_word(".PP"); + outflags |= MMAN_nl; return(MDOC_Rs == n->tok); } @@ -827,9 +932,9 @@ pre_sm(DECL_ARGS) assert(n->child && MDOC_TEXT == n->child->type); if (0 == strcmp("on", n->child->string)) - mm->mode_space = 1; + outflags |= MMAN_Sm; else - mm->mode_space = 0; + outflags &= ~MMAN_Sm; return(0); } @@ -837,8 +942,8 @@ static int pre_sp(DECL_ARGS) { - mm->need_nl = 1; - print_word(mm, ".sp"); + outflags |= MMAN_nl; + print_word(".sp"); return(1); } @@ -846,7 +951,7 @@ static void post_sp(DECL_ARGS) { - mm->need_nl = 1; + outflags |= MMAN_nl; } static int @@ -856,18 +961,16 @@ pre_vt(DECL_ARGS) if (MDOC_SYNPRETTY & n->flags) { switch (n->type) { case (MDOC_BLOCK): + pre_syn(n); return(1); case (MDOC_BODY): break; default: return(0); } - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; } - print_word(mm, "\\fI"); - mm->need_space = 0; + print_word("\\fI"); + outflags &= ~MMAN_spc; return(1); } @@ -875,16 +978,11 @@ static void post_vt(DECL_ARGS) { - if (MDOC_BODY != n->type) + if (MDOC_SYNPRETTY & n->flags && MDOC_BODY != n->type) return; - mm->need_space = 0; - print_word(mm, "\\fP"); - if (MDOC_SYNPRETTY & n->flags) { - mm->need_nl = 1; - print_word(mm, ".br"); - mm->need_nl = 1; - } + outflags &= ~MMAN_spc; + print_word("\\fP"); } static int @@ -894,14 +992,14 @@ pre_xr(DECL_ARGS) n = n->child; if (NULL == n) return(0); - print_node(m, n, mm); + print_node(m, n); n = n->next; if (NULL == n) return(0); - mm->need_space = 0; - print_word(mm, "("); - print_node(m, n, mm); - print_word(mm, ")"); + outflags &= ~MMAN_spc; + print_word("("); + print_node(m, n); + print_word(")"); return(0); } @@ -909,11 +1007,11 @@ static int pre_ux(DECL_ARGS) { - print_word(mm, manacts[n->tok].prefix); + print_word(manacts[n->tok].prefix); if (NULL == n->child) return(0); - mm->need_space = 0; - print_word(mm, "\\~"); - mm->need_space = 0; + outflags &= ~MMAN_spc; + print_word("\\~"); + outflags &= ~MMAN_spc; return(1); }