version 1.313, 2017/01/10 12:53:07 |
version 1.316, 2017/01/10 23:36:34 |
Line 104 static void post_sm(POST_ARGS); |
|
Line 104 static void post_sm(POST_ARGS); |
|
static void post_st(POST_ARGS); |
static void post_st(POST_ARGS); |
static void post_std(POST_ARGS); |
static void post_std(POST_ARGS); |
static void post_xr(POST_ARGS); |
static void post_xr(POST_ARGS); |
|
static void post_xx(POST_ARGS); |
|
|
static v_post mdoc_valids[MDOC_MAX] = { |
static v_post mdoc_valids[MDOC_MAX] = { |
NULL, /* Ap */ |
NULL, /* Ap */ |
Line 166 static v_post mdoc_valids[MDOC_MAX] = { |
|
Line 167 static v_post mdoc_valids[MDOC_MAX] = { |
|
post_bf, /* Bf */ |
post_bf, /* Bf */ |
NULL, /* Bo */ |
NULL, /* Bo */ |
NULL, /* Bq */ |
NULL, /* Bq */ |
NULL, /* Bsx */ |
post_xx, /* Bsx */ |
post_bx, /* Bx */ |
post_bx, /* Bx */ |
post_obsolete, /* Db */ |
post_obsolete, /* Db */ |
NULL, /* Dc */ |
NULL, /* Dc */ |
Line 176 static v_post mdoc_valids[MDOC_MAX] = { |
|
Line 177 static v_post mdoc_valids[MDOC_MAX] = { |
|
NULL, /* Ef */ |
NULL, /* Ef */ |
NULL, /* Em */ |
NULL, /* Em */ |
NULL, /* Eo */ |
NULL, /* Eo */ |
NULL, /* Fx */ |
post_xx, /* Fx */ |
NULL, /* Ms */ |
NULL, /* Ms */ |
NULL, /* No */ |
NULL, /* No */ |
post_ns, /* Ns */ |
post_ns, /* Ns */ |
NULL, /* Nx */ |
post_xx, /* Nx */ |
NULL, /* Ox */ |
post_xx, /* Ox */ |
NULL, /* Pc */ |
NULL, /* Pc */ |
NULL, /* Pf */ |
NULL, /* Pf */ |
NULL, /* Po */ |
NULL, /* Po */ |
Line 199 static v_post mdoc_valids[MDOC_MAX] = { |
|
Line 200 static v_post mdoc_valids[MDOC_MAX] = { |
|
post_hyph, /* Sx */ |
post_hyph, /* Sx */ |
NULL, /* Sy */ |
NULL, /* Sy */ |
NULL, /* Tn */ |
NULL, /* Tn */ |
NULL, /* Ux */ |
post_xx, /* Ux */ |
NULL, /* Xc */ |
NULL, /* Xc */ |
NULL, /* Xo */ |
NULL, /* Xo */ |
post_fo, /* Fo */ |
post_fo, /* Fo */ |
Line 222 static v_post mdoc_valids[MDOC_MAX] = { |
|
Line 223 static v_post mdoc_valids[MDOC_MAX] = { |
|
NULL, /* %C */ |
NULL, /* %C */ |
post_es, /* Es */ |
post_es, /* Es */ |
post_en, /* En */ |
post_en, /* En */ |
NULL, /* Dx */ |
post_xx, /* Dx */ |
NULL, /* %Q */ |
NULL, /* %Q */ |
post_par, /* br */ |
post_par, /* br */ |
post_par, /* sp */ |
post_par, /* sp */ |
Line 317 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 318 mdoc_node_validate(struct roff_man *mdoc) |
|
*/ |
*/ |
|
|
if (n->child != NULL) |
if (n->child != NULL) |
n->child->flags &= ~MDOC_DELIMC; |
n->child->flags &= ~NODE_DELIMC; |
if (n->last != NULL) |
if (n->last != NULL) |
n->last->flags &= ~MDOC_DELIMO; |
n->last->flags &= ~NODE_DELIMO; |
|
|
/* Call the macro's postprocessor. */ |
/* Call the macro's postprocessor. */ |
|
|
Line 964 post_defaults(POST_ARGS) |
|
Line 965 post_defaults(POST_ARGS) |
|
static void |
static void |
post_at(POST_ARGS) |
post_at(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n, *nch; |
const char *std_att; |
const char *att; |
char *att; |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->child == NULL) { |
nch = n->child; |
mdoc->next = ROFF_NEXT_CHILD; |
|
roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX"); |
|
mdoc->last = n; |
|
return; |
|
} |
|
|
|
/* |
/* |
* If we have a child, look it up in the standard keys. If a |
* If we have a child, look it up in the standard keys. If a |
Line 982 post_at(POST_ARGS) |
|
Line 977 post_at(POST_ARGS) |
|
* prefix "AT&T UNIX " to the existing data. |
* prefix "AT&T UNIX " to the existing data. |
*/ |
*/ |
|
|
n = n->child; |
att = NULL; |
assert(n->type == ROFFT_TEXT); |
if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL)) |
if ((std_att = mdoc_a2att(n->string)) == NULL) { |
|
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
n->line, n->pos, "At %s", n->string); |
nch->line, nch->pos, "At %s", nch->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
|
} else |
|
att = mandoc_strdup(std_att); |
|
|
|
free(n->string); |
mdoc->next = ROFF_NEXT_CHILD; |
n->string = att; |
if (att != NULL) { |
|
roff_word_alloc(mdoc, nch->line, nch->pos, att); |
|
nch->flags |= NODE_NOPRT; |
|
} else |
|
roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX"); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->last = n; |
} |
} |
|
|
static void |
static void |
Line 1031 post_es(POST_ARGS) |
|
Line 1028 post_es(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
|
post_xx(POST_ARGS) |
|
{ |
|
struct roff_node *n; |
|
const char *os; |
|
|
|
n = mdoc->last; |
|
switch (n->tok) { |
|
case MDOC_Bsx: |
|
os = "BSD/OS"; |
|
break; |
|
case MDOC_Dx: |
|
os = "DragonFly"; |
|
break; |
|
case MDOC_Fx: |
|
os = "FreeBSD"; |
|
break; |
|
case MDOC_Nx: |
|
os = "NetBSD"; |
|
break; |
|
case MDOC_Ox: |
|
os = "OpenBSD"; |
|
break; |
|
case MDOC_Ux: |
|
os = "UNIX"; |
|
break; |
|
default: |
|
abort(); |
|
} |
|
mdoc->next = ROFF_NEXT_CHILD; |
|
roff_word_alloc(mdoc, n->line, n->pos, os); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->last = n; |
|
} |
|
|
|
static void |
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
struct roff_node *nbl, *nit, *nch; |
struct roff_node *nbl, *nit, *nch; |
|
|
post_ns(POST_ARGS) |
post_ns(POST_ARGS) |
{ |
{ |
|
|
if (mdoc->last->flags & MDOC_LINE) |
if (mdoc->last->flags & NODE_LINE) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
Line 2076 post_dt(POST_ARGS) |
|
Line 2108 post_dt(POST_ARGS) |
|
static void |
static void |
post_bx(POST_ARGS) |
post_bx(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n, *nch; |
|
|
|
n = mdoc->last; |
|
nch = n->child; |
|
|
|
if (nch != NULL) { |
|
mdoc->last = nch; |
|
nch = nch->next; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
} else |
|
mdoc->next = ROFF_NEXT_CHILD; |
|
roff_word_alloc(mdoc, n->line, n->pos, "BSD"); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
|
|
if (nch == NULL) { |
|
mdoc->last = n; |
|
return; |
|
} |
|
|
|
roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
roff_word_alloc(mdoc, n->line, n->pos, "-"); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->last = n; |
|
|
/* |
/* |
* Make `Bx's second argument always start with an uppercase |
* Make `Bx's second argument always start with an uppercase |
* letter. Groff checks if it's an "accepted" term, but we just |
* letter. Groff checks if it's an "accepted" term, but we just |
* uppercase blindly. |
* uppercase blindly. |
*/ |
*/ |
|
|
if ((n = mdoc->last->child) != NULL && (n = n->next) != NULL) |
*nch->string = (char)toupper((unsigned char)*nch->string); |
*n->string = (char)toupper((unsigned char)*n->string); |
|
} |
} |
|
|
static void |
static void |