version 1.115, 2017/01/10 13:47:00 |
version 1.116, 2017/04/24 23:06:18 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
static void in_line_eoln(MACRO_PROT_ARGS); |
static void in_line_eoln(MACRO_PROT_ARGS); |
static int man_args(struct roff_man *, int, |
static int man_args(struct roff_man *, int, |
int *, char *, char **); |
int *, char *, char **); |
static void rew_scope(struct roff_man *, int); |
static void rew_scope(struct roff_man *, enum roff_tok); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX - MAN_TH] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
|
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
Line 62 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 61 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, 0 }, /* RI */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
Line 80 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 80 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ in_line_eoln, 0 }, /* ll */ |
{ in_line_eoln, 0 }, /* ll */ |
}; |
}; |
|
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
|
|
const struct man_macro * const man_macros = __man_macros; |
|
|
|
|
|
void |
void |
man_unscope(struct roff_man *man, const struct roff_node *to) |
man_unscope(struct roff_man *man, const struct roff_node *to) |
{ |
{ |
Line 100 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 99 man_unscope(struct roff_man *man, const struct roff_no |
|
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macros[n->tok].flags & MAN_SCOPED) { |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
"EOF breaks %s", |
"EOF breaks %s", roff_name[n->tok]); |
man_macronames[n->tok]); |
|
if (man->flags & MAN_ELINE) |
if (man->flags & MAN_ELINE) |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
else { |
else { |
Line 118 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 116 man_unscope(struct roff_man *man, const struct roff_no |
|
man_macros[n->tok].fp == blk_exp) |
man_macros[n->tok].fp == blk_exp) |
mandoc_msg(MANDOCERR_BLK_NOEND, |
mandoc_msg(MANDOCERR_BLK_NOEND, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
man_macronames[n->tok]); |
roff_name[n->tok]); |
} |
} |
|
|
/* |
/* |
Line 150 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 148 man_unscope(struct roff_man *man, const struct roff_no |
|
* scopes. When a scope is closed, it must be validated and actioned. |
* scopes. When a scope is closed, it must be validated and actioned. |
*/ |
*/ |
static void |
static void |
rew_scope(struct roff_man *man, int tok) |
rew_scope(struct roff_man *man, enum roff_tok tok) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
Line 193 rew_scope(struct roff_man *man, int tok) |
|
Line 191 rew_scope(struct roff_man *man, int tok) |
|
void |
void |
blk_close(MACRO_PROT_ARGS) |
blk_close(MACRO_PROT_ARGS) |
{ |
{ |
int ntok; |
enum roff_tok ntok; |
const struct roff_node *nn; |
const struct roff_node *nn; |
char *p; |
char *p; |
int nrew, target; |
int nrew, target; |
Line 233 blk_close(MACRO_PROT_ARGS) |
|
Line 231 blk_close(MACRO_PROT_ARGS) |
|
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
line, ppos, man_macronames[tok]); |
line, ppos, roff_name[tok]); |
rew_scope(man, MAN_PP); |
rew_scope(man, MAN_PP); |
} else { |
} else { |
line = man->last->line; |
line = man->last->line; |
Line 266 blk_exp(MACRO_PROT_ARGS) |
|
Line 264 blk_exp(MACRO_PROT_ARGS) |
|
roff_word_alloc(man, line, la, p); |
roff_word_alloc(man, line, la, p); |
|
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
man->parse, line, *pos, "%s ... %s", |
*pos, "%s ... %s", roff_name[tok], buf + *pos); |
man_macronames[tok], buf + *pos); |
|
|
|
man_unscope(man, head); |
man_unscope(man, head); |
roff_body_alloc(man, line, ppos, tok); |
roff_body_alloc(man, line, ppos, tok); |
Line 335 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 332 in_line_eoln(MACRO_PROT_ARGS) |
|
tok == MAN_fi || tok == MAN_nf)) { |
tok == MAN_fi || tok == MAN_nf)) { |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
man->parse, line, *pos, "%s %s", |
man->parse, line, *pos, "%s %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
if (buf[*pos] != '\0' && man->last != n && |
if (buf[*pos] != '\0' && man->last != n && |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
man->parse, line, *pos, "%s ... %s", |
man->parse, line, *pos, "%s ... %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
la = *pos; |
la = *pos; |