version 1.181, 2011/12/03 16:58:54 |
version 1.188, 2012/07/16 09:51:54 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011, 2012 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 |
Line 107 static int post_lb(POST_ARGS); |
|
Line 107 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_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 152 static v_post posts_nm[] = { post_nm, NULL }; |
|
Line 153 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_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_pp[] = { post_par, ewarn_eq0, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL }; |
static v_post posts_sp[] = { ewarn_le1, NULL }; |
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, NULL }; |
static v_post posts_st[] = { post_st, 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 }; |
Line 185 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 187 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ 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 286 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 288 static 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, NULL }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
Line 297 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 299 static 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 314 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__D, |
MDOC__O, |
MDOC__O, |
MDOC__C, |
MDOC__C |
MDOC__U |
|
}; |
}; |
|
|
static const char * const secnames[SEC__MAX] = { |
static const char * const secnames[SEC__MAX] = { |
Line 661 pre_bl(PRE_ARGS) |
|
Line 663 pre_bl(PRE_ARGS) |
|
comp = 1; |
comp = 1; |
break; |
break; |
case (MDOC_Width): |
case (MDOC_Width): |
dup = (NULL != n->norm->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! */ |
Line 728 pre_bl(PRE_ARGS) |
|
Line 735 pre_bl(PRE_ARGS) |
|
/* |
/* |
* 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->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case (LIST_tag): |
case (LIST_tag): |
if (n->norm->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 749 pre_bl(PRE_ARGS) |
|
Line 756 pre_bl(PRE_ARGS) |
|
if (n->norm->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 1106 post_nm(POST_ARGS) |
|
Line 1125 post_nm(POST_ARGS) |
|
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
int c; |
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. */ |
|
|
buf[0] = '\0'; |
if (NULL != mdoc->last->child) { |
if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) { |
buf[0] = '\0'; |
|
c = concat(buf, mdoc->last->child, BUFSIZ); |
|
} else |
|
c = 0; |
|
|
|
switch (c) { |
|
case (-1): |
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
return(0); |
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; |
} |
} |
|
|
assert(c); |
|
mdoc->meta.name = mandoc_strdup(buf); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1957 pre_par(PRE_ARGS) |
|
Line 1981 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->norm->Bl.comp) |
if (MDOC_Bl == n->tok && n->norm->Bl.comp) |
return(1); |
return(1); |
Line 1972 pre_par(PRE_ARGS) |
|
Line 1998 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 2187 post_os(POST_ARGS) |
|
Line 2239 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); |
|
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
if (-1 == (c = concat(buf, n->child, BUFSIZ))) { |
if (-1 == (c = concat(buf, n->child, BUFSIZ))) { |
Line 2204 post_os(POST_ARGS) |
|
Line 2257 post_os(POST_ARGS) |
|
|
|
assert(c); |
assert(c); |
|
|
/* XXX: yes, these can all be dynamically-adjusted buffers, but |
|
* 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); |