version 1.54, 2010/12/08 10:58:22 |
version 1.73, 2012/06/03 09:52:07 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 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 |
|
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "man.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "libmandoc.h" |
#include "libman.h" |
#include "libman.h" |
|
|
enum rew { |
enum rew { |
Line 36 static int blk_close(MACRO_PROT_ARGS); |
|
Line 39 static int blk_close(MACRO_PROT_ARGS); |
|
static int blk_exp(MACRO_PROT_ARGS); |
static int blk_exp(MACRO_PROT_ARGS); |
static int blk_imp(MACRO_PROT_ARGS); |
static int blk_imp(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
|
static int man_args(struct man *, int, |
|
int *, char *, char **); |
|
|
static int rew_scope(enum man_type, |
static int rew_scope(enum man_type, |
struct man *, enum mant); |
struct man *, enum mant); |
Line 43 static enum rew rew_dohalt(enum mant, enum man_type, |
|
Line 48 static enum rew rew_dohalt(enum mant, enum man_type, |
|
const struct man_node *); |
const struct man_node *); |
static enum rew rew_block(enum mant, enum man_type, |
static enum rew rew_block(enum mant, enum man_type, |
const struct man_node *); |
const struct man_node *); |
static int rew_warn(struct man *, |
static void rew_warn(struct man *, |
struct man_node *, enum mandocerr); |
struct man_node *, enum mandocerr); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
{ in_line_eoln, 0 }, /* TH */ |
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ blk_imp, MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_SCOPED | MAN_FSCOPED }, /* TP */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED | MAN_FSCOPED }, /* TP */ |
{ blk_imp, 0 }, /* LP */ |
{ blk_imp, MAN_BSCOPE }, /* LP */ |
{ blk_imp, 0 }, /* PP */ |
{ blk_imp, MAN_BSCOPE }, /* PP */ |
{ blk_imp, 0 }, /* P */ |
{ blk_imp, MAN_BSCOPE }, /* P */ |
{ blk_imp, 0 }, /* IP */ |
{ blk_imp, MAN_BSCOPE }, /* IP */ |
{ blk_imp, 0 }, /* HP */ |
{ blk_imp, MAN_BSCOPE }, /* HP */ |
{ in_line_eoln, MAN_SCOPED }, /* SM */ |
{ in_line_eoln, MAN_SCOPED }, /* SM */ |
{ in_line_eoln, MAN_SCOPED }, /* SB */ |
{ in_line_eoln, MAN_SCOPED }, /* SB */ |
{ in_line_eoln, 0 }, /* BI */ |
{ in_line_eoln, 0 }, /* BI */ |
Line 70 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 75 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, MAN_NSCOPED }, /* na */ |
{ in_line_eoln, MAN_NSCOPED }, /* na */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, 0 }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, 0 }, /* fi */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ blk_close, 0 }, /* RE */ |
{ blk_close, 0 }, /* RE */ |
{ blk_exp, MAN_EXPLICIT }, /* RS */ |
{ blk_exp, MAN_EXPLICIT }, /* RS */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* DT */ |
Line 80 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 85 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* ft */ |
{ in_line_eoln, 0 }, /* ft */ |
|
{ in_line_eoln, 0 }, /* OP */ |
|
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
|
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
Line 88 const struct man_macro * const man_macros = __man_macr |
|
Line 96 const struct man_macro * const man_macros = __man_macr |
|
/* |
/* |
* Warn when "n" is an explicit non-roff macro. |
* Warn when "n" is an explicit non-roff macro. |
*/ |
*/ |
static int |
static void |
rew_warn(struct man *m, struct man_node *n, enum mandocerr er) |
rew_warn(struct man *m, struct man_node *n, enum mandocerr er) |
{ |
{ |
|
|
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) |
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) |
return(1); |
return; |
if (MAN_VALID & n->flags) |
if (MAN_VALID & n->flags) |
return(1); |
return; |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
return(1); |
return; |
return(man_nmsg(m, n, er)); |
|
|
assert(er < MANDOCERR_FATAL); |
|
man_nmsg(m, n, er); |
} |
} |
|
|
|
|
Line 107 rew_warn(struct man *m, struct man_node *n, enum mando |
|
Line 117 rew_warn(struct man *m, struct man_node *n, enum mando |
|
* will be used if an explicit block scope is being closed out. |
* will be used if an explicit block scope is being closed out. |
*/ |
*/ |
int |
int |
man_unscope(struct man *m, const struct man_node *n, |
man_unscope(struct man *m, const struct man_node *to, |
enum mandocerr er) |
enum mandocerr er) |
{ |
{ |
|
struct man_node *n; |
|
|
assert(n); |
assert(to); |
|
|
|
m->next = MAN_NEXT_SIBLING; |
|
|
/* LINTED */ |
/* LINTED */ |
while (m->last != n) { |
while (m->last != to) { |
if ( ! rew_warn(m, m->last, er)) |
/* |
return(0); |
* Save the parent here, because we may delete the |
|
* m->last node in the post-validation phase and reset |
|
* it to m->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
n = m->last->parent; |
|
rew_warn(m, m->last, er); |
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
m->last = m->last->parent; |
m->last = n; |
assert(m->last); |
assert(m->last); |
} |
} |
|
|
if ( ! rew_warn(m, m->last, er)) |
rew_warn(m, m->last, er); |
return(0); |
|
if ( ! man_valid_post(m)) |
if ( ! man_valid_post(m)) |
return(0); |
return(0); |
|
|
m->next = MAN_ROOT == m->last->type ? |
|
MAN_NEXT_CHILD : MAN_NEXT_SIBLING; |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 171 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 186 rew_dohalt(enum mant tok, enum man_type type, const st |
|
return(REW_NOHALT); |
return(REW_NOHALT); |
|
|
/* First: rewind to ourselves. */ |
/* First: rewind to ourselves. */ |
if (type == n->type && tok == n->tok) |
if (type == n->type && tok == n->tok) { |
return(REW_REWIND); |
if (MAN_EXPLICIT & man_macros[n->tok].flags) |
|
return(REW_HALT); |
|
else |
|
return(REW_REWIND); |
|
} |
|
|
/* |
/* |
* Next follow the implicit scope-smashings as defined by man.7: |
* Next follow the implicit scope-smashings as defined by man.7: |
Line 188 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 207 rew_dohalt(enum mant tok, enum man_type type, const st |
|
return(c); |
return(c); |
break; |
break; |
case (MAN_RS): |
case (MAN_RS): |
|
/* Preserve empty paragraphs before RS. */ |
|
if (0 == n->nchild && (MAN_P == n->tok || |
|
MAN_PP == n->tok || MAN_LP == n->tok)) |
|
return(REW_HALT); |
/* Rewind to a subsection, if a block. */ |
/* Rewind to a subsection, if a block. */ |
if (REW_NOHALT != (c = rew_block(MAN_SS, type, n))) |
if (REW_NOHALT != (c = rew_block(MAN_SS, type, n))) |
return(c); |
return(c); |
Line 267 blk_close(MACRO_PROT_ARGS) |
|
Line 290 blk_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
for (nn = m->last->parent; nn; nn = nn->parent) |
for (nn = m->last->parent; nn; nn = nn->parent) |
if (ntok == nn->tok) |
if (ntok == nn->tok && MAN_BLOCK == nn->type) |
break; |
break; |
|
|
if (NULL == nn) |
if (NULL != nn) |
if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE)) |
man_unscope(m, nn, MANDOCERR_MAX); |
return(0); |
else |
|
man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
|
|
if ( ! rew_scope(MAN_BODY, m, ntok)) |
|
return(0); |
|
if ( ! rew_scope(MAN_BLOCK, m, ntok)) |
|
return(0); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 287 blk_close(MACRO_PROT_ARGS) |
|
Line 306 blk_close(MACRO_PROT_ARGS) |
|
int |
int |
blk_exp(MACRO_PROT_ARGS) |
blk_exp(MACRO_PROT_ARGS) |
{ |
{ |
int w, la; |
struct man_node *n; |
|
int la; |
char *p; |
char *p; |
|
|
/* |
/* Close out prior implicit scopes. */ |
* Close out prior scopes. "Regular" explicit macros cannot be |
|
* nested, but we allow roff macros to be placed just about |
|
* anywhere. |
|
*/ |
|
|
|
if ( ! rew_scope(MAN_BODY, m, tok)) |
|
return(0); |
|
if ( ! rew_scope(MAN_BLOCK, m, tok)) |
if ( ! rew_scope(MAN_BLOCK, m, tok)) |
return(0); |
return(0); |
|
|
Line 308 blk_exp(MACRO_PROT_ARGS) |
|
Line 322 blk_exp(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = man_args(m, line, pos, buf, &p); |
if ( ! man_args(m, line, pos, buf, &p)) |
|
|
if (-1 == w) |
|
return(0); |
|
if (0 == w) |
|
break; |
break; |
|
|
if ( ! man_word_alloc(m, line, la, p)) |
if ( ! man_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
} |
} |
Line 322 blk_exp(MACRO_PROT_ARGS) |
|
Line 331 blk_exp(MACRO_PROT_ARGS) |
|
assert(m); |
assert(m); |
assert(tok != MAN_MAX); |
assert(tok != MAN_MAX); |
|
|
if ( ! rew_scope(MAN_HEAD, m, tok)) |
for (n = m->last; n; n = n->parent) { |
return(0); |
if (n->tok != tok) |
|
continue; |
|
assert(MAN_HEAD == n->type); |
|
man_unscope(m, n, MANDOCERR_MAX); |
|
break; |
|
} |
|
|
return(man_body_alloc(m, line, ppos, tok)); |
return(man_body_alloc(m, line, ppos, tok)); |
} |
} |
|
|
Line 339 blk_exp(MACRO_PROT_ARGS) |
|
Line 354 blk_exp(MACRO_PROT_ARGS) |
|
int |
int |
blk_imp(MACRO_PROT_ARGS) |
blk_imp(MACRO_PROT_ARGS) |
{ |
{ |
int w, la; |
int la; |
char *p; |
char *p; |
struct man_node *n; |
struct man_node *n; |
|
|
Line 363 blk_imp(MACRO_PROT_ARGS) |
|
Line 378 blk_imp(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = man_args(m, line, pos, buf, &p); |
if ( ! man_args(m, line, pos, buf, &p)) |
|
|
if (-1 == w) |
|
return(0); |
|
if (0 == w) |
|
break; |
break; |
|
|
if ( ! man_word_alloc(m, line, la, p)) |
if ( ! man_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
} |
} |
Line 397 blk_imp(MACRO_PROT_ARGS) |
|
Line 407 blk_imp(MACRO_PROT_ARGS) |
|
int |
int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int w, la; |
int la; |
char *p; |
char *p; |
struct man_node *n; |
struct man_node *n; |
|
|
Line 408 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 418 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = man_args(m, line, pos, buf, &p); |
if ( ! man_args(m, line, pos, buf, &p)) |
|
|
if (-1 == w) |
|
return(0); |
|
if (0 == w) |
|
break; |
break; |
if ( ! man_word_alloc(m, line, la, p)) |
if ( ! man_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 436 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 442 in_line_eoln(MACRO_PROT_ARGS) |
|
assert( ! (MAN_SCOPED & man_macros[tok].flags)); |
assert( ! (MAN_SCOPED & man_macros[tok].flags)); |
m->flags |= MAN_ILINE; |
m->flags |= MAN_ILINE; |
} |
} |
|
|
|
assert(MAN_ROOT != m->last->type); |
|
m->next = MAN_NEXT_SIBLING; |
|
|
/* |
/* |
* Rewind our element scope. Note that when TH is pruned, we'll |
* Rewind our element scope. Note that when TH is pruned, we'll |
Line 461 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 470 in_line_eoln(MACRO_PROT_ARGS) |
|
if (m->last->type != MAN_ROOT && ! man_valid_post(m)) |
if (m->last->type != MAN_ROOT && ! man_valid_post(m)) |
return(0); |
return(0); |
|
|
m->next = MAN_ROOT == m->last->type ? |
|
MAN_NEXT_CHILD : MAN_NEXT_SIBLING; |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 475 man_macroend(struct man *m) |
|
Line 481 man_macroend(struct man *m) |
|
return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT)); |
return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT)); |
} |
} |
|
|
|
static int |
|
man_args(struct man *m, int line, int *pos, char *buf, char **v) |
|
{ |
|
char *start; |
|
|
|
assert(*pos); |
|
*v = start = buf + *pos; |
|
assert(' ' != *start); |
|
|
|
if ('\0' == *start) |
|
return(0); |
|
|
|
*v = mandoc_getarg(m->parse, v, line, pos); |
|
return(1); |
|
} |