version 1.143, 2010/12/16 00:57:50 |
version 1.194, 2013/10/05 22:08:12 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
|
#include "mdoc.h" |
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
Line 53 enum check_ineq { |
|
Line 55 enum check_ineq { |
|
enum check_lvl { |
enum check_lvl { |
CHECK_WARN, |
CHECK_WARN, |
CHECK_ERROR, |
CHECK_ERROR, |
CHECK_FATAL |
|
}; |
}; |
|
|
typedef int (*v_pre)(PRE_ARGS); |
typedef int (*v_pre)(PRE_ARGS); |
Line 71 static void check_text(struct mdoc *, int, int, char |
|
Line 72 static void check_text(struct mdoc *, int, int, char |
|
static void check_argv(struct mdoc *, |
static void check_argv(struct mdoc *, |
struct mdoc_node *, struct mdoc_argv *); |
struct mdoc_node *, struct mdoc_argv *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
|
static int concat(char *, const struct mdoc_node *, size_t); |
|
static enum mdoc_sec a2sec(const char *); |
|
static size_t macro2len(enum mdoct); |
|
|
static int concat(struct mdoc *, char *, |
|
const struct mdoc_node *, size_t); |
|
|
|
static int ebool(POST_ARGS); |
static int ebool(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static int eerr_eq0(POST_ARGS); |
|
static int eerr_eq1(POST_ARGS); |
|
static int eerr_ge1(POST_ARGS); |
|
static int eerr_le1(POST_ARGS); |
|
static int ewarn_eq0(POST_ARGS); |
static int ewarn_eq0(POST_ARGS); |
|
static int ewarn_eq1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int ewarn_ge1(POST_ARGS); |
static int herr_eq0(POST_ARGS); |
static int ewarn_le1(POST_ARGS); |
static int herr_ge1(POST_ARGS); |
|
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
|
static int hwarn_ge1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
|
|
static int post_an(POST_ARGS); |
static int post_an(POST_ARGS); |
Line 98 static int post_bl_block(POST_ARGS); |
|
Line 96 static int post_bl_block(POST_ARGS); |
|
static int post_bl_block_width(POST_ARGS); |
static int post_bl_block_width(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
|
static int post_bx(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_defaults(POST_ARGS); |
static int post_defaults(POST_ARGS); |
Line 106 static int post_eoln(POST_ARGS); |
|
Line 105 static int post_eoln(POST_ARGS); |
|
static int post_it(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_nm(POST_ARGS); |
|
static int post_ns(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
|
static int post_par(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_root(POST_ARGS); |
Line 137 static v_post posts_bd[] = { post_literal, hwarn_eq0, |
|
Line 138 static v_post posts_bd[] = { post_literal, hwarn_eq0, |
|
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_bx[] = { post_bx, NULL }; |
|
static v_post posts_bool[] = { ebool, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
static v_post posts_dd[] = { ewarn_ge1, post_dd, post_prol, NULL }; |
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_lb[] = { eerr_eq1, post_lb, NULL }; |
static v_post posts_lb[] = { post_lb, NULL }; |
static v_post posts_nd[] = { berr_ge1, NULL }; |
static v_post posts_nd[] = { berr_ge1, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
|
static v_post posts_ns[] = { post_ns, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; |
static v_post posts_pp[] = { post_par, ewarn_eq0, NULL }; |
static v_post posts_sh[] = { post_ignpar, herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL }; |
static v_post posts_ss[] = { post_ignpar, herr_ge1, bwarn_ge1, NULL }; |
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, NULL }; |
|
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text1[] = { eerr_eq1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
|
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
Line 177 static v_pre pres_sh[] = { pre_sh, NULL }; |
|
Line 180 static v_pre pres_sh[] = { pre_sh, NULL }; |
|
static v_pre pres_ss[] = { pre_ss, NULL }; |
static v_pre pres_ss[] = { pre_ss, NULL }; |
static v_pre pres_std[] = { pre_std, NULL }; |
static v_pre pres_std[] = { pre_std, NULL }; |
|
|
const struct valids mdoc_valids[MDOC_MAX] = { |
static const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pres_dd, posts_dd }, /* Dd */ |
{ pres_dd, posts_dd }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_os, posts_os }, /* Os */ |
{ pres_os, posts_os }, /* Os */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_pp, posts_notext }, /* Pp */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pres_bd, posts_bd }, /* Bd */ |
Line 192 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 195 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ pres_bl, posts_bl }, /* Bl */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ pres_it, posts_it }, /* It */ |
{ pres_it, posts_it }, /* It */ |
{ NULL, posts_text }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ pres_an, posts_an }, /* An */ |
{ pres_an, posts_an }, /* An */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_text }, /* Cd */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ pres_er, posts_text }, /* Er */ |
{ pres_er, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_std }, /* Ex */ |
{ pres_std, posts_std }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ pres_fd, posts_text }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, posts_text }, /* Fn */ |
{ NULL, NULL }, /* Fn */ |
{ NULL, posts_wtext }, /* Ft */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, posts_text }, /* Ic */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, posts_text1 }, /* In */ |
{ NULL, posts_text1 }, /* In */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nd }, /* Nd */ |
Line 218 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 221 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_wtext }, /* Xr */ |
{ NULL, posts_text }, /* Xr */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %D */ /* FIXME: check date with mandoc_a2time(). */ |
{ NULL, posts_text }, /* %D */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %N */ |
{ NULL, posts_text }, /* %N */ |
Line 239 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 242 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, posts_bx }, /* Bx */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Do */ |
Line 249 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 252 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, posts_text }, /* Ms */ |
{ NULL, NULL }, /* Ms */ |
{ NULL, posts_notext }, /* No */ |
{ NULL, posts_notext }, /* No */ |
{ NULL, posts_notext }, /* Ns */ |
{ NULL, posts_ns }, /* Ns */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
Line 268 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 271 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, NULL }, /* Sx */ |
{ NULL, posts_text }, /* Sy */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, posts_text }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Ux */ |
{ NULL, NULL }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xo */ |
{ NULL, NULL }, /* Xo */ |
Line 285 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 288 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_notext }, /* Lp */ |
{ pres_pp, posts_pp }, /* Lp */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
Line 296 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 299 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* En */ |
{ NULL, NULL }, /* En */ |
{ NULL, NULL }, /* Dx */ |
{ NULL, NULL }, /* Dx */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_notext }, /* br */ |
{ NULL, posts_pp }, /* br */ |
{ pres_pp, posts_sp }, /* sp */ |
{ NULL, posts_sp }, /* sp */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
}; |
}; |
Line 313 static const enum mdoct rsord[RSORD_MAX] = { |
|
Line 316 static const enum mdoct rsord[RSORD_MAX] = { |
|
MDOC__R, |
MDOC__R, |
MDOC__N, |
MDOC__N, |
MDOC__V, |
MDOC__V, |
|
MDOC__U, |
MDOC__P, |
MDOC__P, |
MDOC__Q, |
MDOC__Q, |
MDOC__D, |
|
MDOC__O, |
|
MDOC__C, |
MDOC__C, |
MDOC__U |
MDOC__D, |
|
MDOC__O |
}; |
}; |
|
|
|
static const char * const secnames[SEC__MAX] = { |
|
NULL, |
|
"NAME", |
|
"LIBRARY", |
|
"SYNOPSIS", |
|
"DESCRIPTION", |
|
"IMPLEMENTATION NOTES", |
|
"RETURN VALUES", |
|
"ENVIRONMENT", |
|
"FILES", |
|
"EXIT STATUS", |
|
"EXAMPLES", |
|
"DIAGNOSTICS", |
|
"COMPATIBILITY", |
|
"ERRORS", |
|
"SEE ALSO", |
|
"STANDARDS", |
|
"HISTORY", |
|
"AUTHORS", |
|
"CAVEATS", |
|
"BUGS", |
|
"SECURITY CONSIDERATIONS", |
|
NULL |
|
}; |
|
|
int |
int |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
Line 329 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 356 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
int line, pos; |
int line, pos; |
char *tp; |
char *tp; |
|
|
if (MDOC_TEXT == n->type) { |
switch (n->type) { |
|
case (MDOC_TEXT): |
tp = n->string; |
tp = n->string; |
line = n->line; |
line = n->line; |
pos = n->pos; |
pos = n->pos; |
check_text(mdoc, line, pos, tp); |
check_text(mdoc, line, pos, tp); |
|
/* FALLTHROUGH */ |
|
case (MDOC_TBL): |
|
/* FALLTHROUGH */ |
|
case (MDOC_EQN): |
|
/* FALLTHROUGH */ |
|
case (MDOC_ROOT): |
return(1); |
return(1); |
|
default: |
|
break; |
} |
} |
|
|
check_args(mdoc, n); |
check_args(mdoc, n); |
Line 357 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 393 mdoc_valid_post(struct mdoc *mdoc) |
|
return(1); |
return(1); |
mdoc->last->flags |= MDOC_VALID; |
mdoc->last->flags |= MDOC_VALID; |
|
|
if (MDOC_TEXT == mdoc->last->type) |
switch (mdoc->last->type) { |
|
case (MDOC_TEXT): |
|
/* FALLTHROUGH */ |
|
case (MDOC_EQN): |
|
/* FALLTHROUGH */ |
|
case (MDOC_TBL): |
return(1); |
return(1); |
if (MDOC_ROOT == mdoc->last->type) |
case (MDOC_ROOT): |
return(post_root(mdoc)); |
return(post_root(mdoc)); |
|
default: |
|
break; |
|
} |
|
|
if (NULL == mdoc_valids[mdoc->last->tok].post) |
if (NULL == mdoc_valids[mdoc->last->tok].post) |
return(1); |
return(1); |
Line 372 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 416 mdoc_valid_post(struct mdoc *mdoc) |
|
} |
} |
|
|
static int |
static int |
check_count(struct mdoc *m, enum mdoc_type type, |
check_count(struct mdoc *mdoc, enum mdoc_type type, |
enum check_lvl lvl, enum check_ineq ineq, int val) |
enum check_lvl lvl, enum check_ineq ineq, int val) |
{ |
{ |
const char *p; |
const char *p; |
|
enum mandocerr t; |
|
|
if (m->last->type != type) |
if (mdoc->last->type != type) |
return(1); |
return(1); |
|
|
switch (ineq) { |
switch (ineq) { |
case (CHECK_LT): |
case (CHECK_LT): |
p = "less than "; |
p = "less than "; |
if (m->last->nchild < val) |
if (mdoc->last->nchild < val) |
return(1); |
return(1); |
break; |
break; |
case (CHECK_GT): |
case (CHECK_GT): |
p = "greater than "; |
p = "more than "; |
if (m->last->nchild > val) |
if (mdoc->last->nchild > val) |
return(1); |
return(1); |
break; |
break; |
case (CHECK_EQ): |
case (CHECK_EQ): |
p = ""; |
p = ""; |
if (val == m->last->nchild) |
if (val == mdoc->last->nchild) |
return(1); |
return(1); |
break; |
break; |
default: |
default: |
Line 401 check_count(struct mdoc *m, enum mdoc_type type, |
|
Line 446 check_count(struct mdoc *m, enum mdoc_type type, |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
if (CHECK_WARN == lvl) { |
t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT; |
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
mandoc_vmsg(t, mdoc->parse, mdoc->last->line, mdoc->last->pos, |
m->last->line, m->last->pos, |
"want %s%d children (have %d)", |
"want %s%d children (have %d)", |
p, val, mdoc->last->nchild); |
p, val, m->last->nchild)); |
return(1); |
} |
|
|
|
/* FIXME: THIS IS THE SAME AS THE ABOVE. */ |
|
|
|
return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, |
|
m->last->line, m->last->pos, |
|
"require %s%d children (have %d)", |
|
p, val, m->last->nchild)); |
|
} |
} |
|
|
static int |
static int |
berr_ge1(POST_ARGS) |
berr_ge1(POST_ARGS) |
{ |
{ |
|
|
return(check_count(mdoc, MDOC_BODY, CHECK_FATAL, CHECK_GT, 0)); |
return(check_count(mdoc, MDOC_BODY, CHECK_ERROR, CHECK_GT, 0)); |
} |
} |
|
|
static int |
static int |
Line 430 bwarn_ge1(POST_ARGS) |
|
Line 467 bwarn_ge1(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
eerr_eq0(POST_ARGS) |
ewarn_eq0(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 0)); |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
} |
} |
|
|
static int |
static int |
eerr_eq1(POST_ARGS) |
ewarn_eq1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 1)); |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1)); |
} |
} |
|
|
static int |
static int |
eerr_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_GT, 0)); |
|
} |
|
|
|
static int |
|
eerr_le1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_LT, 2)); |
|
} |
|
|
|
static int |
|
ewarn_eq0(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
|
} |
|
|
|
static int |
|
ewarn_ge1(POST_ARGS) |
ewarn_ge1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0)); |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0)); |
} |
} |
|
|
static int |
static int |
herr_eq0(POST_ARGS) |
ewarn_le1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_EQ, 0)); |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2)); |
} |
} |
|
|
static int |
static int |
herr_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_GT, 0)); |
|
} |
|
|
|
static int |
|
hwarn_eq0(POST_ARGS) |
hwarn_eq0(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0)); |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0)); |
Line 490 hwarn_eq1(POST_ARGS) |
|
Line 503 hwarn_eq1(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
hwarn_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
|
} |
|
|
|
static int |
hwarn_le1(POST_ARGS) |
hwarn_le1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
} |
} |
|
|
static void |
static void |
check_args(struct mdoc *m, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
int i; |
int i; |
|
|
Line 505 check_args(struct mdoc *m, struct mdoc_node *n) |
|
Line 524 check_args(struct mdoc *m, struct mdoc_node *n) |
|
|
|
assert(n->args->argc); |
assert(n->args->argc); |
for (i = 0; i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) |
check_argv(m, n, &n->args->argv[i]); |
check_argv(mdoc, n, &n->args->argv[i]); |
} |
} |
|
|
static void |
static void |
check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v) |
check_argv(struct mdoc *mdoc, struct mdoc_node *n, struct mdoc_argv *v) |
{ |
{ |
int i; |
int i; |
|
|
for (i = 0; i < (int)v->sz; i++) |
for (i = 0; i < (int)v->sz; i++) |
check_text(m, v->line, v->pos, v->value[i]); |
check_text(mdoc, v->line, v->pos, v->value[i]); |
|
|
/* FIXME: move to post_std(). */ |
/* FIXME: move to post_std(). */ |
|
|
if (MDOC_Std == v->arg) |
if (MDOC_Std == v->arg) |
if ( ! (v->sz || m->meta.name)) |
if ( ! (v->sz || mdoc->meta.name)) |
mdoc_nmsg(m, n, MANDOCERR_NONAME); |
mdoc_nmsg(mdoc, n, MANDOCERR_NONAME); |
} |
} |
|
|
static void |
static void |
check_text(struct mdoc *m, int ln, int pos, char *p) |
check_text(struct mdoc *mdoc, int ln, int pos, char *p) |
{ |
{ |
int c; |
char *cp; |
size_t sz; |
|
|
|
for ( ; *p; p++, pos++) { |
if (MDOC_LITERAL & mdoc->flags) |
sz = strcspn(p, "\t\\"); |
return; |
p += (int)sz; |
|
|
|
if ('\0' == *p) |
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
break; |
mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB); |
|
|
pos += (int)sz; |
|
|
|
if ('\t' == *p) { |
|
if ( ! (MDOC_LITERAL & m->flags)) |
|
mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB); |
|
continue; |
|
} |
|
|
|
if (0 == (c = mandoc_special(p))) { |
|
mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
|
continue; |
|
} |
|
|
|
p += c - 1; |
|
pos += c - 1; |
|
} |
|
} |
} |
|
|
static int |
static int |
Line 563 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
Line 563 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
(t == n->parent->type)) |
(t == n->parent->type)) |
return(1); |
return(1); |
|
|
mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD, |
mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse, n->line, |
n->line, n->pos, "want parent %s", |
n->pos, "want parent %s", MDOC_ROOT == t ? |
MDOC_ROOT == t ? "<root>" : |
"<root>" : mdoc_macronames[tok]); |
mdoc_macronames[tok]); |
|
return(0); |
return(0); |
} |
} |
|
|
Line 609 pre_bl(PRE_ARGS) |
|
Line 608 pre_bl(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bl == np->tok); |
assert(MDOC_Bl == np->tok); |
assert(np->data.Bl); |
|
n->data.Bl = np->data.Bl; |
|
return(1); |
return(1); |
} |
} |
|
|
Line 620 pre_bl(PRE_ARGS) |
|
Line 617 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
assert(NULL == n->data.Bl); |
|
n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
lt = LIST__NONE; |
lt = LIST__NONE; |
Line 665 pre_bl(PRE_ARGS) |
|
Line 659 pre_bl(PRE_ARGS) |
|
break; |
break; |
/* Set list arguments. */ |
/* Set list arguments. */ |
case (MDOC_Compact): |
case (MDOC_Compact): |
dup = n->data.Bl->comp; |
dup = n->norm->Bl.comp; |
comp = 1; |
comp = 1; |
break; |
break; |
case (MDOC_Width): |
case (MDOC_Width): |
dup = (NULL != n->data.Bl->width); |
/* NB: this can be empty! */ |
width = n->args->argv[i].value[0]; |
if (n->args->argv[i].sz) { |
|
width = n->args->argv[i].value[0]; |
|
dup = (NULL != n->norm->Bl.width); |
|
break; |
|
} |
|
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bl->offs); |
dup = (NULL != n->norm->Bl.offs); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
Line 691 pre_bl(PRE_ARGS) |
|
Line 690 pre_bl(PRE_ARGS) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bl->comp = comp; |
n->norm->Bl.comp = comp; |
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bl->offs = offs; |
n->norm->Bl.offs = offs; |
if (width && ! dup) |
if (width && ! dup) |
n->data.Bl->width = width; |
n->norm->Bl.width = width; |
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { |
if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) { |
n->data.Bl->type = lt; |
n->norm->Bl.type = lt; |
/* Set column information, too. */ |
/* Set column information, too. */ |
if (LIST_column == lt) { |
if (LIST_column == lt) { |
n->data.Bl->ncols = |
n->norm->Bl.ncols = |
n->args->argv[i].sz; |
n->args->argv[i].sz; |
n->data.Bl->cols = (const char **) |
n->norm->Bl.cols = (void *) |
n->args->argv[i].value; |
n->args->argv[i].value; |
} |
} |
} |
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
if (n->data.Bl->type == LIST__NONE) |
if (n->norm->Bl.type == LIST__NONE) |
if (n->data.Bl->width || |
if (n->norm->Bl.width || |
n->data.Bl->offs || |
n->norm->Bl.offs || |
n->data.Bl->comp) |
n->norm->Bl.comp) |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
|
|
continue; |
continue; |
Line 728 pre_bl(PRE_ARGS) |
|
Line 727 pre_bl(PRE_ARGS) |
|
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->data.Bl->type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
n->data.Bl->type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
/* |
/* |
* Validate the width field. Some list types don't need width |
* Validate the width field. Some list types don't need width |
* types and should be warned about them. Others should have it |
* types and should be warned about them. Others should have it |
* and must also be warned. |
* and must also be warned. Yet others have a default and need |
|
* no warning. |
*/ |
*/ |
|
|
switch (n->data.Bl->type) { |
switch (n->norm->Bl.type) { |
case (LIST_tag): |
case (LIST_tag): |
if (n->data.Bl->width) |
if (NULL == n->norm->Bl.width) |
break; |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
break; |
break; |
case (LIST_column): |
case (LIST_column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 754 pre_bl(PRE_ARGS) |
|
Line 753 pre_bl(PRE_ARGS) |
|
case (LIST_inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (n->data.Bl->width) |
if (n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
break; |
break; |
|
case (LIST_bullet): |
|
/* FALLTHROUGH */ |
|
case (LIST_dash): |
|
/* FALLTHROUGH */ |
|
case (LIST_hyphen): |
|
if (NULL == n->norm->Bl.width) |
|
n->norm->Bl.width = "2n"; |
|
break; |
|
case (LIST_enum): |
|
if (NULL == n->norm->Bl.width) |
|
n->norm->Bl.width = "3n"; |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
Line 783 pre_bd(PRE_ARGS) |
|
Line 794 pre_bd(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bd == np->tok); |
assert(MDOC_Bd == np->tok); |
assert(np->data.Bd); |
|
n->data.Bd = np->data.Bd; |
|
return(1); |
return(1); |
} |
} |
|
|
assert(NULL == n->data.Bd); |
|
n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
dt = DISP__NONE; |
dt = DISP__NONE; |
Line 820 pre_bd(PRE_ARGS) |
|
Line 826 pre_bd(PRE_ARGS) |
|
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bd->offs); |
dup = (NULL != n->norm->Bd.offs); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
comp = 1; |
comp = 1; |
dup = n->data.Bd->comp; |
dup = n->norm->Bd.comp; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 842 pre_bd(PRE_ARGS) |
|
Line 848 pre_bd(PRE_ARGS) |
|
/* Make our auxiliary assignments. */ |
/* Make our auxiliary assignments. */ |
|
|
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bd->offs = offs; |
n->norm->Bd.offs = offs; |
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bd->comp = comp; |
n->norm->Bd.comp = comp; |
|
|
/* Check whether a type has already been assigned. */ |
/* Check whether a type has already been assigned. */ |
|
|
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE) |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
|
|
/* Make our type assignment. */ |
/* Make our type assignment. */ |
|
|
if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) |
if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE) |
n->data.Bd->type = dt; |
n->norm->Bd.type = dt; |
} |
} |
|
|
if (DISP__NONE == n->data.Bd->type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
n->data.Bd->type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(1); |
Line 882 pre_sh(PRE_ARGS) |
|
Line 888 pre_sh(PRE_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
mdoc->regs->regs[(int)REG_nS].set = 0; |
|
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
} |
} |
|
|
Line 912 pre_an(PRE_ARGS) |
|
Line 916 pre_an(PRE_ARGS) |
|
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
|
|
if (MDOC_Split == n->args->argv[0].arg) |
if (MDOC_Split == n->args->argv[0].arg) |
n->data.An.auth = AUTH_split; |
n->norm->An.auth = AUTH_split; |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
n->data.An.auth = AUTH_nosplit; |
n->norm->An.auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
|
|
|
|
pre_dt(PRE_ARGS) |
pre_dt(PRE_ARGS) |
{ |
{ |
|
|
if (0 == mdoc->meta.date || mdoc->meta.os) |
if (NULL == mdoc->meta.date || mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
|
|
if (mdoc->meta.title) |
if (mdoc->meta.title) |
|
|
pre_os(PRE_ARGS) |
pre_os(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->meta.title || 0 == mdoc->meta.date) |
if (NULL == mdoc->meta.title || NULL == mdoc->meta.date) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
|
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
Line 996 post_bf(POST_ARGS) |
|
Line 1000 post_bf(POST_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_Bf == np->tok); |
assert(MDOC_Bf == np->tok); |
assert(np->data.Bf); |
|
mdoc->last->data.Bf = np->data.Bf; |
|
return(1); |
return(1); |
} |
} |
|
|
np = mdoc->last; |
np = mdoc->last; |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_Bf == np->parent->tok); |
assert(MDOC_Bf == np->parent->tok); |
np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf)); |
|
|
|
/* |
/* |
* Cannot have both argument and parameter. |
* Cannot have both argument and parameter. |
Line 1024 post_bf(POST_ARGS) |
|
Line 1025 post_bf(POST_ARGS) |
|
if (np->parent->args) { |
if (np->parent->args) { |
arg = np->parent->args->argv[0].arg; |
arg = np->parent->args->argv[0].arg; |
if (MDOC_Emphasis == arg) |
if (MDOC_Emphasis == arg) |
np->data.Bf->font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (MDOC_Literal == arg) |
else if (MDOC_Literal == arg) |
np->data.Bf->font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (MDOC_Symbolic == arg) |
else if (MDOC_Symbolic == arg) |
np->data.Bf->font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
abort(); |
abort(); |
return(1); |
return(1); |
Line 1037 post_bf(POST_ARGS) |
|
Line 1038 post_bf(POST_ARGS) |
|
/* Extract parameter into data. */ |
/* Extract parameter into data. */ |
|
|
if (0 == strcmp(np->child->string, "Em")) |
if (0 == strcmp(np->child->string, "Em")) |
np->data.Bf->font = FONT_Em; |
np->norm->Bf.font = FONT_Em; |
else if (0 == strcmp(np->child->string, "Li")) |
else if (0 == strcmp(np->child->string, "Li")) |
np->data.Bf->font = FONT_Li; |
np->norm->Bf.font = FONT_Li; |
else if (0 == strcmp(np->child->string, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
np->data.Bf->font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
|
|
Line 1055 post_lb(POST_ARGS) |
|
Line 1056 post_lb(POST_ARGS) |
|
char *buf; |
char *buf; |
size_t sz; |
size_t sz; |
|
|
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1); |
|
|
assert(mdoc->last->child); |
assert(mdoc->last->child); |
assert(MDOC_TEXT == mdoc->last->child->type); |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
Line 1098 post_vt(POST_ARGS) |
|
Line 1101 post_vt(POST_ARGS) |
|
/* |
/* |
* The Vt macro comes in both ELEM and BLOCK form, both of which |
* The Vt macro comes in both ELEM and BLOCK form, both of which |
* have different syntaxes (yet more context-sensitive |
* have different syntaxes (yet more context-sensitive |
* behaviour). ELEM types must have a child; BLOCK types, |
* behaviour). ELEM types must have a child, which is already |
|
* guaranteed by the in_line parsing routine; BLOCK types, |
* specifically the BODY, should only have TEXT children. |
* specifically the BODY, should only have TEXT children. |
*/ |
*/ |
|
|
if (MDOC_ELEM == mdoc->last->type) |
|
return(eerr_ge1(mdoc)); |
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
|
|
|
|
post_nm(POST_ARGS) |
post_nm(POST_ARGS) |
{ |
{ |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
int c; |
|
|
/* If no child specified, make sure we have the meta name. */ |
if (NULL != mdoc->meta.name) |
|
|
if (NULL == mdoc->last->child && NULL == mdoc->meta.name) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME); |
|
return(1); |
return(1); |
} else if (mdoc->meta.name) |
|
return(1); |
|
|
|
/* If no meta name, set it from the child. */ |
/* Try to use our children for setting the meta name. */ |
|
|
if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ)) |
if (NULL != mdoc->last->child) { |
return(0); |
buf[0] = '\0'; |
|
c = concat(buf, mdoc->last->child, BUFSIZ); |
|
} else |
|
c = 0; |
|
|
mdoc->meta.name = mandoc_strdup(buf); |
switch (c) { |
|
case (-1): |
|
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
|
return(0); |
|
case (0): |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME); |
|
mdoc->meta.name = mandoc_strdup("UNKNOWN"); |
|
break; |
|
default: |
|
mdoc->meta.name = mandoc_strdup(buf); |
|
break; |
|
} |
return(1); |
return(1); |
} |
} |
|
|
Line 1247 post_an(POST_ARGS) |
|
Line 1258 post_an(POST_ARGS) |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE != np->data.An.auth && np->child) |
if (AUTH__NONE == np->norm->An.auth) { |
return(eerr_eq0(mdoc)); |
if (0 == np->child) |
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0); |
|
} else if (np->child) |
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0); |
|
|
/* |
|
* FIXME: make this ewarn and make sure that the front-ends |
|
* don't print the arguments. |
|
*/ |
|
if (AUTH__NONE != np->data.An.auth || np->child) |
|
return(1); |
|
|
|
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1265 post_an(POST_ARGS) |
|
Line 1271 post_an(POST_ARGS) |
|
static int |
static int |
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
int i, cols, rc; |
int i, cols; |
enum mdoc_list lt; |
enum mdoc_list lt; |
struct mdoc_node *n, *c; |
struct mdoc_node *n, *c; |
enum mandocerr er; |
enum mandocerr er; |
Line 1274 post_it(POST_ARGS) |
|
Line 1280 post_it(POST_ARGS) |
|
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
n = mdoc->last->parent->parent; |
assert(n->data.Bl); |
lt = n->norm->Bl.type; |
lt = n->data.Bl->type; |
|
|
|
if (LIST__NONE == lt) { |
if (LIST__NONE == lt) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
Line 1314 post_it(POST_ARGS) |
|
Line 1319 post_it(POST_ARGS) |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = (int)n->data.Bl->ncols; |
cols = (int)n->norm->Bl.ncols; |
|
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
Line 1332 post_it(POST_ARGS) |
|
Line 1337 post_it(POST_ARGS) |
|
else |
else |
er = MANDOCERR_SYNTARGCOUNT; |
er = MANDOCERR_SYNTARGCOUNT; |
|
|
rc = mdoc_vmsg(mdoc, er, |
mandoc_vmsg(er, mdoc->parse, mdoc->last->line, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->pos, |
"columns == %d (have %d)", cols, i); |
"columns == %d (have %d)", cols, i); |
return(rc); |
return(MANDOCERR_ARGCOUNT == er); |
default: |
default: |
break; |
break; |
} |
} |
Line 1346 post_it(POST_ARGS) |
|
Line 1351 post_it(POST_ARGS) |
|
static int |
static int |
post_bl_block(POST_ARGS) |
post_bl_block(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n, *ni, *nc; |
|
|
/* |
/* |
* These are fairly complicated, so we've broken them into two |
* These are fairly complicated, so we've broken them into two |
Line 1358 post_bl_block(POST_ARGS) |
|
Line 1363 post_bl_block(POST_ARGS) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (LIST_tag == n->data.Bl->type && |
if (LIST_tag == n->norm->Bl.type && |
NULL == n->data.Bl->width) { |
NULL == n->norm->Bl.width) { |
if ( ! post_bl_block_tag(mdoc)) |
if ( ! post_bl_block_tag(mdoc)) |
return(0); |
return(0); |
} else if (NULL != n->data.Bl->width) { |
assert(n->norm->Bl.width); |
|
} else if (NULL != n->norm->Bl.width) { |
if ( ! post_bl_block_width(mdoc)) |
if ( ! post_bl_block_width(mdoc)) |
return(0); |
return(0); |
} else |
assert(n->norm->Bl.width); |
return(1); |
} |
|
|
assert(n->data.Bl->width); |
for (ni = n->body->child; ni; ni = ni->next) { |
|
if (NULL == ni->body) |
|
continue; |
|
nc = ni->body->last; |
|
while (NULL != nc) { |
|
switch (nc->tok) { |
|
case (MDOC_Pp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Lp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_br): |
|
break; |
|
default: |
|
nc = NULL; |
|
continue; |
|
} |
|
if (NULL == ni->next) { |
|
mdoc_nmsg(mdoc, nc, MANDOCERR_MOVEPAR); |
|
if ( ! mdoc_node_relink(mdoc, nc)) |
|
return(0); |
|
} else if (0 == n->norm->Bl.comp && |
|
LIST_column != n->norm->Bl.type) { |
|
mdoc_nmsg(mdoc, nc, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, nc); |
|
} else |
|
break; |
|
nc = ni->body->last; |
|
} |
|
} |
return(1); |
return(1); |
} |
} |
|
|
Line 1392 post_bl_block_width(POST_ARGS) |
|
Line 1426 post_bl_block_width(POST_ARGS) |
|
* the macro's width as set in share/tmac/mdoc/doc-common. |
* the macro's width as set in share/tmac/mdoc/doc-common. |
*/ |
*/ |
|
|
if (0 == strcmp(n->data.Bl->width, "Ds")) |
if (0 == strcmp(n->norm->Bl.width, "Ds")) |
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) { |
else if (0 == (width = macro2len(tok))) { |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
return(1); |
return(1); |
} |
} |
Line 1411 post_bl_block_width(POST_ARGS) |
|
Line 1445 post_bl_block_width(POST_ARGS) |
|
|
|
assert(i < (int)n->args->argc); |
assert(i < (int)n->args->argc); |
|
|
snprintf(buf, NUMSIZ, "%zun", width); |
snprintf(buf, NUMSIZ, "%un", (unsigned int)width); |
free(n->args->argv[i].value[0]); |
free(n->args->argv[i].value[0]); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl->width = n->args->argv[i].value[0]; |
n->norm->Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1453 post_bl_block_tag(POST_ARGS) |
|
Line 1487 post_bl_block_tag(POST_ARGS) |
|
break; |
break; |
} |
} |
|
|
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
if (0 != (ssz = macro2len(nn->tok))) |
sz = ssz; |
sz = ssz; |
|
|
break; |
break; |
Line 1461 post_bl_block_tag(POST_ARGS) |
|
Line 1495 post_bl_block_tag(POST_ARGS) |
|
|
|
/* Defaults to ten ens. */ |
/* Defaults to ten ens. */ |
|
|
snprintf(buf, NUMSIZ, "%zun", sz); |
snprintf(buf, NUMSIZ, "%un", (unsigned int)sz); |
|
|
/* |
/* |
* We have to dynamically add this to the macro's argument list. |
* We have to dynamically add this to the macro's argument list. |
Line 1482 post_bl_block_tag(POST_ARGS) |
|
Line 1516 post_bl_block_tag(POST_ARGS) |
|
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
/* Set our width! */ |
/* Set our width! */ |
n->data.Bl->width = n->args->argv[i].value[0]; |
n->norm->Bl.width = n->args->argv[i].value[0]; |
return(1); |
return(1); |
} |
} |
|
|
Line 1493 post_bl_head(POST_ARGS) |
|
Line 1527 post_bl_head(POST_ARGS) |
|
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->data.Bl->type) |
if (LIST_column != mdoc->last->norm->Bl.type) |
/* FIXME: this should be ERROR class... */ |
/* FIXME: this should be ERROR class... */ |
return(hwarn_eq0(mdoc)); |
return(hwarn_eq0(mdoc)); |
|
|
Line 1510 post_bl_head(POST_ARGS) |
|
Line 1544 post_bl_head(POST_ARGS) |
|
* lists, but I'll leave that for another day. |
* lists, but I'll leave that for another day. |
*/ |
*/ |
|
|
if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) { |
if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
return(0); |
return(0); |
} else if (NULL == mdoc->last->child) |
} else if (NULL == mdoc->last->child) |
Line 1527 post_bl_head(POST_ARGS) |
|
Line 1561 post_bl_head(POST_ARGS) |
|
assert(0 == np->args->argv[j].sz); |
assert(0 == np->args->argv[j].sz); |
|
|
/* |
/* |
* Accomodate for new-style groff column syntax. Shuffle the |
* Accommodate for new-style groff column syntax. Shuffle the |
* child nodes, all of which must be TEXT, as arguments for the |
* child nodes, all of which must be TEXT, as arguments for the |
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
Line 1536 post_bl_head(POST_ARGS) |
|
Line 1570 post_bl_head(POST_ARGS) |
|
np->args->argv[j].value = mandoc_malloc |
np->args->argv[j].value = mandoc_malloc |
((size_t)mdoc->last->nchild * sizeof(char *)); |
((size_t)mdoc->last->nchild * sizeof(char *)); |
|
|
mdoc->last->data.Bl->ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
|
|
for (i = 0, nn = mdoc->last->child; nn; i++) { |
for (i = 0, nn = mdoc->last->child; nn; i++) { |
np->args->argv[j].value[i] = nn->string; |
np->args->argv[j].value[i] = nn->string; |
Line 1567 post_bl(POST_ARGS) |
|
Line 1601 post_bl(POST_ARGS) |
|
|
|
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
switch (n->tok) { |
switch (n->tok) { |
case (MDOC_It): |
case (MDOC_Lp): |
continue; |
|
case (MDOC_Sm): |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Pp): |
case (MDOC_Pp): |
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
|
/* FALLTHROUGH */ |
|
case (MDOC_It): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sm): |
continue; |
continue; |
default: |
default: |
break; |
break; |
|
|
ebool(struct mdoc *mdoc) |
ebool(struct mdoc *mdoc) |
{ |
{ |
|
|
if (NULL == mdoc->last->child) |
if (NULL == mdoc->last->child) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
|
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
return(1); |
|
} |
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1); |
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
Line 1639 post_root(POST_ARGS) |
|
Line 1679 post_root(POST_ARGS) |
|
static int |
static int |
post_st(POST_ARGS) |
post_st(POST_ARGS) |
{ |
{ |
const char *p; |
struct mdoc_node *ch; |
|
const char *p; |
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
if (NULL == (ch = mdoc->last->child)) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
|
mdoc_node_delete(mdoc, mdoc->last); |
|
return(1); |
|
} |
|
|
p = mdoc_a2st(mdoc->last->child->string); |
assert(MDOC_TEXT == ch->type); |
|
|
if (p == NULL) { |
if (NULL == (p = mdoc_a2st(ch->string))) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
} else { |
} else { |
free(mdoc->last->child->string); |
free(ch->string); |
mdoc->last->child->string = mandoc_strdup(p); |
ch->string = mandoc_strdup(p); |
} |
} |
|
|
return(1); |
return(1); |
Line 1662 post_rs(POST_ARGS) |
|
Line 1707 post_rs(POST_ARGS) |
|
struct mdoc_node *nn, *next, *prev; |
struct mdoc_node *nn, *next, *prev; |
int i, j; |
int i, j; |
|
|
if (MDOC_BODY != mdoc->last->type) |
switch (mdoc->last->type) { |
|
case (MDOC_HEAD): |
|
check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0); |
return(1); |
return(1); |
|
case (MDOC_BODY): |
|
if (mdoc->last->child) |
|
break; |
|
check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0); |
|
return(1); |
|
default: |
|
return(1); |
|
} |
|
|
/* |
/* |
* Make sure only certain types of nodes are allowed within the |
* Make sure only certain types of nodes are allowed within the |
Line 1678 post_rs(POST_ARGS) |
|
Line 1733 post_rs(POST_ARGS) |
|
break; |
break; |
|
|
if (i < RSORD_MAX) { |
if (i < RSORD_MAX) { |
|
if (MDOC__J == rsord[i] || MDOC__B == rsord[i]) |
|
mdoc->last->norm->Rs.quote_T++; |
next = nn->next; |
next = nn->next; |
continue; |
continue; |
} |
} |
Line 1688 post_rs(POST_ARGS) |
|
Line 1745 post_rs(POST_ARGS) |
|
} |
} |
|
|
/* |
/* |
|
* Nothing to sort if only invalid nodes were found |
|
* inside the `Rs' body. |
|
*/ |
|
|
|
if (NULL == mdoc->last->child) |
|
return(1); |
|
|
|
/* |
* The full `Rs' block needs special handling to order the |
* The full `Rs' block needs special handling to order the |
* sub-elements according to `rsord'. Pick through each element |
* sub-elements according to `rsord'. Pick through each element |
* and correctly order it. This is a insertion sort. |
* and correctly order it. This is a insertion sort. |
Line 1753 post_rs(POST_ARGS) |
|
Line 1818 post_rs(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_ns(POST_ARGS) |
|
{ |
|
|
|
if (MDOC_LINE & mdoc->last->flags) |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); |
|
return(1); |
|
} |
|
|
|
static int |
post_sh(POST_ARGS) |
post_sh(POST_ARGS) |
{ |
{ |
|
|
|
|
post_sh_head(POST_ARGS) |
post_sh_head(POST_ARGS) |
{ |
{ |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
struct mdoc_node *n; |
enum mdoc_sec sec; |
enum mdoc_sec sec; |
|
int c; |
|
|
/* |
/* |
* Process a new section. Sections are either "named" or |
* Process a new section. Sections are either "named" or |
Line 1812 post_sh_head(POST_ARGS) |
|
Line 1888 post_sh_head(POST_ARGS) |
|
* manual sections. |
* manual sections. |
*/ |
*/ |
|
|
if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ)) |
sec = SEC_CUSTOM; |
|
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) { |
|
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} else if (1 == c) |
|
sec = a2sec(buf); |
|
|
sec = mdoc_str2sec(buf); |
|
|
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
Line 1824 post_sh_head(POST_ARGS) |
|
Line 1903 post_sh_head(POST_ARGS) |
|
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
if (SEC_SYNOPSIS == sec) |
if (SEC_SYNOPSIS == sec) { |
|
roff_setreg(mdoc->roff, "nS", 1); |
mdoc->flags |= MDOC_SYNOPSIS; |
mdoc->flags |= MDOC_SYNOPSIS; |
else |
} else { |
|
roff_setreg(mdoc->roff, "nS", 0); |
mdoc->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
|
} |
|
|
/* Mark our last section. */ |
/* Mark our last section. */ |
|
|
mdoc->lastsec = sec; |
mdoc->lastsec = sec; |
|
|
|
/* |
|
* Set the section attribute for the current HEAD, for its |
|
* parent BLOCK, and for the HEAD children; the latter can |
|
* only be TEXT nodes, so no recursion is needed. |
|
* For other blocks and elements, including .Sh BODY, this is |
|
* done when allocating the node data structures, but for .Sh |
|
* BLOCK and HEAD, the section is still unknown at that time. |
|
*/ |
|
|
|
mdoc->last->parent->sec = sec; |
|
mdoc->last->sec = sec; |
|
for (n = mdoc->last->child; n; n = n->next) |
|
n->sec = sec; |
|
|
/* We don't care about custom sections after this. */ |
/* We don't care about custom sections after this. */ |
|
|
if (SEC_CUSTOM == sec) |
if (SEC_CUSTOM == sec) |
Line 1869 post_sh_head(POST_ARGS) |
|
Line 1965 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (*mdoc->meta.msec == '9') |
if (*mdoc->meta.msec == '9') |
break; |
break; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC); |
mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, buf); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 1915 pre_par(PRE_ARGS) |
|
Line 2012 pre_par(PRE_ARGS) |
|
* block: `Lp', `Pp', or non-compact `Bd' or `Bl'. |
* block: `Lp', `Pp', or non-compact `Bd' or `Bl'. |
*/ |
*/ |
|
|
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
if (MDOC_Pp != mdoc->last->tok && |
|
MDOC_Lp != mdoc->last->tok && |
|
MDOC_br != mdoc->last->tok) |
return(1); |
return(1); |
if (MDOC_Bl == n->tok && n->data.Bl->comp) |
if (MDOC_Bl == n->tok && n->norm->Bl.comp) |
return(1); |
return(1); |
if (MDOC_Bd == n->tok && n->data.Bd->comp) |
if (MDOC_Bd == n->tok && n->norm->Bd.comp) |
return(1); |
return(1); |
if (MDOC_It == n->tok && n->parent->data.Bl->comp) |
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
Line 1930 pre_par(PRE_ARGS) |
|
Line 2029 pre_par(PRE_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_par(POST_ARGS) |
|
{ |
|
|
|
if (MDOC_ELEM != mdoc->last->type && |
|
MDOC_BLOCK != mdoc->last->type) |
|
return(1); |
|
|
|
if (NULL == mdoc->last->prev) { |
|
if (MDOC_Sh != mdoc->last->parent->tok && |
|
MDOC_Ss != mdoc->last->parent->tok) |
|
return(1); |
|
} else { |
|
if (MDOC_Pp != mdoc->last->prev->tok && |
|
MDOC_Lp != mdoc->last->prev->tok && |
|
(MDOC_br != mdoc->last->tok || |
|
(MDOC_sp != mdoc->last->prev->tok && |
|
MDOC_br != mdoc->last->prev->tok))) |
|
return(1); |
|
} |
|
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, mdoc->last); |
|
return(1); |
|
} |
|
|
|
static int |
pre_literal(PRE_ARGS) |
pre_literal(PRE_ARGS) |
{ |
{ |
|
|
Line 1946 pre_literal(PRE_ARGS) |
|
Line 2071 pre_literal(PRE_ARGS) |
|
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
break; |
break; |
case (MDOC_Bd): |
case (MDOC_Bd): |
assert(n->data.Bd); |
if (DISP_literal == n->norm->Bd.type) |
if (DISP_literal == n->data.Bd->type) |
|
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
if (DISP_unfilled == n->data.Bd->type) |
if (DISP_unfilled == n->norm->Bd.type) |
mdoc->flags |= MDOC_LITERAL; |
mdoc->flags |= MDOC_LITERAL; |
break; |
break; |
default: |
default: |
Line 1965 post_dd(POST_ARGS) |
|
Line 2089 post_dd(POST_ARGS) |
|
{ |
{ |
char buf[DATESIZE]; |
char buf[DATESIZE]; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
int c; |
|
|
n = mdoc->last; |
if (mdoc->meta.date) |
|
free(mdoc->meta.date); |
|
|
if (NULL == n->child) { |
n = mdoc->last; |
mdoc->meta.date = time(NULL); |
if (NULL == n->child || '\0' == n->child->string[0]) { |
|
mdoc->meta.date = mandoc_normdate |
|
(mdoc->parse, NULL, n->line, n->pos); |
return(1); |
return(1); |
} |
} |
|
|
if ( ! concat(mdoc, buf, n->child, DATESIZE)) |
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, n->child, DATESIZE))) { |
|
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
|
mdoc->meta.date = mandoc_a2time |
|
(MTIME_MDOCDATE | MTIME_CANONICAL, buf); |
|
|
|
if (0 == mdoc->meta.date) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE); |
|
mdoc->meta.date = time(NULL); |
|
} |
} |
|
|
|
assert(c); |
|
mdoc->meta.date = mandoc_normdate |
|
(mdoc->parse, buf, n->line, n->pos); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 2009 post_dt(POST_ARGS) |
|
Line 2136 post_dt(POST_ARGS) |
|
|
|
if (NULL != (nn = n->child)) |
if (NULL != (nn = n->child)) |
for (p = nn->string; *p; p++) { |
for (p = nn->string; *p; p++) { |
if (toupper((u_char)*p) == *p) |
if (toupper((unsigned char)*p) == *p) |
continue; |
continue; |
|
|
/* |
/* |
Line 2055 post_dt(POST_ARGS) |
|
Line 2182 post_dt(POST_ARGS) |
|
* arch = NULL |
* arch = NULL |
*/ |
*/ |
|
|
cp = mdoc_a2msec(nn->string); |
cp = mandoc_a2msec(nn->string); |
if (cp) { |
if (cp) { |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
Line 2080 post_dt(POST_ARGS) |
|
Line 2207 post_dt(POST_ARGS) |
|
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.vol = mandoc_strdup(cp); |
} else { |
} else { |
/* FIXME: warn about bad arch. */ |
|
cp = mdoc_a2arch(nn->string); |
cp = mdoc_a2arch(nn->string); |
if (NULL == cp) { |
if (NULL == cp) { |
|
mdoc_nmsg(mdoc, nn, MANDOCERR_BADVOLARCH); |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |
Line 2112 post_prol(POST_ARGS) |
|
Line 2239 post_prol(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_bx(POST_ARGS) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
/* |
|
* Make `Bx's second argument always start with an uppercase |
|
* letter. Groff checks if it's an "accepted" term, but we just |
|
* uppercase blindly. |
|
*/ |
|
|
|
n = mdoc->last->child; |
|
if (n && NULL != (n = n->next)) |
|
*n->string = (char)toupper |
|
((unsigned char)*n->string); |
|
|
|
return(1); |
|
} |
|
|
|
static int |
post_os(POST_ARGS) |
post_os(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
int c; |
#ifndef OSNAME |
#ifndef OSNAME |
struct utsname utsname; |
struct utsname utsname; |
#endif |
#endif |
Line 2123 post_os(POST_ARGS) |
|
Line 2270 post_os(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
|
|
/* |
/* |
* Set the operating system by way of the `Os' macro. Note that |
* Set the operating system by way of the `Os' macro. |
* if an argument isn't provided and -DOSNAME="\"foo\"" is |
* The order of precedence is: |
* provided during compilation, this value will be used instead |
* 1. the argument of the `Os' macro, unless empty |
* of filling in "sysname release" from uname(). |
* 2. the -Ios=foo command line argument, if provided |
|
* 3. -DOSNAME="\"foo\"", if provided during compilation |
|
* 4. "sysname release" from uname(3) |
*/ |
*/ |
|
|
if (mdoc->meta.os) |
free(mdoc->meta.os); |
free(mdoc->meta.os); |
|
|
|
if ( ! concat(mdoc, buf, n->child, BUFSIZ)) |
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, n->child, BUFSIZ))) { |
|
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} |
|
|
/* XXX: yes, these can all be dynamically-adjusted buffers, but |
assert(c); |
* it's really not worth the extra hackery. |
|
*/ |
|
|
|
if ('\0' == buf[0]) { |
if ('\0' == buf[0]) { |
|
if (mdoc->defos) { |
|
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
|
return(1); |
|
} |
#ifdef OSNAME |
#ifdef OSNAME |
if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) { |
if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) { |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
return(0); |
return(0); |
} |
} |
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (uname(&utsname)) { |
if (-1 == uname(&utsname)) { |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
mdoc->meta.os = mandoc_strdup("UNKNOWN"); |
mdoc->meta.os = mandoc_strdup("UNKNOWN"); |
return(post_prol(mdoc)); |
return(post_prol(mdoc)); |
Line 2200 post_std(POST_ARGS) |
|
Line 2353 post_std(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* Concatenate a node, stopping at the first non-text. |
|
* Concatenation is separated by a single whitespace. |
|
* Returns -1 on fatal (string overrun) error, 0 if child nodes were |
|
* encountered, 1 otherwise. |
|
*/ |
static int |
static int |
concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz) |
concat(char *p, const struct mdoc_node *n, size_t sz) |
{ |
{ |
|
|
p[0] = '\0'; |
for ( ; NULL != n; n = n->next) { |
|
if (MDOC_TEXT != n->type) |
|
return(0); |
|
if ('\0' != p[0] && strlcat(p, " ", sz) >= sz) |
|
return(-1); |
|
if (strlcat(p, n->string, sz) >= sz) |
|
return(-1); |
|
concat(p, n->child, sz); |
|
} |
|
|
/* |
return(1); |
* Concatenate sibling nodes together. All siblings must be of |
} |
* type MDOC_TEXT or an assertion is raised. Concatenation is |
|
* separated by a single whitespace. Returns 0 on fatal (string |
|
* overrun) error. |
|
*/ |
|
|
|
for ( ; n; n = n->next) { |
static enum mdoc_sec |
assert(MDOC_TEXT == n->type); |
a2sec(const char *p) |
|
{ |
|
int i; |
|
|
if (strlcat(p, n->string, sz) >= sz) { |
for (i = 0; i < (int)SEC__MAX; i++) |
mdoc_nmsg(m, n, MANDOCERR_MEM); |
if (secnames[i] && 0 == strcmp(p, secnames[i])) |
return(0); |
return((enum mdoc_sec)i); |
} |
|
|
|
if (NULL == n->next) |
return(SEC_CUSTOM); |
continue; |
} |
|
|
if (strlcat(p, " ", sz) >= sz) { |
static size_t |
mdoc_nmsg(m, n, MANDOCERR_MEM); |
macro2len(enum mdoct macro) |
return(0); |
{ |
} |
|
} |
|
|
|
return(1); |
switch (macro) { |
|
case(MDOC_Ad): |
|
return(12); |
|
case(MDOC_Ao): |
|
return(12); |
|
case(MDOC_An): |
|
return(12); |
|
case(MDOC_Aq): |
|
return(12); |
|
case(MDOC_Ar): |
|
return(12); |
|
case(MDOC_Bo): |
|
return(12); |
|
case(MDOC_Bq): |
|
return(12); |
|
case(MDOC_Cd): |
|
return(12); |
|
case(MDOC_Cm): |
|
return(10); |
|
case(MDOC_Do): |
|
return(10); |
|
case(MDOC_Dq): |
|
return(12); |
|
case(MDOC_Dv): |
|
return(12); |
|
case(MDOC_Eo): |
|
return(12); |
|
case(MDOC_Em): |
|
return(10); |
|
case(MDOC_Er): |
|
return(17); |
|
case(MDOC_Ev): |
|
return(15); |
|
case(MDOC_Fa): |
|
return(12); |
|
case(MDOC_Fl): |
|
return(10); |
|
case(MDOC_Fo): |
|
return(16); |
|
case(MDOC_Fn): |
|
return(16); |
|
case(MDOC_Ic): |
|
return(10); |
|
case(MDOC_Li): |
|
return(16); |
|
case(MDOC_Ms): |
|
return(6); |
|
case(MDOC_Nm): |
|
return(10); |
|
case(MDOC_No): |
|
return(12); |
|
case(MDOC_Oo): |
|
return(10); |
|
case(MDOC_Op): |
|
return(14); |
|
case(MDOC_Pa): |
|
return(32); |
|
case(MDOC_Pf): |
|
return(12); |
|
case(MDOC_Po): |
|
return(12); |
|
case(MDOC_Pq): |
|
return(12); |
|
case(MDOC_Ql): |
|
return(16); |
|
case(MDOC_Qo): |
|
return(12); |
|
case(MDOC_So): |
|
return(12); |
|
case(MDOC_Sq): |
|
return(12); |
|
case(MDOC_Sy): |
|
return(6); |
|
case(MDOC_Sx): |
|
return(16); |
|
case(MDOC_Tn): |
|
return(10); |
|
case(MDOC_Va): |
|
return(12); |
|
case(MDOC_Vt): |
|
return(12); |
|
case(MDOC_Xr): |
|
return(10); |
|
default: |
|
break; |
|
}; |
|
return(0); |
} |
} |
|
|