version 1.177, 2011/01/03 11:27:33 |
version 1.182, 2011/03/07 01:35:51 |
|
|
/* $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) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 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 |
Line 98 static int node_append(struct mdoc *, |
|
Line 98 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 *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_span_alloc(struct mdoc *, |
|
const struct tbl_span *); |
|
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_node(const struct mdoc *m) |
mdoc_node(const struct mdoc *m) |
{ |
{ |
Line 225 mdoc_endparse(struct mdoc *m) |
|
Line 222 mdoc_endparse(struct mdoc *m) |
|
} |
} |
|
|
int |
int |
|
mdoc_addeqn(struct mdoc *m, const struct eqn *ep) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
assert( ! (MDOC_HALT & m->flags)); |
|
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == m->lastnamed) { |
|
mdoc_pmsg(m, ep->line, ep->pos, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
n = node_alloc(m, ep->line, ep->pos, MDOC_MAX, MDOC_EQN); |
|
n->eqn = ep; |
|
|
|
if ( ! node_append(m, n)) |
|
return(0); |
|
|
|
m->next = MDOC_NEXT_SIBLING; |
|
return(1); |
|
} |
|
|
|
int |
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & m->flags)); |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) { |
if (SEC_NONE == m->lastnamed) { |
/* FIXME: grab from span. */ |
mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT); |
mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT); |
|
return(1); |
return(1); |
} |
} |
|
|
return(mdoc_span_alloc(m, sp)); |
n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL); |
|
n->span = sp; |
|
|
|
if ( ! node_append(m, n)) |
|
return(0); |
|
|
|
m->next = MDOC_NEXT_SIBLING; |
|
return(1); |
} |
} |
|
|
|
|
Line 314 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 342 mdoc_macro(MACRO_PROT_ARGS) |
|
m->meta.vol = mandoc_strdup("LOCAL"); |
m->meta.vol = mandoc_strdup("LOCAL"); |
if (NULL == m->meta.os) |
if (NULL == m->meta.os) |
m->meta.os = mandoc_strdup("LOCAL"); |
m->meta.os = mandoc_strdup("LOCAL"); |
if (0 == m->meta.date) |
if (NULL == m->meta.date) |
m->meta.date = time(NULL); |
m->meta.date = mandoc_normdate(NULL, |
|
m->msg, m->data, line, ppos); |
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
} |
} |
|
|
Line 545 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
Line 574 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
m->next = MDOC_NEXT_CHILD; |
m->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
static int |
|
mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
/* FIXME: grab from tbl_span. */ |
|
n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL); |
|
n->span = sp; |
|
|
|
if ( ! node_append(m, n)) |
|
return(0); |
|
|
|
m->next = MDOC_NEXT_SIBLING; |
|
return(1); |
|
} |
|
|
|
|
|
int |
int |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |