version 1.146, 2010/06/12 11:58:22 |
version 1.148, 2010/06/26 16:07:08 |
|
|
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "regs.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
Line 96 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
Line 97 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
enum mdoct, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static int node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
const struct regset *, |
|
int, char *, int); |
|
static int mdoc_pmacro(struct mdoc *, |
|
const struct regset *, |
|
int, char *, int); |
static int macrowarn(struct mdoc *, int, |
static int macrowarn(struct mdoc *, int, |
const char *, int); |
const char *, int); |
|
|
Line 229 mdoc_endparse(struct mdoc *m) |
|
Line 234 mdoc_endparse(struct mdoc *m) |
|
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
*/ |
*/ |
int |
int |
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_parseln(struct mdoc *m, const struct regset *regs, |
|
int ln, char *buf, int offs) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
if (MDOC_HALT & m->flags) |
Line 237 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
Line 243 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
|
|
m->flags |= MDOC_NEWLINE; |
m->flags |= MDOC_NEWLINE; |
return(('.' == buf[offs] || '\'' == buf[offs]) ? |
return(('.' == buf[offs] || '\'' == buf[offs]) ? |
mdoc_pmacro(m, ln, buf, offs) : |
mdoc_pmacro(m, regs, ln, buf, offs) : |
mdoc_ptext(m, ln, buf, offs)); |
mdoc_ptext(m, regs, ln, buf, offs)); |
} |
} |
|
|
|
|
Line 258 mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, |
|
Line 264 mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, |
|
|
|
|
|
int |
int |
mdoc_macro(struct mdoc *m, enum mdoct tok, |
mdoc_macro(MACRO_PROT_ARGS) |
int ln, int pp, int *pos, char *buf) |
|
{ |
{ |
assert(tok < MDOC_MAX); |
assert(tok < MDOC_MAX); |
|
|
Line 267 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
Line 272 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
MDOC_PBODY & m->flags) |
MDOC_PBODY & m->flags) |
return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY)); |
return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY)); |
|
|
/* If we're in the prologue, deny "body" macros. */ |
/* If we're in the prologue, deny "body" macros. */ |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
! (MDOC_PBODY & m->flags)) { |
! (MDOC_PBODY & m->flags)) { |
if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
return(0); |
return(0); |
if (NULL == m->meta.title) |
if (NULL == m->meta.title) |
m->meta.title = mandoc_strdup("UNKNOWN"); |
m->meta.title = mandoc_strdup("UNKNOWN"); |
Line 286 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
Line 291 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
} |
} |
|
|
return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf)); |
return((*mdoc_macros[tok].fp) |
|
(m, regs, tok, line, ppos, pos, buf)); |
} |
} |
|
|
|
|
Line 540 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
Line 546 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
* control character. |
* control character. |
*/ |
*/ |
static int |
static int |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
mdoc_ptext(struct mdoc *m, const struct regset *regs, |
|
int line, char *buf, int offs) |
{ |
{ |
char *c, *ws, *end; |
char *c, *ws, *end; |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 571 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 578 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
LIST_column == n->data.Bl.type) { |
LIST_column == n->data.Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, regs, MDOC_It, |
|
line, offs, &offs, buf)); |
} |
} |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
Line 580 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 588 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
LIST_column == n->parent->data.Bl.type) { |
LIST_column == n->parent->data.Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(m, regs, MDOC_It, |
|
line, offs, &offs, buf)); |
} |
} |
|
|
/* |
/* |
Line 690 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 699 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
* character. |
* character. |
*/ |
*/ |
int |
int |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
int ln, char *buf, int offs) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j, sv; |
int i, j, sv; |
Line 769 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 779 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 785 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 795 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl.type) { |
LIST_column == n->data.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 801 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 811 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl.type) { |
LIST_column == n->parent->data.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
|
|
return(1); |
return(1); |