version 1.345, 2017/06/29 15:22:17 |
version 1.378, 2020/02/27 01:43:52 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
|
|
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_xr.h" |
#include "roff.h" |
#include "roff.h" |
#include "mdoc.h" |
#include "mdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
Line 52 enum check_ineq { |
|
Line 53 enum check_ineq { |
|
typedef void (*v_post)(POST_ARGS); |
typedef void (*v_post)(POST_ARGS); |
|
|
static int build_list(struct roff_man *, int); |
static int build_list(struct roff_man *, int); |
static void check_text(struct roff_man *, int, int, char *); |
|
static void check_argv(struct roff_man *, |
static void check_argv(struct roff_man *, |
struct roff_node *, struct mdoc_argv *); |
struct roff_node *, struct mdoc_argv *); |
static void check_args(struct roff_man *, struct roff_node *); |
static void check_args(struct roff_man *, struct roff_node *); |
|
static void check_text(struct roff_man *, int, int, char *); |
|
static void check_text_em(struct roff_man *, int, int, char *); |
static void check_toptext(struct roff_man *, int, int, const char *); |
static void check_toptext(struct roff_man *, int, int, const char *); |
static int child_an(const struct roff_node *); |
static int child_an(const struct roff_node *); |
static size_t macro2len(enum roff_tok); |
static size_t macro2len(enum roff_tok); |
static void rewrite_macro2len(struct roff_man *, char **); |
static void rewrite_macro2len(struct roff_man *, char **); |
static int similar(const char *, const char *); |
static int similar(const char *, const char *); |
|
|
|
static void post_abort(POST_ARGS) __attribute__((__noreturn__)); |
static void post_an(POST_ARGS); |
static void post_an(POST_ARGS); |
static void post_an_norm(POST_ARGS); |
static void post_an_norm(POST_ARGS); |
static void post_at(POST_ARGS); |
static void post_at(POST_ARGS); |
Line 77 static void post_defaults(POST_ARGS); |
|
Line 80 static void post_defaults(POST_ARGS); |
|
static void post_display(POST_ARGS); |
static void post_display(POST_ARGS); |
static void post_dd(POST_ARGS); |
static void post_dd(POST_ARGS); |
static void post_delim(POST_ARGS); |
static void post_delim(POST_ARGS); |
|
static void post_delim_nb(POST_ARGS); |
static void post_dt(POST_ARGS); |
static void post_dt(POST_ARGS); |
static void post_en(POST_ARGS); |
static void post_en(POST_ARGS); |
static void post_es(POST_ARGS); |
static void post_es(POST_ARGS); |
Line 108 static void post_sh_authors(POST_ARGS); |
|
Line 112 static void post_sh_authors(POST_ARGS); |
|
static void post_sm(POST_ARGS); |
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_sx(POST_ARGS); |
|
static void post_tg(POST_ARGS); |
static void post_useless(POST_ARGS); |
static void post_useless(POST_ARGS); |
static void post_xr(POST_ARGS); |
static void post_xr(POST_ARGS); |
static void post_xx(POST_ARGS); |
static void post_xx(POST_ARGS); |
|
|
static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = { |
static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] = { |
post_dd, /* Dd */ |
post_dd, /* Dd */ |
post_dt, /* Dt */ |
post_dt, /* Dt */ |
post_os, /* Os */ |
post_os, /* Os */ |
Line 126 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 132 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
post_bl, /* Bl */ |
post_bl, /* Bl */ |
NULL, /* El */ |
NULL, /* El */ |
post_it, /* It */ |
post_it, /* It */ |
post_delim, /* Ad */ |
post_delim_nb, /* Ad */ |
post_an, /* An */ |
post_an, /* An */ |
NULL, /* Ap */ |
NULL, /* Ap */ |
post_defaults, /* Ar */ |
post_defaults, /* Ar */ |
NULL, /* Cd */ |
NULL, /* Cd */ |
post_delim, /* Cm */ |
post_delim_nb, /* Cm */ |
post_delim, /* Dv */ |
post_delim_nb, /* Dv */ |
post_delim, /* Er */ |
post_delim_nb, /* Er */ |
post_delim, /* Ev */ |
post_delim_nb, /* Ev */ |
post_ex, /* Ex */ |
post_ex, /* Ex */ |
post_fa, /* Fa */ |
post_fa, /* Fa */ |
NULL, /* Fd */ |
NULL, /* Fd */ |
post_delim, /* Fl */ |
post_delim_nb, /* Fl */ |
post_fn, /* Fn */ |
post_fn, /* Fn */ |
post_delim, /* Ft */ |
post_delim_nb, /* Ft */ |
post_delim, /* Ic */ |
post_delim_nb, /* Ic */ |
post_delim, /* In */ |
post_delim_nb, /* In */ |
post_defaults, /* Li */ |
post_defaults, /* Li */ |
post_nd, /* Nd */ |
post_nd, /* Nd */ |
post_nm, /* Nm */ |
post_nm, /* Nm */ |
post_delim, /* Op */ |
post_delim_nb, /* Op */ |
post_obsolete, /* Ot */ |
post_abort, /* Ot */ |
post_defaults, /* Pa */ |
post_defaults, /* Pa */ |
post_rv, /* Rv */ |
post_rv, /* Rv */ |
post_st, /* St */ |
post_st, /* St */ |
post_delim, /* Va */ |
post_delim_nb, /* Va */ |
post_delim, /* Vt */ |
post_delim_nb, /* Vt */ |
post_xr, /* Xr */ |
post_xr, /* Xr */ |
NULL, /* %A */ |
NULL, /* %A */ |
post_hyph, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
post_hyph, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
Line 166 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 172 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
post_hyph, /* %T */ /* FIXME: can be used outside Rs/Re. */ |
post_hyph, /* %T */ /* FIXME: can be used outside Rs/Re. */ |
NULL, /* %V */ |
NULL, /* %V */ |
NULL, /* Ac */ |
NULL, /* Ac */ |
post_delim, /* Ao */ |
NULL, /* Ao */ |
post_delim, /* Aq */ |
post_delim_nb, /* Aq */ |
post_at, /* At */ |
post_at, /* At */ |
NULL, /* Bc */ |
NULL, /* Bc */ |
post_bf, /* Bf */ |
post_bf, /* Bf */ |
post_delim, /* Bo */ |
NULL, /* Bo */ |
NULL, /* Bq */ |
NULL, /* Bq */ |
post_xx, /* Bsx */ |
post_xx, /* Bsx */ |
post_bx, /* Bx */ |
post_bx, /* Bx */ |
Line 181 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 187 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
NULL, /* Dq */ |
NULL, /* Dq */ |
NULL, /* Ec */ |
NULL, /* Ec */ |
NULL, /* Ef */ |
NULL, /* Ef */ |
post_delim, /* Em */ |
post_delim_nb, /* Em */ |
NULL, /* Eo */ |
NULL, /* Eo */ |
post_xx, /* Fx */ |
post_xx, /* Fx */ |
post_delim, /* Ms */ |
post_delim_nb, /* Ms */ |
NULL, /* No */ |
NULL, /* No */ |
post_ns, /* Ns */ |
post_ns, /* Ns */ |
post_xx, /* Nx */ |
post_xx, /* Nx */ |
post_xx, /* Ox */ |
post_xx, /* Ox */ |
NULL, /* Pc */ |
NULL, /* Pc */ |
NULL, /* Pf */ |
NULL, /* Pf */ |
post_delim, /* Po */ |
NULL, /* Po */ |
post_delim, /* Pq */ |
post_delim_nb, /* Pq */ |
NULL, /* Qc */ |
NULL, /* Qc */ |
post_delim, /* Ql */ |
post_delim_nb, /* Ql */ |
post_delim, /* Qo */ |
NULL, /* Qo */ |
post_delim, /* Qq */ |
post_delim_nb, /* Qq */ |
NULL, /* Re */ |
NULL, /* Re */ |
post_rs, /* Rs */ |
post_rs, /* Rs */ |
NULL, /* Sc */ |
NULL, /* Sc */ |
post_delim, /* So */ |
NULL, /* So */ |
post_delim, /* Sq */ |
post_delim_nb, /* Sq */ |
post_sm, /* Sm */ |
post_sm, /* Sm */ |
post_hyph, /* Sx */ |
post_sx, /* Sx */ |
post_delim, /* Sy */ |
post_delim_nb, /* Sy */ |
post_useless, /* Tn */ |
post_useless, /* Tn */ |
post_xx, /* Ux */ |
post_xx, /* Ux */ |
NULL, /* Xc */ |
NULL, /* Xc */ |
NULL, /* Xo */ |
NULL, /* Xo */ |
post_fo, /* Fo */ |
post_fo, /* Fo */ |
NULL, /* Fc */ |
NULL, /* Fc */ |
post_delim, /* Oo */ |
NULL, /* Oo */ |
NULL, /* Oc */ |
NULL, /* Oc */ |
post_bk, /* Bk */ |
post_bk, /* Bk */ |
NULL, /* Ek */ |
NULL, /* Ek */ |
Line 220 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 226 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
post_obsolete, /* Fr */ |
post_obsolete, /* Fr */ |
post_eoln, /* Ud */ |
post_eoln, /* Ud */ |
post_lb, /* Lb */ |
post_lb, /* Lb */ |
post_par, /* Lp */ |
post_abort, /* Lp */ |
post_delim, /* Lk */ |
post_delim_nb, /* Lk */ |
post_defaults, /* Mt */ |
post_defaults, /* Mt */ |
post_delim, /* Brq */ |
post_delim_nb, /* Brq */ |
post_delim, /* Bro */ |
NULL, /* Bro */ |
NULL, /* Brc */ |
NULL, /* Brc */ |
NULL, /* %C */ |
NULL, /* %C */ |
post_es, /* Es */ |
post_es, /* Es */ |
Line 233 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 239 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
NULL, /* %Q */ |
NULL, /* %Q */ |
NULL, /* %U */ |
NULL, /* %U */ |
NULL, /* Ta */ |
NULL, /* Ta */ |
|
post_tg, /* Tg */ |
}; |
}; |
static const v_post *const mdoc_valids = __mdoc_valids - MDOC_Dd; |
|
|
|
#define RSORD_MAX 14 /* Number of `Rs' blocks. */ |
#define RSORD_MAX 14 /* Number of `Rs' blocks. */ |
|
|
Line 282 static const char * const secnames[SEC__MAX] = { |
|
Line 288 static const char * const secnames[SEC__MAX] = { |
|
}; |
}; |
|
|
|
|
|
/* Validate the subtree rooted at mdoc->last. */ |
void |
void |
mdoc_node_validate(struct roff_man *mdoc) |
mdoc_validate(struct roff_man *mdoc) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n, *np; |
const v_post *p; |
const v_post *p; |
|
|
|
/* |
|
* Translate obsolete macros to modern macros first |
|
* such that later code does not need to look |
|
* for the obsolete versions. |
|
*/ |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
switch (n->tok) { |
|
case MDOC_Lp: |
|
n->tok = MDOC_Pp; |
|
break; |
|
case MDOC_Ot: |
|
post_obsolete(mdoc); |
|
n->tok = MDOC_Ft; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Iterate over all children, recursing into each one |
|
* in turn, depth-first. |
|
*/ |
|
|
mdoc->last = mdoc->last->child; |
mdoc->last = mdoc->last->child; |
while (mdoc->last != NULL) { |
while (mdoc->last != NULL) { |
mdoc_node_validate(mdoc); |
mdoc_validate(mdoc); |
if (mdoc->last == n) |
if (mdoc->last == n) |
mdoc->last = mdoc->last->child; |
mdoc->last = mdoc->last->child; |
else |
else |
mdoc->last = mdoc->last->next; |
mdoc->last = mdoc->last->next; |
} |
} |
|
|
|
/* Finally validate the macro itself. */ |
|
|
mdoc->last = n; |
mdoc->last = n; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
|
np = n->parent; |
if (n->sec != SEC_SYNOPSIS || |
if (n->sec != SEC_SYNOPSIS || |
(n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd)) |
(np->tok != MDOC_Cd && np->tok != MDOC_Fd)) |
check_text(mdoc, n->line, n->pos, n->string); |
check_text(mdoc, n->line, n->pos, n->string); |
if (n->parent->tok == MDOC_It || |
if ((n->flags & NODE_NOFILL) == 0 && |
(n->parent->type == ROFFT_BODY && |
(np->tok != MDOC_It || np->type != ROFFT_HEAD || |
(n->parent->tok == MDOC_Sh || |
np->parent->parent->norm->Bl.type != LIST_diag)) |
n->parent->tok == MDOC_Ss))) |
check_text_em(mdoc, n->line, n->pos, n->string); |
|
if (np->tok == MDOC_It || (np->type == ROFFT_BODY && |
|
(np->tok == MDOC_Sh || np->tok == MDOC_Ss))) |
check_toptext(mdoc, n->line, n->pos, n->string); |
check_toptext(mdoc, n->line, n->pos, n->string); |
break; |
break; |
|
case ROFFT_COMMENT: |
case ROFFT_EQN: |
case ROFFT_EQN: |
case ROFFT_TBL: |
case ROFFT_TBL: |
break; |
break; |
Line 334 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 370 mdoc_node_validate(struct roff_man *mdoc) |
|
/* Call the macro's postprocessor. */ |
/* Call the macro's postprocessor. */ |
|
|
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
switch(n->tok) { |
roff_validate(mdoc); |
case ROFF_br: |
|
case ROFF_sp: |
|
post_par(mdoc); |
|
break; |
|
default: |
|
roff_validate(mdoc); |
|
break; |
|
} |
|
break; |
break; |
} |
} |
|
|
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
p = mdoc_valids + n->tok; |
p = mdoc_valids + (n->tok - MDOC_Dd); |
if (*p) |
if (*p) |
(*p)(mdoc); |
(*p)(mdoc); |
if (mdoc->last == n) |
if (mdoc->last == n) |
Line 383 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
Line 411 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
{ |
{ |
char *cp; |
char *cp; |
|
|
if (MDOC_LITERAL & mdoc->flags) |
if (mdoc->last->flags & NODE_NOFILL) |
return; |
return; |
|
|
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse, |
mandoc_msg(MANDOCERR_FI_TAB, ln, pos + (int)(p - cp), NULL); |
ln, pos + (int)(p - cp), NULL); |
|
} |
} |
|
|
static void |
static void |
|
check_text_em(struct roff_man *mdoc, int ln, int pos, char *p) |
|
{ |
|
const struct roff_node *np, *nn; |
|
char *cp; |
|
|
|
np = mdoc->last->prev; |
|
nn = mdoc->last->next; |
|
|
|
/* Look for em-dashes wrongly encoded as "--". */ |
|
|
|
for (cp = p; *cp != '\0'; cp++) { |
|
if (cp[0] != '-' || cp[1] != '-') |
|
continue; |
|
cp++; |
|
|
|
/* Skip input sequences of more than two '-'. */ |
|
|
|
if (cp[1] == '-') { |
|
while (cp[1] == '-') |
|
cp++; |
|
continue; |
|
} |
|
|
|
/* Skip "--" directly attached to something else. */ |
|
|
|
if ((cp - p > 1 && cp[-2] != ' ') || |
|
(cp[1] != '\0' && cp[1] != ' ')) |
|
continue; |
|
|
|
/* Require a letter right before or right afterwards. */ |
|
|
|
if ((cp - p > 2 ? |
|
isalpha((unsigned char)cp[-3]) : |
|
np != NULL && |
|
np->type == ROFFT_TEXT && |
|
*np->string != '\0' && |
|
isalpha((unsigned char)np->string[ |
|
strlen(np->string) - 1])) || |
|
(cp[1] != '\0' && cp[2] != '\0' ? |
|
isalpha((unsigned char)cp[2]) : |
|
nn != NULL && |
|
nn->type == ROFFT_TEXT && |
|
isalpha((unsigned char)*nn->string))) { |
|
mandoc_msg(MANDOCERR_DASHDASH, |
|
ln, pos + (int)(cp - p) - 1, NULL); |
|
break; |
|
} |
|
} |
|
} |
|
|
|
static void |
check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p) |
check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p) |
{ |
{ |
const char *cp, *cpr; |
const char *cp, *cpr; |
Line 400 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
Line 478 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
return; |
return; |
|
|
if ((cp = strstr(p, "OpenBSD")) != NULL) |
if ((cp = strstr(p, "OpenBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Ox"); |
ln, pos + (cp - p), "Ox"); |
|
if ((cp = strstr(p, "NetBSD")) != NULL) |
if ((cp = strstr(p, "NetBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Nx"); |
ln, pos + (cp - p), "Nx"); |
|
if ((cp = strstr(p, "FreeBSD")) != NULL) |
if ((cp = strstr(p, "FreeBSD")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Fx"); |
ln, pos + (cp - p), "Fx"); |
|
if ((cp = strstr(p, "DragonFly")) != NULL) |
if ((cp = strstr(p, "DragonFly")) != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Dx"); |
ln, pos + (cp - p), "Dx"); |
|
|
|
cp = p; |
cp = p; |
while ((cp = strstr(cp + 1, "()")) != NULL) { |
while ((cp = strstr(cp + 1, "()")) != NULL) { |
Line 419 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
Line 493 check_toptext(struct roff_man *mdoc, int ln, int pos, |
|
break; |
break; |
if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) { |
if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) { |
cpr++; |
cpr++; |
mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse, |
mandoc_msg(MANDOCERR_FUNC, ln, pos + (int)(cpr - p), |
ln, pos + (cpr - p), |
|
"%.*s()", (int)(cp - cpr), cpr); |
"%.*s()", (int)(cp - cpr), cpr); |
} |
} |
} |
} |
} |
} |
|
|
static void |
static void |
|
post_abort(POST_ARGS) |
|
{ |
|
abort(); |
|
} |
|
|
|
static void |
post_delim(POST_ARGS) |
post_delim(POST_ARGS) |
{ |
{ |
const struct roff_node *nch; |
const struct roff_node *nch; |
|
const char *lc; |
|
enum mdelim delim; |
|
enum roff_tok tok; |
|
|
|
tok = mdoc->last->tok; |
|
nch = mdoc->last->last; |
|
if (nch == NULL || nch->type != ROFFT_TEXT) |
|
return; |
|
lc = strchr(nch->string, '\0') - 1; |
|
if (lc < nch->string) |
|
return; |
|
delim = mdoc_isdelim(lc); |
|
if (delim == DELIM_NONE || delim == DELIM_OPEN) |
|
return; |
|
if (*lc == ')' && (tok == MDOC_Nd || tok == MDOC_Sh || |
|
tok == MDOC_Ss || tok == MDOC_Fo)) |
|
return; |
|
|
|
mandoc_msg(MANDOCERR_DELIM, nch->line, |
|
nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok], |
|
nch == mdoc->last->child ? "" : " ...", nch->string); |
|
} |
|
|
|
static void |
|
post_delim_nb(POST_ARGS) |
|
{ |
|
const struct roff_node *nch; |
const char *lc, *cp; |
const char *lc, *cp; |
int nw; |
int nw; |
enum mdelim delim; |
enum mdelim delim; |
Line 499 post_delim(POST_ARGS) |
|
Line 605 post_delim(POST_ARGS) |
|
|
|
/* At least three alphabetic words with a sentence ending. */ |
/* At least three alphabetic words with a sentence ending. */ |
if (strchr("!.:?", *lc) != NULL && (tok == MDOC_Em || |
if (strchr("!.:?", *lc) != NULL && (tok == MDOC_Em || |
tok == MDOC_Li || tok == MDOC_Po || tok == MDOC_Pq || |
tok == MDOC_Li || tok == MDOC_Pq || tok == MDOC_Sy)) { |
tok == MDOC_Sy)) { |
|
nw = 0; |
nw = 0; |
for (cp = lc - 1; cp >= nch->string; cp--) { |
for (cp = lc - 1; cp >= nch->string; cp--) { |
if (*cp == ' ') { |
if (*cp == ' ') { |
Line 515 post_delim(POST_ARGS) |
|
Line 620 post_delim(POST_ARGS) |
|
} |
} |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse, |
mandoc_msg(MANDOCERR_DELIM_NB, nch->line, |
nch->line, nch->pos + (lc - nch->string), |
nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok], |
"%s%s %s", roff_name[tok], |
|
nch == mdoc->last->child ? "" : " ...", nch->string); |
nch == mdoc->last->child ? "" : " ...", nch->string); |
} |
} |
|
|
Line 583 post_bl_norm(POST_ARGS) |
|
Line 687 post_bl_norm(POST_ARGS) |
|
case MDOC_Compact: |
case MDOC_Compact: |
if (n->norm->Bl.comp) |
if (n->norm->Bl.comp) |
mandoc_msg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -compact"); |
argv->pos, "Bl -compact"); |
|
n->norm->Bl.comp = 1; |
n->norm->Bl.comp = 1; |
break; |
break; |
case MDOC_Width: |
case MDOC_Width: |
wa = argv; |
wa = argv; |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -width"); |
argv->pos, "Bl -width"); |
|
n->norm->Bl.width = "0n"; |
n->norm->Bl.width = "0n"; |
break; |
break; |
} |
} |
if (NULL != n->norm->Bl.width) |
if (NULL != n->norm->Bl.width) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bl -width %s", |
"Bl -width %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.width = argv->value[0]; |
n->norm->Bl.width = argv->value[0]; |
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bl -offset"); |
argv->pos, "Bl -offset"); |
|
break; |
break; |
} |
} |
if (NULL != n->norm->Bl.offs) |
if (NULL != n->norm->Bl.offs) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bl -offset %s", |
"Bl -offset %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.offs = argv->value[0]; |
n->norm->Bl.offs = argv->value[0]; |
break; |
break; |
Line 629 post_bl_norm(POST_ARGS) |
|
Line 728 post_bl_norm(POST_ARGS) |
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != n->norm->Bl.type) { |
if (LIST__NONE != n->norm->Bl.type) { |
mandoc_vmsg(MANDOCERR_BL_REP, |
mandoc_msg(MANDOCERR_BL_REP, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Bl -%s", mdoc_argnames[argv->arg]); |
"Bl -%s", mdoc_argnames[argv->arg]); |
continue; |
continue; |
} |
} |
Line 640 post_bl_norm(POST_ARGS) |
|
Line 738 post_bl_norm(POST_ARGS) |
|
if (n->norm->Bl.width || |
if (n->norm->Bl.width || |
n->norm->Bl.offs || |
n->norm->Bl.offs || |
n->norm->Bl.comp) |
n->norm->Bl.comp) |
mandoc_vmsg(MANDOCERR_BL_LATETYPE, |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
mdoc->parse, n->line, n->pos, "Bl -%s", |
n->line, n->pos, "Bl -%s", |
mdoc_argnames[n->args->argv[0].arg]); |
mdoc_argnames[n->args->argv[0].arg]); |
|
|
n->norm->Bl.type = lt; |
n->norm->Bl.type = lt; |
Line 654 post_bl_norm(POST_ARGS) |
|
Line 752 post_bl_norm(POST_ARGS) |
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->norm->Bl.type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_NOTYPE, n->line, n->pos, "Bl"); |
n->line, n->pos, "Bl"); |
|
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
mdoclt = MDOC_Item; |
mdoclt = MDOC_Item; |
} |
} |
Line 669 post_bl_norm(POST_ARGS) |
|
Line 766 post_bl_norm(POST_ARGS) |
|
|
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (NULL == n->norm->Bl.width) |
if (n->norm->Bl.width == NULL) |
mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_NOWIDTH, |
n->line, n->pos, "Bl -tag"); |
n->line, n->pos, "Bl -tag"); |
break; |
break; |
case LIST_column: |
case LIST_column: |
Line 678 post_bl_norm(POST_ARGS) |
|
Line 775 post_bl_norm(POST_ARGS) |
|
case LIST_ohang: |
case LIST_ohang: |
case LIST_inset: |
case LIST_inset: |
case LIST_item: |
case LIST_item: |
if (n->norm->Bl.width) |
if (n->norm->Bl.width != NULL) |
mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse, |
mandoc_msg(MANDOCERR_BL_SKIPW, wa->line, wa->pos, |
wa->line, wa->pos, "Bl -%s", |
"Bl -%s", mdoc_argnames[mdoclt]); |
mdoc_argnames[mdoclt]); |
n->norm->Bl.width = NULL; |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
case LIST_dash: |
case LIST_dash: |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == n->norm->Bl.width) |
if (n->norm->Bl.width == NULL) |
n->norm->Bl.width = "2n"; |
n->norm->Bl.width = "2n"; |
break; |
break; |
case LIST_enum: |
case LIST_enum: |
if (NULL == n->norm->Bl.width) |
if (n->norm->Bl.width == NULL) |
n->norm->Bl.width = "3n"; |
n->norm->Bl.width = "3n"; |
break; |
break; |
default: |
default: |
Line 728 post_bd(POST_ARGS) |
|
Line 825 post_bd(POST_ARGS) |
|
dt = DISP_literal; |
dt = DISP_literal; |
break; |
break; |
case MDOC_File: |
case MDOC_File: |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
mandoc_msg(MANDOCERR_BD_FILE, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
|
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bd -offset"); |
argv->pos, "Bd -offset"); |
|
break; |
break; |
} |
} |
if (NULL != n->norm->Bd.offs) |
if (NULL != n->norm->Bd.offs) |
mandoc_vmsg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, |
argv->pos, "Bd -offset %s", |
"Bd -offset %s", argv->value[0]); |
argv->value[0]); |
|
rewrite_macro2len(mdoc, argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bd.offs = argv->value[0]; |
n->norm->Bd.offs = argv->value[0]; |
break; |
break; |
case MDOC_Compact: |
case MDOC_Compact: |
if (n->norm->Bd.comp) |
if (n->norm->Bd.comp) |
mandoc_msg(MANDOCERR_ARG_REP, |
mandoc_msg(MANDOCERR_ARG_REP, |
mdoc->parse, argv->line, |
argv->line, argv->pos, "Bd -compact"); |
argv->pos, "Bd -compact"); |
|
n->norm->Bd.comp = 1; |
n->norm->Bd.comp = 1; |
break; |
break; |
default: |
default: |
Line 762 post_bd(POST_ARGS) |
|
Line 855 post_bd(POST_ARGS) |
|
if (DISP__NONE == n->norm->Bd.type) |
if (DISP__NONE == n->norm->Bd.type) |
n->norm->Bd.type = dt; |
n->norm->Bd.type = dt; |
else |
else |
mandoc_vmsg(MANDOCERR_BD_REP, |
mandoc_msg(MANDOCERR_BD_REP, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Bd -%s", mdoc_argnames[argv->arg]); |
"Bd -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse, |
mandoc_msg(MANDOCERR_BD_NOTYPE, n->line, n->pos, "Bd"); |
n->line, n->pos, "Bd"); |
|
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
} |
} |
Line 791 post_an_norm(POST_ARGS) |
|
Line 882 post_an_norm(POST_ARGS) |
|
|
|
for (i = 1; i < n->args->argc; i++) { |
for (i = 1; i < n->args->argc; i++) { |
argv = n->args->argv + i; |
argv = n->args->argv + i; |
mandoc_vmsg(MANDOCERR_AN_REP, |
mandoc_msg(MANDOCERR_AN_REP, argv->line, argv->pos, |
mdoc->parse, argv->line, argv->pos, |
|
"An -%s", mdoc_argnames[argv->arg]); |
"An -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
Line 813 post_eoln(POST_ARGS) |
|
Line 903 post_eoln(POST_ARGS) |
|
post_useless(mdoc); |
post_useless(mdoc); |
n = mdoc->last; |
n = mdoc->last; |
if (n->child != NULL) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line, |
mandoc_msg(MANDOCERR_ARG_SKIP, n->line, |
n->pos, "%s %s", roff_name[n->tok], n->child->string); |
n->pos, "%s %s", roff_name[n->tok], n->child->string); |
|
|
while (n->child != NULL) |
while (n->child != NULL) |
Line 835 build_list(struct roff_man *mdoc, int tok) |
|
Line 925 build_list(struct roff_man *mdoc, int tok) |
|
for (ic = 1;; ic++) { |
for (ic = 1;; ic++) { |
roff_elem_alloc(mdoc, n->line, n->pos, tok); |
roff_elem_alloc(mdoc, n->line, n->pos, tok); |
mdoc->last->flags |= NODE_NOSRC; |
mdoc->last->flags |= NODE_NOSRC; |
mdoc_node_relink(mdoc, n); |
roff_node_relink(mdoc, n); |
n = mdoc->last = mdoc->last->parent; |
n = mdoc->last = mdoc->last->parent; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
if (n->next == NULL) |
if (n->next == NULL) |
Line 876 post_ex(POST_ARGS) |
|
Line 966 post_ex(POST_ARGS) |
|
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
ic = 1; |
ic = 1; |
} else { |
} else { |
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_EX_NONAME, n->line, n->pos, "Ex"); |
n->line, n->pos, "Ex"); |
|
ic = 0; |
ic = 0; |
} |
} |
|
|
Line 896 post_lb(POST_ARGS) |
|
Line 985 post_lb(POST_ARGS) |
|
struct roff_node *n; |
struct roff_node *n; |
const char *p; |
const char *p; |
|
|
post_delim(mdoc); |
post_delim_nb(mdoc); |
|
|
n = mdoc->last; |
n = mdoc->last; |
assert(n->child->type == ROFFT_TEXT); |
assert(n->child->type == ROFFT_TEXT); |
Line 910 post_lb(POST_ARGS) |
|
Line 999 post_lb(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_LB_BAD, mdoc->parse, n->child->line, |
mandoc_msg(MANDOCERR_LB_BAD, n->child->line, |
n->child->pos, "Lb %s", n->child->string); |
n->child->pos, "Lb %s", n->child->string); |
|
|
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
mdoc->last->flags = NODE_NOSRC; |
mdoc->last->flags = NODE_NOSRC; |
roff_word_alloc(mdoc, n->line, n->pos, "\\(Lq"); |
roff_word_alloc(mdoc, n->line, n->pos, "\\(lq"); |
mdoc->last->flags = NODE_DELIMO | NODE_NOSRC; |
mdoc->last->flags = NODE_DELIMO | NODE_NOSRC; |
mdoc->last = mdoc->last->next; |
mdoc->last = mdoc->last->next; |
roff_word_alloc(mdoc, n->line, n->pos, "\\(Rq"); |
roff_word_alloc(mdoc, n->line, n->pos, "\\(rq"); |
mdoc->last->flags = NODE_DELIMC | NODE_NOSRC; |
mdoc->last->flags = NODE_DELIMC | NODE_NOSRC; |
mdoc->last = n; |
mdoc->last = n; |
} |
} |
Line 967 post_std(POST_ARGS) |
|
Line 1056 post_std(POST_ARGS) |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
|
post_delim(mdoc); |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->args && n->args->argc == 1) |
if (n->args && n->args->argc == 1) |
if (n->args->argv[0].arg == MDOC_Std) |
if (n->args->argv[0].arg == MDOC_Std) |
return; |
return; |
|
|
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_STD, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 987 post_st(POST_ARGS) |
|
Line 1078 post_st(POST_ARGS) |
|
assert(nch->type == ROFFT_TEXT); |
assert(nch->type == ROFFT_TEXT); |
|
|
if ((p = mdoc_a2st(nch->string)) == NULL) { |
if ((p = mdoc_a2st(nch->string)) == NULL) { |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_ST_BAD, |
nch->line, nch->pos, "St %s", nch->string); |
nch->line, nch->pos, "St %s", nch->string); |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
return; |
return; |
Line 1001 post_st(POST_ARGS) |
|
Line 1092 post_st(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
|
post_tg(POST_ARGS) |
|
{ |
|
struct roff_node *n, *nch; |
|
size_t len; |
|
|
|
n = mdoc->last; |
|
nch = n->child; |
|
if (nch == NULL && n->next != NULL && |
|
n->next->child->type == ROFFT_TEXT) { |
|
mdoc->next = ROFF_NEXT_CHILD; |
|
roff_word_alloc(mdoc, n->line, n->pos, n->next->child->string); |
|
nch = mdoc->last; |
|
nch->flags |= NODE_NOSRC; |
|
mdoc->last = n; |
|
} |
|
if (nch == NULL || *nch->string == '\0') { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, n->line, n->pos, "Tg"); |
|
roff_node_delete(mdoc, n); |
|
return; |
|
} |
|
len = strcspn(nch->string, " \t"); |
|
if (nch->string[len] != '\0') |
|
mandoc_msg(MANDOCERR_TG_SPC, nch->line, nch->pos + len + 1, |
|
"Tg %s", nch->string); |
|
if (nch->next != NULL) { |
|
mandoc_msg(MANDOCERR_ARG_EXCESS, nch->next->line, |
|
nch->next->pos, "Tg ... %s", nch->next->string); |
|
while (nch->next != NULL) |
|
roff_node_delete(mdoc, nch->next); |
|
} |
|
if (nch->string[len] != '\0') |
|
roff_node_delete(mdoc, n); |
|
} |
|
|
|
static void |
post_obsolete(POST_ARGS) |
post_obsolete(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK) |
if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK) |
mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_OBS, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 1017 post_useless(POST_ARGS) |
|
Line 1143 post_useless(POST_ARGS) |
|
struct roff_node *n; |
struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_USELESS, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
/* |
/* |
Line 1047 post_bf(POST_ARGS) |
|
Line 1173 post_bf(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (np->parent->args == NULL) { |
if (np->parent->args == NULL) { |
if (nch == NULL) { |
if (nch == NULL) { |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_NOFONT, |
np->line, np->pos, "Bf"); |
np->line, np->pos, "Bf"); |
return; |
return; |
} |
} |
nch = nch->next; |
nch = nch->next; |
} |
} |
if (nch != NULL) |
if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "Bf ... %s", nch->string); |
nch->line, nch->pos, "Bf ... %s", nch->string); |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
Line 1085 post_bf(POST_ARGS) |
|
Line 1211 post_bf(POST_ARGS) |
|
else if ( ! strcmp(np->child->string, "Sy")) |
else if ( ! strcmp(np->child->string, "Sy")) |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_BADFONT, np->child->line, |
np->child->line, np->child->pos, |
np->child->pos, "Bf %s", np->child->string); |
"Bf %s", np->child->string); |
|
} |
} |
|
|
static void |
static void |
Line 1098 post_fname(POST_ARGS) |
|
Line 1223 post_fname(POST_ARGS) |
|
size_t pos; |
size_t pos; |
|
|
n = mdoc->last->child; |
n = mdoc->last->child; |
pos = strcspn(n->string, "()"); |
cp = n->string; |
cp = n->string + pos; |
if (*cp == '(') { |
if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) |
if (cp[strlen(cp + 1)] == ')') |
mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse, |
return; |
n->line, n->pos + pos, n->string); |
pos = 0; |
|
} else { |
|
pos = strcspn(cp, "()"); |
|
if (cp[pos] == '\0') |
|
return; |
|
} |
|
mandoc_msg(MANDOCERR_FN_PAREN, n->line, n->pos + pos, "%s", cp); |
} |
} |
|
|
static void |
static void |
Line 1124 post_fo(POST_ARGS) |
|
Line 1255 post_fo(POST_ARGS) |
|
return; |
return; |
|
|
if (n->child == NULL) { |
if (n->child == NULL) { |
mandoc_msg(MANDOCERR_FO_NOHEAD, mdoc->parse, |
mandoc_msg(MANDOCERR_FO_NOHEAD, n->line, n->pos, "Fo"); |
n->line, n->pos, "Fo"); |
|
return; |
return; |
} |
} |
if (n->child != n->last) { |
if (n->child != n->last) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
n->child->next->line, n->child->next->pos, |
n->child->next->line, n->child->next->pos, |
"Fo ... %s", n->child->next->string); |
"Fo ... %s", n->child->next->string); |
while (n->child != n->last) |
while (n->child != n->last) |
roff_node_delete(mdoc, n->last); |
roff_node_delete(mdoc, n->last); |
} |
} else |
|
post_delim(mdoc); |
|
|
post_fname(mdoc); |
post_fname(mdoc); |
} |
} |
Line 1152 post_fa(POST_ARGS) |
|
Line 1283 post_fa(POST_ARGS) |
|
break; |
break; |
if (*cp != ',') |
if (*cp != ',') |
continue; |
continue; |
mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse, |
mandoc_msg(MANDOCERR_FA_COMMA, n->line, |
n->line, n->pos + (cp - n->string), |
n->pos + (int)(cp - n->string), "%s", n->string); |
n->string); |
|
break; |
break; |
} |
} |
} |
} |
post_delim(mdoc); |
post_delim_nb(mdoc); |
} |
} |
|
|
static void |
static void |
Line 1168 post_nm(POST_ARGS) |
|
Line 1298 post_nm(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (n->last != NULL && |
if (n->sec == SEC_NAME && n->child != NULL && |
(n->last->tok == MDOC_Pp || |
n->child->type == ROFFT_TEXT && mdoc->meta.msec != NULL) |
n->last->tok == MDOC_Lp)) |
mandoc_xr_add(mdoc->meta.msec, n->child->string, -1, -1); |
mdoc_node_relink(mdoc, n->last); |
|
|
|
|
if (n->last != NULL && n->last->tok == MDOC_Pp) |
|
roff_node_relink(mdoc, n->last); |
|
|
if (mdoc->meta.name == NULL) |
if (mdoc->meta.name == NULL) |
deroff(&mdoc->meta.name, n); |
deroff(&mdoc->meta.name, n); |
|
|
if (mdoc->meta.name == NULL || |
if (mdoc->meta.name == NULL || |
(mdoc->lastsec == SEC_NAME && n->child == NULL)) |
(mdoc->lastsec == SEC_NAME && n->child == NULL)) |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_NM_NONAME, n->line, n->pos, "Nm"); |
n->line, n->pos, "Nm"); |
|
|
|
if (n->type == ROFFT_ELEM) |
switch (n->type) { |
|
case ROFFT_ELEM: |
|
post_delim_nb(mdoc); |
|
break; |
|
case ROFFT_HEAD: |
post_delim(mdoc); |
post_delim(mdoc); |
|
break; |
|
default: |
|
return; |
|
} |
|
|
if ((n->type != ROFFT_ELEM && n->type != ROFFT_HEAD) || |
if ((n->child != NULL && n->child->type == ROFFT_TEXT) || |
(n->child != NULL && n->child->type == ROFFT_TEXT) || |
|
mdoc->meta.name == NULL) |
mdoc->meta.name == NULL) |
return; |
return; |
|
|
|
|
post_nd(POST_ARGS) |
post_nd(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
size_t sz; |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
Line 1207 post_nd(POST_ARGS) |
|
Line 1344 post_nd(POST_ARGS) |
|
return; |
return; |
|
|
if (n->sec != SEC_NAME) |
if (n->sec != SEC_NAME) |
mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_ND_LATE, n->line, n->pos, "Nd"); |
n->line, n->pos, "Nd"); |
|
|
|
if (n->child == NULL) |
if (n->child == NULL) |
mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_ND_EMPTY, n->line, n->pos, "Nd"); |
n->line, n->pos, "Nd"); |
else |
else if (n->last->type == ROFFT_TEXT && |
post_delim(mdoc); |
(sz = strlen(n->last->string)) != 0 && |
|
n->last->string[sz - 1] == '.') |
|
mandoc_msg(MANDOCERR_ND_DOT, mdoc->parse, |
|
n->last->line, n->last->pos + sz - 1, NULL); |
|
|
|
post_hyph(mdoc); |
post_hyph(mdoc); |
} |
} |
Line 1235 post_display(POST_ARGS) |
|
Line 1367 post_display(POST_ARGS) |
|
n->body->parent->args == NULL) |
n->body->parent->args == NULL) |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
} else if (n->child == NULL) |
} else if (n->child == NULL) |
mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
else if (n->tok == MDOC_D1) |
else if (n->tok == MDOC_D1) |
post_hyph(mdoc); |
post_hyph(mdoc); |
break; |
break; |
Line 1244 post_display(POST_ARGS) |
|
Line 1376 post_display(POST_ARGS) |
|
if (n->tok == MDOC_Bd) { |
if (n->tok == MDOC_Bd) { |
if (n->args == NULL) { |
if (n->args == NULL) { |
mandoc_msg(MANDOCERR_BD_NOARG, |
mandoc_msg(MANDOCERR_BD_NOARG, |
mdoc->parse, n->line, n->pos, "Bd"); |
n->line, n->pos, "Bd"); |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
while (n->body->child != NULL) |
while (n->body->child != NULL) |
mdoc_node_relink(mdoc, |
roff_node_relink(mdoc, |
n->body->child); |
n->body->child); |
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
break; |
break; |
Line 1257 post_display(POST_ARGS) |
|
Line 1389 post_display(POST_ARGS) |
|
} |
} |
for (np = n->parent; np != NULL; np = np->parent) { |
for (np = n->parent; np != NULL; np = np->parent) { |
if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) { |
if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) { |
mandoc_vmsg(MANDOCERR_BD_NEST, |
mandoc_msg(MANDOCERR_BD_NEST, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s in Bd", roff_name[n->tok]); |
"%s in Bd", roff_name[n->tok]); |
|
break; |
break; |
} |
} |
} |
} |
Line 1275 post_defaults(POST_ARGS) |
|
Line 1406 post_defaults(POST_ARGS) |
|
struct roff_node *nn; |
struct roff_node *nn; |
|
|
if (mdoc->last->child != NULL) { |
if (mdoc->last->child != NULL) { |
post_delim(mdoc); |
post_delim_nb(mdoc); |
return; |
return; |
} |
} |
|
|
Line 1323 post_at(POST_ARGS) |
|
Line 1454 post_at(POST_ARGS) |
|
|
|
att = NULL; |
att = NULL; |
if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL)) |
if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL)) |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_AT_BAD, |
nch->line, nch->pos, "At %s", nch->string); |
nch->line, nch->pos, "At %s", nch->string); |
|
|
mdoc->next = ROFF_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
Line 1347 post_an(POST_ARGS) |
|
Line 1478 post_an(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (np->norm->An.auth == AUTH__NONE) { |
if (np->norm->An.auth == AUTH__NONE) { |
if (nch == NULL) |
if (nch == NULL) |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
np->line, np->pos, "An"); |
np->line, np->pos, "An"); |
else |
else |
post_delim(mdoc); |
post_delim_nb(mdoc); |
} else if (nch != NULL) |
} else if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "An ... %s", nch->string); |
nch->line, nch->pos, "An ... %s", nch->string); |
} |
} |
|
|
Line 1378 post_xx(POST_ARGS) |
|
Line 1509 post_xx(POST_ARGS) |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
const char *os; |
const char *os; |
|
char *v; |
|
|
post_delim(mdoc); |
post_delim_nb(mdoc); |
|
|
n = mdoc->last; |
n = mdoc->last; |
switch (n->tok) { |
switch (n->tok) { |
Line 1394 post_xx(POST_ARGS) |
|
Line 1526 post_xx(POST_ARGS) |
|
break; |
break; |
case MDOC_Nx: |
case MDOC_Nx: |
os = "NetBSD"; |
os = "NetBSD"; |
|
if (n->child == NULL) |
|
break; |
|
v = n->child->string; |
|
if ((v[0] != '0' && v[0] != '1') || v[1] != '.' || |
|
v[2] < '0' || v[2] > '9' || |
|
v[3] < 'a' || v[3] > 'z' || v[4] != '\0') |
|
break; |
|
n->child->flags |= NODE_NOPRT; |
|
mdoc->next = ROFF_NEXT_CHILD; |
|
roff_word_alloc(mdoc, n->child->line, n->child->pos, v); |
|
v = mdoc->last->string; |
|
v[3] = toupper((unsigned char)v[3]); |
|
mdoc->last->flags |= NODE_NOSRC; |
|
mdoc->last = n; |
break; |
break; |
case MDOC_Ox: |
case MDOC_Ox: |
os = "OpenBSD"; |
os = "OpenBSD"; |
Line 1433 post_it(POST_ARGS) |
|
Line 1579 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
case LIST_diag: |
case LIST_diag: |
if (nit->head->child == NULL) |
if (nit->head->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
mdoc->parse, nit->line, nit->pos, |
nit->line, nit->pos, "Bl -%s It", |
"Bl -%s It", |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
Line 1443 post_it(POST_ARGS) |
|
Line 1588 post_it(POST_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
case LIST_hyphen: |
case LIST_hyphen: |
if (nit->body == NULL || nit->body->child == NULL) |
if (nit->body == NULL || nit->body->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mandoc_msg(MANDOCERR_IT_NOBODY, |
mdoc->parse, nit->line, nit->pos, |
nit->line, nit->pos, "Bl -%s It", |
"Bl -%s It", |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if ((nch = nit->head->child) != NULL) |
if ((nch = nit->head->child) != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_SKIP, |
nit->line, nit->pos, "It %s", |
nit->line, nit->pos, "It %s", |
nch->string == NULL ? roff_name[nch->tok] : |
nch->string == NULL ? roff_name[nch->tok] : |
nch->string); |
nch->string); |
Line 1462 post_it(POST_ARGS) |
|
Line 1606 post_it(POST_ARGS) |
|
|
|
if (nit->head->next->child == NULL && |
if (nit->head->next->child == NULL && |
nit->head->next->next == NULL) { |
nit->head->next->next == NULL) { |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
nit->line, nit->pos, "It"); |
nit->line, nit->pos, "It"); |
roff_node_delete(mdoc, nit); |
roff_node_delete(mdoc, nit); |
break; |
break; |
Line 1473 post_it(POST_ARGS) |
|
Line 1617 post_it(POST_ARGS) |
|
if (nch->type != ROFFT_BODY) |
if (nch->type != ROFFT_BODY) |
continue; |
continue; |
if (i++ && nch->flags & NODE_LINE) |
if (i++ && nch->flags & NODE_LINE) |
mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse, |
mandoc_msg(MANDOCERR_TA_LINE, |
nch->line, nch->pos, "Ta"); |
nch->line, nch->pos, "Ta"); |
} |
} |
if (i < cols || i > cols + 1) |
if (i < cols || i > cols + 1) |
mandoc_vmsg(MANDOCERR_BL_COL, |
mandoc_msg(MANDOCERR_BL_COL, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"%d columns, %d cells", cols, i); |
"%d columns, %d cells", cols, i); |
else if (nit->head->next->child != NULL && |
else if (nit->head->next->child != NULL && |
nit->head->next->child->line > nit->line) |
nit->head->next->child->flags & NODE_LINE) |
mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse, |
mandoc_msg(MANDOCERR_IT_NOARG, |
nit->line, nit->pos, "Bl -column It"); |
nit->line, nit->pos, "Bl -column It"); |
break; |
break; |
default: |
default: |
Line 1505 post_bl_block(POST_ARGS) |
|
Line 1648 post_bl_block(POST_ARGS) |
|
while (nc != NULL) { |
while (nc != NULL) { |
switch (nc->tok) { |
switch (nc->tok) { |
case MDOC_Pp: |
case MDOC_Pp: |
case MDOC_Lp: |
|
case ROFF_br: |
case ROFF_br: |
break; |
break; |
default: |
default: |
Line 1513 post_bl_block(POST_ARGS) |
|
Line 1655 post_bl_block(POST_ARGS) |
|
continue; |
continue; |
} |
} |
if (ni->next == NULL) { |
if (ni->next == NULL) { |
mandoc_msg(MANDOCERR_PAR_MOVE, |
mandoc_msg(MANDOCERR_PAR_MOVE, nc->line, |
mdoc->parse, nc->line, nc->pos, |
nc->pos, "%s", roff_name[nc->tok]); |
roff_name[nc->tok]); |
roff_node_relink(mdoc, nc); |
mdoc_node_relink(mdoc, nc); |
|
} else if (n->norm->Bl.comp == 0 && |
} else if (n->norm->Bl.comp == 0 && |
n->norm->Bl.type != LIST_column) { |
n->norm->Bl.type != LIST_column) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_msg(MANDOCERR_PAR_SKIP, |
mdoc->parse, nc->line, nc->pos, |
nc->line, nc->pos, |
"%s before It", roff_name[nc->tok]); |
"%s before It", roff_name[nc->tok]); |
roff_node_delete(mdoc, nc); |
roff_node_delete(mdoc, nc); |
} else |
} else |
Line 1566 post_bl_head(POST_ARGS) |
|
Line 1707 post_bl_head(POST_ARGS) |
|
if (nh->norm->Bl.type != LIST_column) { |
if (nh->norm->Bl.type != LIST_column) { |
if ((nch = nh->child) == NULL) |
if ((nch = nh->child) == NULL) |
return; |
return; |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nch->line, nch->pos, "Bl ... %s", nch->string); |
nch->line, nch->pos, "Bl ... %s", nch->string); |
while (nch != NULL) { |
while (nch != NULL) { |
roff_node_delete(mdoc, nch); |
roff_node_delete(mdoc, nch); |
Line 1619 post_bl_head(POST_ARGS) |
|
Line 1760 post_bl_head(POST_ARGS) |
|
static void |
static void |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
struct roff_node *nparent, *nprev; /* of the Bl block */ |
struct roff_node *nbody; /* of the Bl */ |
struct roff_node *nblock, *nbody; /* of the Bl */ |
|
struct roff_node *nchild, *nnext; /* of the Bl body */ |
struct roff_node *nchild, *nnext; /* of the Bl body */ |
const char *prev_Er; |
const char *prev_Er; |
int order; |
int order; |
Line 1641 post_bl(POST_ARGS) |
|
Line 1781 post_bl(POST_ARGS) |
|
if (nbody->end != ENDBODY_NOT) |
if (nbody->end != ENDBODY_NOT) |
return; |
return; |
|
|
nchild = nbody->child; |
/* |
if (nchild == NULL) { |
* Up to the first item, move nodes before the list, |
mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse, |
* but leave transparent nodes where they are |
nbody->line, nbody->pos, "Bl"); |
* if they precede an item. |
return; |
* The next non-transparent node is kept in nchild. |
|
* It only needs to be updated after a non-transparent |
|
* node was moved out, and at the very beginning |
|
* when no node at all was moved yet. |
|
*/ |
|
|
|
nchild = mdoc->last; |
|
for (;;) { |
|
if (nchild == mdoc->last) |
|
nchild = roff_node_child(nbody); |
|
if (nchild == NULL) { |
|
mdoc->last = nbody; |
|
mandoc_msg(MANDOCERR_BLK_EMPTY, |
|
nbody->line, nbody->pos, "Bl"); |
|
return; |
|
} |
|
if (nchild->tok == MDOC_It) { |
|
mdoc->last = nbody; |
|
break; |
|
} |
|
mandoc_msg(MANDOCERR_BL_MOVE, nbody->child->line, |
|
nbody->child->pos, "%s", roff_name[nbody->child->tok]); |
|
if (nbody->parent->prev == NULL) { |
|
mdoc->last = nbody->parent->parent; |
|
mdoc->next = ROFF_NEXT_CHILD; |
|
} else { |
|
mdoc->last = nbody->parent->prev; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
} |
|
roff_node_relink(mdoc, nbody->child); |
} |
} |
|
|
|
/* |
|
* We have reached the first item, |
|
* so moving nodes out is no longer possible. |
|
* But in .Bl -column, the first rows may be implicit, |
|
* that is, they may not start with .It macros. |
|
* Such rows may be followed by nodes generated on the |
|
* roff level, for example .TS. |
|
* Wrap such roff nodes into an implicit row. |
|
*/ |
|
|
while (nchild != NULL) { |
while (nchild != NULL) { |
nnext = nchild->next; |
if (nchild->tok == MDOC_It) { |
if (nchild->tok == MDOC_It || |
nchild = roff_node_next(nchild); |
(nchild->tok == MDOC_Sm && |
|
nnext != NULL && nnext->tok == MDOC_It)) { |
|
nchild = nnext; |
|
continue; |
continue; |
} |
} |
|
nnext = nchild->next; |
/* |
mdoc->last = nchild->prev; |
* In .Bl -column, the first rows may be implicit, |
mdoc->next = ROFF_NEXT_SIBLING; |
* that is, they may not start with .It macros. |
roff_block_alloc(mdoc, nchild->line, nchild->pos, MDOC_It); |
* Such rows may be followed by nodes generated on the |
roff_head_alloc(mdoc, nchild->line, nchild->pos, MDOC_It); |
* roff level, for example .TS, which cannot be moved |
mdoc->next = ROFF_NEXT_SIBLING; |
* out of the list. In that case, wrap such roff nodes |
roff_body_alloc(mdoc, nchild->line, nchild->pos, MDOC_It); |
* into an implicit row. |
while (nchild->tok != MDOC_It) { |
*/ |
roff_node_relink(mdoc, nchild); |
|
if (nnext == NULL) |
if (nchild->prev != NULL) { |
break; |
mdoc->last = nchild; |
nchild = nnext; |
|
nnext = nchild->next; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
roff_block_alloc(mdoc, nchild->line, |
|
nchild->pos, MDOC_It); |
|
roff_head_alloc(mdoc, nchild->line, |
|
nchild->pos, MDOC_It); |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
roff_body_alloc(mdoc, nchild->line, |
|
nchild->pos, MDOC_It); |
|
while (nchild->tok != MDOC_It) { |
|
mdoc_node_relink(mdoc, nchild); |
|
if ((nchild = nnext) == NULL) |
|
break; |
|
nnext = nchild->next; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
|
} |
|
mdoc->last = nbody; |
|
continue; |
|
} |
} |
|
mdoc->last = nbody; |
mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse, |
|
nchild->line, nchild->pos, roff_name[nchild->tok]); |
|
|
|
/* |
|
* Move the node out of the Bl block. |
|
* First, collect all required node pointers. |
|
*/ |
|
|
|
nblock = nbody->parent; |
|
nprev = nblock->prev; |
|
nparent = nblock->parent; |
|
|
|
/* |
|
* Unlink this child. |
|
*/ |
|
|
|
nbody->child = nnext; |
|
if (nnext == NULL) |
|
nbody->last = NULL; |
|
else |
|
nnext->prev = NULL; |
|
|
|
/* |
|
* Relink this child. |
|
*/ |
|
|
|
nchild->parent = nparent; |
|
nchild->prev = nprev; |
|
nchild->next = nblock; |
|
|
|
nblock->prev = nchild; |
|
if (nprev == NULL) |
|
nparent->child = nchild; |
|
else |
|
nprev->next = nchild; |
|
|
|
nchild = nnext; |
|
} |
} |
|
|
if (mdoc->meta.os_e != MANDOC_OS_NETBSD) |
if (mdoc->meta.os_e != MANDOC_OS_NETBSD) |
Line 1742 post_bl(POST_ARGS) |
|
Line 1867 post_bl(POST_ARGS) |
|
if (prev_Er != NULL) { |
if (prev_Er != NULL) { |
order = strcmp(prev_Er, nnext->string); |
order = strcmp(prev_Er, nnext->string); |
if (order > 0) |
if (order > 0) |
mandoc_vmsg(MANDOCERR_ER_ORDER, |
mandoc_msg(MANDOCERR_ER_ORDER, |
mdoc->parse, nnext->line, nnext->pos, |
nnext->line, nnext->pos, |
"Er %s %s (NetBSD)", |
"Er %s %s (NetBSD)", |
prev_Er, nnext->string); |
prev_Er, nnext->string); |
else if (order == 0) |
else if (order == 0) |
mandoc_vmsg(MANDOCERR_ER_REP, |
mandoc_msg(MANDOCERR_ER_REP, |
mdoc->parse, nnext->line, nnext->pos, |
nnext->line, nnext->pos, |
"Er %s (NetBSD)", prev_Er); |
"Er %s (NetBSD)", prev_Er); |
} |
} |
prev_Er = nnext->string; |
prev_Er = nnext->string; |
Line 1763 post_bk(POST_ARGS) |
|
Line 1888 post_bk(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (n->type == ROFFT_BLOCK && n->body->child == NULL) { |
if (n->type == ROFFT_BLOCK && n->body->child == NULL) { |
mandoc_msg(MANDOCERR_BLK_EMPTY, |
mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, "Bk"); |
mdoc->parse, n->line, n->pos, "Bk"); |
|
roff_node_delete(mdoc, n); |
roff_node_delete(mdoc, n); |
} |
} |
} |
} |
Line 1792 post_sm(POST_ARGS) |
|
Line 1916 post_sm(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
mandoc_vmsg(MANDOCERR_SM_BAD, |
mandoc_msg(MANDOCERR_SM_BAD, nch->line, nch->pos, |
mdoc->parse, nch->line, nch->pos, |
|
"%s %s", roff_name[mdoc->last->tok], nch->string); |
"%s %s", roff_name[mdoc->last->tok], nch->string); |
mdoc_node_relink(mdoc, nch); |
roff_node_relink(mdoc, nch); |
return; |
return; |
} |
} |
|
|
static void |
static void |
post_root(POST_ARGS) |
post_root(POST_ARGS) |
{ |
{ |
const char *openbsd_arch[] = { |
|
"alpha", "amd64", "arm64", "armv7", "hppa", "i386", |
|
"landisk", "loongson", "luna88k", "macppc", "mips64", |
|
"octeon", "sgi", "socppc", "sparc64", NULL |
|
}; |
|
const char *netbsd_arch[] = { |
|
"acorn26", "acorn32", "algor", "alpha", "amiga", |
|
"arc", "atari", |
|
"bebox", "cats", "cesfic", "cobalt", "dreamcast", |
|
"emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5", |
|
"hp300", "hpcarm", "hpcmips", "hpcsh", "hppa", |
|
"i386", "ibmnws", "luna68k", |
|
"mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc", |
|
"netwinder", "news68k", "newsmips", "next68k", |
|
"pc532", "playstation2", "pmax", "pmppc", "prep", |
|
"sandpoint", "sbmips", "sgimips", "shark", |
|
"sparc", "sparc64", "sun2", "sun3", |
|
"vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL |
|
}; |
|
const char **arches[] = { NULL, netbsd_arch, openbsd_arch }; |
|
|
|
struct roff_node *n; |
struct roff_node *n; |
const char **arch; |
|
|
|
/* Add missing prologue data. */ |
/* Add missing prologue data. */ |
|
|
if (mdoc->meta.date == NULL) |
if (mdoc->meta.date == NULL) |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mdoc->meta.date = mandoc_normdate(NULL, NULL); |
mandoc_normdate(mdoc, NULL, 0, 0); |
|
|
|
if (mdoc->meta.title == NULL) { |
if (mdoc->meta.title == NULL) { |
mandoc_msg(MANDOCERR_DT_NOTITLE, |
mandoc_msg(MANDOCERR_DT_NOTITLE, 0, 0, "EOF"); |
mdoc->parse, 0, 0, "EOF"); |
|
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
} |
} |
|
|
Line 1842 post_root(POST_ARGS) |
|
Line 1941 post_root(POST_ARGS) |
|
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
|
|
if (mdoc->meta.os == NULL) { |
if (mdoc->meta.os == NULL) { |
mandoc_msg(MANDOCERR_OS_MISSING, |
mandoc_msg(MANDOCERR_OS_MISSING, 0, 0, NULL); |
mdoc->parse, 0, 0, NULL); |
|
mdoc->meta.os = mandoc_strdup(""); |
mdoc->meta.os = mandoc_strdup(""); |
} else if (mdoc->meta.os_e && |
} else if (mdoc->meta.os_e && |
(mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0) |
(mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0) |
mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0, |
mandoc_msg(MANDOCERR_RCS_MISSING, 0, 0, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"(OpenBSD)" : "(NetBSD)"); |
"(OpenBSD)" : "(NetBSD)"); |
|
|
if (mdoc->meta.arch != NULL && |
if (mdoc->meta.arch != NULL && |
(arch = arches[mdoc->meta.os_e]) != NULL) { |
arch_valid(mdoc->meta.arch, mdoc->meta.os_e) == 0) { |
while (*arch != NULL && strcmp(*arch, mdoc->meta.arch)) |
n = mdoc->meta.first->child; |
arch++; |
while (n->tok != MDOC_Dt || |
if (*arch == NULL) { |
n->child == NULL || |
n = mdoc->first->child; |
n->child->next == NULL || |
while (n->tok != MDOC_Dt) |
n->child->next->next == NULL) |
n = n->next; |
n = n->next; |
n = n->child->next->next; |
n = n->child->next->next; |
mandoc_vmsg(MANDOCERR_ARCH_BAD, |
mandoc_msg(MANDOCERR_ARCH_BAD, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"Dt ... %s %s", mdoc->meta.arch, |
"Dt ... %s %s", mdoc->meta.arch, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"(OpenBSD)" : "(NetBSD)"); |
"(OpenBSD)" : "(NetBSD)"); |
|
} |
|
} |
} |
|
|
/* Check that we begin with a proper `Sh'. */ |
/* Check that we begin with a proper `Sh'. */ |
|
|
n = mdoc->first->child; |
n = mdoc->meta.first->child; |
while (n != NULL && n->tok != TOKEN_NONE && |
while (n != NULL && |
mdoc_macros[n->tok].flags & MDOC_PROLOGUE) |
(n->type == ROFFT_COMMENT || |
|
(n->tok >= MDOC_Dd && |
|
mdoc_macro(n->tok)->flags & MDOC_PROLOGUE))) |
n = n->next; |
n = n->next; |
|
|
if (n == NULL) |
if (n == NULL) |
mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL); |
mandoc_msg(MANDOCERR_DOC_EMPTY, 0, 0, NULL); |
else if (n->tok != MDOC_Sh) |
else if (n->tok != MDOC_Sh) |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_BEFORE, n->line, n->pos, |
n->line, n->pos, roff_name[n->tok]); |
"%s", roff_name[n->tok]); |
} |
} |
|
|
static void |
static void |
Line 1894 post_rs(POST_ARGS) |
|
Line 1992 post_rs(POST_ARGS) |
|
return; |
return; |
|
|
if (np->child == NULL) { |
if (np->child == NULL) { |
mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_RS_EMPTY, np->line, np->pos, "Rs"); |
np->line, np->pos, "Rs"); |
|
return; |
return; |
} |
} |
|
|
Line 1913 post_rs(POST_ARGS) |
|
Line 2010 post_rs(POST_ARGS) |
|
break; |
break; |
|
|
if (i == RSORD_MAX) { |
if (i == RSORD_MAX) { |
mandoc_msg(MANDOCERR_RS_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_RS_BAD, nch->line, nch->pos, |
nch->line, nch->pos, roff_name[nch->tok]); |
"%s", roff_name[nch->tok]); |
i = -1; |
i = -1; |
} else if (nch->tok == MDOC__J || nch->tok == MDOC__B) |
} else if (nch->tok == MDOC__J || nch->tok == MDOC__B) |
np->norm->Rs.quote_T++; |
np->norm->Rs.quote_T++; |
Line 2003 post_ns(POST_ARGS) |
|
Line 2100 post_ns(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
if (n->flags & NODE_LINE || |
if (n->flags & NODE_LINE || |
(n->next != NULL && n->next->flags & NODE_DELIMC)) |
(n->next != NULL && n->next->flags & NODE_DELIMC)) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
|
} |
} |
|
|
static void |
static void |
|
post_sx(POST_ARGS) |
|
{ |
|
post_delim(mdoc); |
|
post_hyph(mdoc); |
|
} |
|
|
|
static void |
post_sh(POST_ARGS) |
post_sh(POST_ARGS) |
{ |
{ |
|
|
Line 2049 post_sh_name(POST_ARGS) |
|
Line 2152 post_sh_name(POST_ARGS) |
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Nm: |
case MDOC_Nm: |
if (hasnm && n->child != NULL) |
if (hasnm && n->child != NULL) |
mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT, |
mandoc_msg(MANDOCERR_NAMESEC_PUNCT, |
mdoc->parse, n->line, n->pos, |
n->line, n->pos, |
"Nm %s", n->child->string); |
"Nm %s", n->child->string); |
hasnm = 1; |
hasnm = 1; |
continue; |
continue; |
Line 2058 post_sh_name(POST_ARGS) |
|
Line 2161 post_sh_name(POST_ARGS) |
|
hasnd = 1; |
hasnd = 1; |
if (n->next != NULL) |
if (n->next != NULL) |
mandoc_msg(MANDOCERR_NAMESEC_ND, |
mandoc_msg(MANDOCERR_NAMESEC_ND, |
mdoc->parse, n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
break; |
break; |
case TOKEN_NONE: |
case TOKEN_NONE: |
if (n->type == ROFFT_TEXT && |
if (n->type == ROFFT_TEXT && |
Line 2069 post_sh_name(POST_ARGS) |
|
Line 2172 post_sh_name(POST_ARGS) |
|
} |
} |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_BAD, |
n->line, n->pos, roff_name[n->tok]); |
n->line, n->pos, "%s", roff_name[n->tok]); |
continue; |
continue; |
} |
} |
break; |
break; |
} |
} |
|
|
if ( ! hasnm) |
if ( ! hasnm) |
mandoc_msg(MANDOCERR_NAMESEC_NONM, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_NONM, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
if ( ! hasnd) |
if ( ! hasnd) |
mandoc_msg(MANDOCERR_NAMESEC_NOND, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_NOND, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
|
|
Line 2106 post_sh_see_also(POST_ARGS) |
|
Line 2209 post_sh_see_also(POST_ARGS) |
|
sec = n->child->next->string; |
sec = n->child->next->string; |
if (lastsec != NULL) { |
if (lastsec != NULL) { |
if (lastpunct[0] != ',' || lastpunct[1] != '\0') |
if (lastpunct[0] != ',' || lastpunct[1] != '\0') |
mandoc_vmsg(MANDOCERR_XR_PUNCT, |
mandoc_msg(MANDOCERR_XR_PUNCT, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s before %s(%s)", |
"%s before %s(%s)", lastpunct, |
lastpunct, name, sec); |
name, sec); |
|
cmp = strcmp(lastsec, sec); |
cmp = strcmp(lastsec, sec); |
if (cmp > 0) |
if (cmp > 0) |
mandoc_vmsg(MANDOCERR_XR_ORDER, |
mandoc_msg(MANDOCERR_XR_ORDER, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s(%s) after %s(%s)", |
"%s(%s) after %s(%s)", name, |
name, sec, lastname, lastsec); |
sec, lastname, lastsec); |
|
else if (cmp == 0 && |
else if (cmp == 0 && |
strcasecmp(lastname, name) > 0) |
strcasecmp(lastname, name) > 0) |
mandoc_vmsg(MANDOCERR_XR_ORDER, |
mandoc_msg(MANDOCERR_XR_ORDER, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "%s after %s", name, lastname); |
"%s after %s", name, lastname); |
|
} |
} |
lastname = name; |
lastname = name; |
lastsec = sec; |
lastsec = sec; |
Line 2141 post_sh_see_also(POST_ARGS) |
|
Line 2241 post_sh_see_also(POST_ARGS) |
|
return; |
return; |
lastpunct = n->string; |
lastpunct = n->string; |
if (n->next == NULL || n->next->tok == MDOC_Rs) |
if (n->next == NULL || n->next->tok == MDOC_Rs) |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
mandoc_msg(MANDOCERR_XR_PUNCT, n->line, |
n->line, n->pos, "%s after %s(%s)", |
n->pos, "%s after %s(%s)", |
lastpunct, lastname, lastsec); |
lastpunct, lastname, lastsec); |
n = n->next; |
n = n->next; |
} |
} |
Line 2163 post_sh_authors(POST_ARGS) |
|
Line 2263 post_sh_authors(POST_ARGS) |
|
{ |
{ |
|
|
if ( ! child_an(mdoc->last)) |
if ( ! child_an(mdoc->last)) |
mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse, |
mandoc_msg(MANDOCERR_AN_MISSING, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
} |
} |
|
|
Line 2229 post_sh_head(POST_ARGS) |
|
Line 2329 post_sh_head(POST_ARGS) |
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE) |
if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE) |
mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_FIRST, |
mdoc->last->line, mdoc->last->pos, "Sh %s", |
mdoc->last->line, mdoc->last->pos, "Sh %s", |
sec != SEC_CUSTOM ? secnames[sec] : |
sec != SEC_CUSTOM ? secnames[sec] : |
(nch = mdoc->last->child) == NULL ? "" : |
(nch = mdoc->last->child) == NULL ? "" : |
Line 2266 post_sh_head(POST_ARGS) |
|
Line 2366 post_sh_head(POST_ARGS) |
|
} |
} |
} |
} |
if (goodsec != NULL) |
if (goodsec != NULL) |
mandoc_vmsg(MANDOCERR_SEC_TYPO, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_TYPO, nch->line, nch->pos, |
nch->line, nch->pos, "Sh %s instead of %s", |
"Sh %s instead of %s", nch->string, goodsec); |
nch->string, goodsec); |
|
return; |
return; |
} |
} |
|
|
Line 2278 post_sh_head(POST_ARGS) |
|
Line 2377 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |
mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_REP, mdoc->last->line, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->pos, "Sh %s", secnames[sec]); |
"Sh %s", secnames[sec]); |
|
|
|
if (sec < mdoc->lastnamed) |
if (sec < mdoc->lastnamed) |
mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->last->line, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->pos, "Sh %s", secnames[sec]); |
"Sh %s", secnames[sec]); |
|
|
|
/* Mark the last named section. */ |
/* Mark the last named section. */ |
|
|
Line 2317 post_sh_head(POST_ARGS) |
|
Line 2414 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (NULL == goodsec) |
if (NULL == goodsec) |
goodsec = "9"; |
goodsec = "9"; |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_MSEC, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"Sh %s for %s only", secnames[sec], goodsec); |
"Sh %s for %s only", secnames[sec], goodsec); |
break; |
break; |
Line 2334 post_xr(POST_ARGS) |
|
Line 2431 post_xr(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
if (nch->next == NULL) { |
if (nch->next == NULL) { |
mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse, |
mandoc_msg(MANDOCERR_XR_NOSEC, |
n->line, n->pos, "Xr %s", nch->string); |
n->line, n->pos, "Xr %s", nch->string); |
} else |
} else { |
assert(nch->next == n->last); |
assert(nch->next == n->last); |
post_delim(mdoc); |
if(mandoc_xr_add(nch->next->string, nch->string, |
|
nch->line, nch->pos)) |
|
mandoc_msg(MANDOCERR_XR_SELF, |
|
nch->line, nch->pos, "Xr %s %s", |
|
nch->string, nch->next->string); |
|
} |
|
post_delim_nb(mdoc); |
} |
} |
|
|
static void |
static void |
Line 2351 post_ignpar(POST_ARGS) |
|
Line 2454 post_ignpar(POST_ARGS) |
|
post_prevpar(mdoc); |
post_prevpar(mdoc); |
return; |
return; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
|
post_delim(mdoc); |
post_hyph(mdoc); |
post_hyph(mdoc); |
return; |
return; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 2360 post_ignpar(POST_ARGS) |
|
Line 2464 post_ignpar(POST_ARGS) |
|
} |
} |
|
|
if ((np = mdoc->last->child) != NULL) |
if ((np = mdoc->last->child) != NULL) |
if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) { |
if (np->tok == MDOC_Pp || |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
np->tok == ROFF_br || np->tok == ROFF_sp) { |
mdoc->parse, np->line, np->pos, |
mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, |
"%s after %s", roff_name[np->tok], |
"%s after %s", roff_name[np->tok], |
roff_name[mdoc->last->tok]); |
roff_name[mdoc->last->tok]); |
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, np); |
} |
} |
|
|
if ((np = mdoc->last->last) != NULL) |
if ((np = mdoc->last->last) != NULL) |
if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) { |
if (np->tok == MDOC_Pp || np->tok == ROFF_br) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, |
np->line, np->pos, "%s at the end of %s", |
"%s at the end of %s", roff_name[np->tok], |
roff_name[np->tok], |
|
roff_name[mdoc->last->tok]); |
roff_name[mdoc->last->tok]); |
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, np); |
} |
} |
Line 2381 post_ignpar(POST_ARGS) |
|
Line 2484 post_ignpar(POST_ARGS) |
|
static void |
static void |
post_prevpar(POST_ARGS) |
post_prevpar(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n, *np; |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (NULL == n->prev) |
|
return; |
|
if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK) |
if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK) |
return; |
return; |
|
if ((np = roff_node_prev(n)) == NULL) |
|
return; |
|
|
/* |
/* |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
* Don't allow `Pp' prior to a paragraph-type |
* block: `Lp', `Pp', or non-compact `Bd' or `Bl'. |
* block: `Pp' or non-compact `Bd' or `Bl'. |
*/ |
*/ |
|
|
if (n->prev->tok != MDOC_Pp && |
if (np->tok != MDOC_Pp && np->tok != ROFF_br) |
n->prev->tok != MDOC_Lp && |
|
n->prev->tok != ROFF_br) |
|
return; |
return; |
if (n->tok == MDOC_Bl && n->norm->Bl.comp) |
if (n->tok == MDOC_Bl && n->norm->Bl.comp) |
return; |
return; |
Line 2405 post_prevpar(POST_ARGS) |
|
Line 2506 post_prevpar(POST_ARGS) |
|
if (n->tok == MDOC_It && n->parent->norm->Bl.comp) |
if (n->tok == MDOC_It && n->parent->norm->Bl.comp) |
return; |
return; |
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, |
n->prev->line, n->prev->pos, "%s before %s", |
"%s before %s", roff_name[np->tok], roff_name[n->tok]); |
roff_name[n->prev->tok], roff_name[n->tok]); |
roff_node_delete(mdoc, np); |
roff_node_delete(mdoc, n->prev); |
|
} |
} |
|
|
static void |
static void |
Line 2416 post_par(POST_ARGS) |
|
Line 2516 post_par(POST_ARGS) |
|
{ |
{ |
struct roff_node *np; |
struct roff_node *np; |
|
|
np = mdoc->last; |
post_prevpar(mdoc); |
if (np->tok != ROFF_br && np->tok != ROFF_sp) |
|
post_prevpar(mdoc); |
|
|
|
if (np->tok == ROFF_sp) { |
np = mdoc->last; |
if (np->child != NULL && np->child->next != NULL) |
if (np->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_SKIP, np->line, np->pos, |
np->child->next->line, np->child->next->pos, |
"%s %s", roff_name[np->tok], np->child->string); |
"sp ... %s", np->child->next->string); |
|
} else if (np->child != NULL) |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, np->line, np->pos, "%s %s", |
|
roff_name[np->tok], np->child->string); |
|
|
|
if ((np = mdoc->last->prev) == NULL) { |
|
np = mdoc->last->parent; |
|
if (np->tok != MDOC_Sh && np->tok != MDOC_Ss) |
|
return; |
|
} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp && |
|
(mdoc->last->tok != ROFF_br || |
|
(np->tok != ROFF_sp && np->tok != ROFF_br))) |
|
return; |
|
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, "%s after %s", |
|
roff_name[mdoc->last->tok], roff_name[np->tok]); |
|
roff_node_delete(mdoc, mdoc->last); |
|
} |
} |
|
|
static void |
static void |
post_dd(POST_ARGS) |
post_dd(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
char *datestr; |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.date != NULL) { |
if (mdoc->meta.date != NULL) { |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dd"); |
n->line, n->pos, "Dd"); |
|
free(mdoc->meta.date); |
free(mdoc->meta.date); |
} else if (mdoc->flags & MDOC_PBODY) |
} else if (mdoc->flags & MDOC_PBODY) |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Dd"); |
n->line, n->pos, "Dd"); |
|
else if (mdoc->meta.title != NULL) |
else if (mdoc->meta.title != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dd after Dt"); |
n->line, n->pos, "Dd after Dt"); |
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dd after Os"); |
n->line, n->pos, "Dd after Os"); |
|
|
if (n->child == NULL || n->child->string[0] == '\0') { |
if (mdoc->quick && n != NULL) |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
mdoc->meta.date = mandoc_strdup(""); |
mandoc_normdate(mdoc, NULL, n->line, n->pos); |
else |
return; |
mdoc->meta.date = mandoc_normdate(n->child, n); |
} |
|
|
|
datestr = NULL; |
|
deroff(&datestr, n); |
|
if (mdoc->quick) |
|
mdoc->meta.date = datestr; |
|
else { |
|
mdoc->meta.date = mandoc_normdate(mdoc, |
|
datestr, n->line, n->pos); |
|
free(datestr); |
|
} |
|
} |
} |
|
|
static void |
static void |
Line 2496 post_dt(POST_ARGS) |
|
Line 2561 post_dt(POST_ARGS) |
|
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->flags & MDOC_PBODY) { |
if (mdoc->flags & MDOC_PBODY) { |
mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_DT_LATE, n->line, n->pos, "Dt"); |
n->line, n->pos, "Dt"); |
|
return; |
return; |
} |
} |
|
|
if (mdoc->meta.title != NULL) |
if (mdoc->meta.title != NULL) |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dt"); |
n->line, n->pos, "Dt"); |
|
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, |
n->line, n->pos, "Dt after Os"); |
n->line, n->pos, "Dt after Os"); |
|
|
free(mdoc->meta.title); |
free(mdoc->meta.title); |
Line 2522 post_dt(POST_ARGS) |
|
Line 2585 post_dt(POST_ARGS) |
|
|
|
nn = n->child; |
nn = n->child; |
if (nn == NULL || *nn->string == '\0') { |
if (nn == NULL || *nn->string == '\0') { |
mandoc_msg(MANDOCERR_DT_NOTITLE, |
mandoc_msg(MANDOCERR_DT_NOTITLE, n->line, n->pos, "Dt"); |
mdoc->parse, n->line, n->pos, "Dt"); |
|
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
mdoc->meta.title = mandoc_strdup("UNTITLED"); |
} else { |
} else { |
mdoc->meta.title = mandoc_strdup(nn->string); |
mdoc->meta.title = mandoc_strdup(nn->string); |
Line 2532 post_dt(POST_ARGS) |
|
Line 2594 post_dt(POST_ARGS) |
|
|
|
for (p = nn->string; *p != '\0'; p++) |
for (p = nn->string; *p != '\0'; p++) |
if (islower((unsigned char)*p)) { |
if (islower((unsigned char)*p)) { |
mandoc_vmsg(MANDOCERR_TITLE_CASE, |
mandoc_msg(MANDOCERR_TITLE_CASE, nn->line, |
mdoc->parse, nn->line, |
nn->pos + (int)(p - nn->string), |
nn->pos + (p - nn->string), |
|
"Dt %s", nn->string); |
"Dt %s", nn->string); |
break; |
break; |
} |
} |
Line 2546 post_dt(POST_ARGS) |
|
Line 2607 post_dt(POST_ARGS) |
|
nn = nn->next; |
nn = nn->next; |
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_vmsg(MANDOCERR_MSEC_MISSING, |
mandoc_msg(MANDOCERR_MSEC_MISSING, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
|
"Dt %s", mdoc->meta.title); |
"Dt %s", mdoc->meta.title); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
return; /* msec and arch remain NULL. */ |
return; /* msec and arch remain NULL. */ |
Line 2559 post_dt(POST_ARGS) |
|
Line 2619 post_dt(POST_ARGS) |
|
|
|
cp = mandoc_a2msec(nn->string); |
cp = mandoc_a2msec(nn->string); |
if (cp == NULL) { |
if (cp == NULL) { |
mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_MSEC_BAD, |
nn->line, nn->pos, "Dt ... %s", nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |
Line 2577 post_dt(POST_ARGS) |
|
Line 2637 post_dt(POST_ARGS) |
|
/* Ignore fourth and later arguments. */ |
/* Ignore fourth and later arguments. */ |
|
|
if ((nn = nn->next) != NULL) |
if ((nn = nn->next) != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, |
nn->line, nn->pos, "Dt ... %s", nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
} |
} |
|
|
Line 2587 post_bx(POST_ARGS) |
|
Line 2647 post_bx(POST_ARGS) |
|
struct roff_node *n, *nch; |
struct roff_node *n, *nch; |
const char *macro; |
const char *macro; |
|
|
post_delim(mdoc); |
post_delim_nb(mdoc); |
|
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
Line 2598 post_bx(POST_ARGS) |
|
Line 2658 post_bx(POST_ARGS) |
|
!strcmp(nch->string, "Free") ? "Fx" : |
!strcmp(nch->string, "Free") ? "Fx" : |
!strcmp(nch->string, "DragonFly") ? "Dx" : NULL; |
!strcmp(nch->string, "DragonFly") ? "Dx" : NULL; |
if (macro != NULL) |
if (macro != NULL) |
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
mandoc_msg(MANDOCERR_BX, |
n->line, n->pos, macro); |
n->line, n->pos, "%s", macro); |
mdoc->last = nch; |
mdoc->last = nch; |
nch = nch->next; |
nch = nch->next; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
Line 2647 post_os(POST_ARGS) |
|
Line 2707 post_os(POST_ARGS) |
|
n->flags |= NODE_NOPRT; |
n->flags |= NODE_NOPRT; |
|
|
if (mdoc->meta.os != NULL) |
if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
else if (mdoc->flags & MDOC_PBODY) |
else if (mdoc->flags & MDOC_PBODY) |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
|
|
|
post_delim(mdoc); |
|
|
/* |
/* |
* Set the operating system by way of the `Os' macro. |
* Set the operating system by way of the `Os' macro. |
* The order of precedence is: |
* The order of precedence is: |
Line 2678 post_os(POST_ARGS) |
|
Line 2738 post_os(POST_ARGS) |
|
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (defbuf == NULL) { |
if (defbuf == NULL) { |
if (uname(&utsname) == -1) { |
if (uname(&utsname) == -1) { |
mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse, |
mandoc_msg(MANDOCERR_OS_UNAME, n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
|
defbuf = mandoc_strdup("UNKNOWN"); |
defbuf = mandoc_strdup("UNKNOWN"); |
} else |
} else |
mandoc_asprintf(&defbuf, "%s %s", |
mandoc_asprintf(&defbuf, "%s %s", |
|
|
*/ |
*/ |
|
|
if (n->child != NULL) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse, |
mandoc_msg(MANDOCERR_OS_ARG, n->child->line, n->child->pos, |
n->child->line, n->child->pos, |
|
"Os %s (%s)", n->child->string, |
"Os %s (%s)", n->child->string, |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
"OpenBSD" : "NetBSD"); |
"OpenBSD" : "NetBSD"); |
|
|
return; |
return; |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (mdoc->meta.os_e == MANDOC_OS_OPENBSD) |
if (mdoc->meta.os_e == MANDOC_OS_OPENBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING, |
mandoc_msg(MANDOCERR_MDOCDATE_MISSING, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "Dd %s (OpenBSD)", n->string); |
"Dd %s (OpenBSD)", n->string); |
|
} else { |
} else { |
if (mdoc->meta.os_e == MANDOC_OS_NETBSD) |
if (mdoc->meta.os_e == MANDOC_OS_NETBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE, |
mandoc_msg(MANDOCERR_MDOCDATE, n->line, |
mdoc->parse, n->line, n->pos, |
n->pos, "Dd %s (NetBSD)", n->string); |
"Dd %s (NetBSD)", n->string); |
|
} |
} |
} |
} |
|
|