version 1.199, 2012/07/16 09:51:54 |
version 1.203, 2012/11/17 00:26:33 |
|
|
/* $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) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 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 104 static int mdoc_ptext(struct mdoc *, int, char *, i |
|
Line 104 static int mdoc_ptext(struct mdoc *, int, char *, i |
|
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_node(const struct mdoc *m) |
mdoc_node(const struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
return(m->first); |
return(mdoc->first); |
} |
} |
|
|
|
|
const struct mdoc_meta * |
const struct mdoc_meta * |
mdoc_meta(const struct mdoc *m) |
mdoc_meta(const struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
return(&m->meta); |
return(&mdoc->meta); |
} |
} |
|
|
|
|
Line 218 mdoc_alloc(struct roff *roff, struct mparse *parse, ch |
|
Line 218 mdoc_alloc(struct roff *roff, struct mparse *parse, ch |
|
* through to macro_end() in macro.c. |
* through to macro_end() in macro.c. |
*/ |
*/ |
int |
int |
mdoc_endparse(struct mdoc *m) |
mdoc_endparse(struct mdoc *mdoc) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
if (mdoc_macroend(m)) |
if (mdoc_macroend(mdoc)) |
return(1); |
return(1); |
m->flags |= MDOC_HALT; |
mdoc->flags |= MDOC_HALT; |
return(0); |
return(0); |
} |
} |
|
|
int |
int |
mdoc_addeqn(struct mdoc *m, const struct eqn *ep) |
mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) { |
if (SEC_NONE == mdoc->lastnamed) { |
mdoc_pmsg(m, ep->ln, ep->pos, MANDOCERR_NOTEXT); |
mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT); |
return(1); |
return(1); |
} |
} |
|
|
n = node_alloc(m, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); |
n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); |
n->eqn = ep; |
n->eqn = ep; |
|
|
if ( ! node_append(m, n)) |
if ( ! node_append(mdoc, n)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
int |
int |
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) { |
if (SEC_NONE == mdoc->lastnamed) { |
mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT); |
mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT); |
return(1); |
return(1); |
} |
} |
|
|
n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n->span = sp; |
n->span = sp; |
|
|
if ( ! node_append(m, n)) |
if ( ! node_append(mdoc, n)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
Line 282 mdoc_addspan(struct mdoc *m, const struct tbl_span *sp |
|
Line 282 mdoc_addspan(struct mdoc *m, const struct tbl_span *sp |
|
* 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 *mdoc, int ln, char *buf, int offs) |
{ |
{ |
|
|
assert( ! (MDOC_HALT & m->flags)); |
assert( ! (MDOC_HALT & mdoc->flags)); |
|
|
m->flags |= MDOC_NEWLINE; |
mdoc->flags |= MDOC_NEWLINE; |
|
|
/* |
/* |
* Let the roff nS register switch SYNOPSIS mode early, |
* Let the roff nS register switch SYNOPSIS mode early, |
Line 295 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
Line 295 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
* whether this mode is on or off. |
* whether this mode is on or off. |
* Note that this mode is also switched by the Sh macro. |
* Note that this mode is also switched by the Sh macro. |
*/ |
*/ |
if (roff_regisset(m->roff, REG_nS)) { |
if (roff_regisset(mdoc->roff, REG_nS)) { |
if (roff_regget(m->roff, REG_nS)) |
if (roff_regget(mdoc->roff, REG_nS)) |
m->flags |= MDOC_SYNOPSIS; |
mdoc->flags |= MDOC_SYNOPSIS; |
else |
else |
m->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
} |
} |
|
|
return(roff_getcontrol(m->roff, buf, &offs) ? |
return(roff_getcontrol(mdoc->roff, buf, &offs) ? |
mdoc_pmacro(m, ln, buf, offs) : |
mdoc_pmacro(mdoc, ln, buf, offs) : |
mdoc_ptext(m, ln, buf, offs)); |
mdoc_ptext(mdoc, ln, buf, offs)); |
} |
} |
|
|
int |
int |
Line 315 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 315 mdoc_macro(MACRO_PROT_ARGS) |
|
/* If we're in the body, deny prologue calls. */ |
/* If we're in the body, deny prologue calls. */ |
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
MDOC_PBODY & m->flags) { |
MDOC_PBODY & mdoc->flags) { |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY); |
return(1); |
return(1); |
} |
} |
|
|
/* 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 & mdoc->flags)) { |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG); |
if (NULL == m->meta.msec) |
if (NULL == mdoc->meta.msec) |
m->meta.msec = mandoc_strdup("1"); |
mdoc->meta.msec = mandoc_strdup("1"); |
if (NULL == m->meta.title) |
if (NULL == mdoc->meta.title) |
m->meta.title = mandoc_strdup("UNKNOWN"); |
mdoc->meta.title = mandoc_strdup("UNKNOWN"); |
if (NULL == m->meta.vol) |
if (NULL == mdoc->meta.vol) |
m->meta.vol = mandoc_strdup("LOCAL"); |
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
if (NULL == m->meta.os) |
if (NULL == mdoc->meta.os) |
m->meta.os = mandoc_strdup("LOCAL"); |
mdoc->meta.os = mandoc_strdup("LOCAL"); |
if (NULL == m->meta.date) |
if (NULL == mdoc->meta.date) |
m->meta.date = mandoc_normdate |
mdoc->meta.date = mandoc_normdate |
(m->parse, NULL, line, ppos); |
(mdoc->parse, NULL, line, ppos); |
m->flags |= MDOC_PBODY; |
mdoc->flags |= MDOC_PBODY; |
} |
} |
|
|
return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf)); |
return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); |
} |
} |
|
|
|
|
Line 375 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 375 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_BODY): |
case (MDOC_BODY): |
|
if (ENDBODY_NOT != p->end) |
|
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TAIL): |
case (MDOC_TAIL): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 425 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 427 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
|
|
static struct mdoc_node * |
static struct mdoc_node * |
node_alloc(struct mdoc *m, int line, int pos, |
node_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, enum mdoc_type type) |
enum mdoct tok, enum mdoc_type type) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = mandoc_calloc(1, sizeof(struct mdoc_node)); |
p = mandoc_calloc(1, sizeof(struct mdoc_node)); |
p->sec = m->lastsec; |
p->sec = mdoc->lastsec; |
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->tok = tok; |
p->tok = tok; |
Line 439 node_alloc(struct mdoc *m, int line, int pos, |
|
Line 441 node_alloc(struct mdoc *m, int line, int pos, |
|
|
|
/* Flag analysis. */ |
/* Flag analysis. */ |
|
|
if (MDOC_SYNOPSIS & m->flags) |
if (MDOC_SYNOPSIS & mdoc->flags) |
p->flags |= MDOC_SYNPRETTY; |
p->flags |= MDOC_SYNPRETTY; |
else |
else |
p->flags &= ~MDOC_SYNPRETTY; |
p->flags &= ~MDOC_SYNPRETTY; |
if (MDOC_NEWLINE & m->flags) |
if (MDOC_NEWLINE & mdoc->flags) |
p->flags |= MDOC_LINE; |
p->flags |= MDOC_LINE; |
m->flags &= ~MDOC_NEWLINE; |
mdoc->flags &= ~MDOC_NEWLINE; |
|
|
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(m, line, pos, tok, MDOC_TAIL); |
p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); |
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
assert(m->first); |
assert(mdoc->first); |
assert(m->last); |
assert(mdoc->last); |
|
|
p = node_alloc(m, line, pos, tok, MDOC_HEAD); |
p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); |
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) |
mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(m, line, pos, tok, MDOC_BODY); |
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
struct mdoc_node *body, enum mdoc_endbody end) |
struct mdoc_node *body, enum mdoc_endbody end) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(m, line, pos, tok, MDOC_BODY); |
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
p->pending = body; |
p->pending = body; |
|
p->norm = body->norm; |
p->end = end; |
p->end = end; |
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_block_alloc(struct mdoc *m, int line, int pos, |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(m, line, pos, tok, MDOC_BLOCK); |
p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK); |
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
Line 534 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
Line 537 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
break; |
break; |
} |
} |
|
|
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(m, line, pos, tok, MDOC_ELEM); |
p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM); |
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
Line 560 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
Line 563 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
break; |
break; |
} |
} |
|
|
if ( ! node_append(m, p)) |
if ( ! node_append(mdoc, p)) |
return(0); |
return(0); |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(1); |
return(1); |
} |
} |
|
|
int |
int |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT); |
n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); |
n->string = roff_strdup(m->roff, p); |
n->string = roff_strdup(mdoc->roff, p); |
|
|
if ( ! node_append(m, n)) |
if ( ! node_append(mdoc, n)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
Line 597 mdoc_node_free(struct mdoc_node *p) |
|
Line 600 mdoc_node_free(struct mdoc_node *p) |
|
|
|
|
|
static void |
static void |
mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
|
|
/* Adjust siblings. */ |
/* Adjust siblings. */ |
Line 619 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
Line 622 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) |
|
|
|
/* Adjust parse point, if applicable. */ |
/* Adjust parse point, if applicable. */ |
|
|
if (m && m->last == n) { |
if (mdoc && mdoc->last == n) { |
if (n->prev) { |
if (n->prev) { |
m->last = n->prev; |
mdoc->last = n->prev; |
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} else { |
} else { |
m->last = n->parent; |
mdoc->last = n->parent; |
m->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
} |
} |
|
|
if (m && m->first == n) |
if (mdoc && mdoc->first == n) |
m->first = NULL; |
mdoc->first = NULL; |
} |
} |
|
|
|
|
void |
void |
mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
|
|
while (p->child) { |
while (p->child) { |
assert(p->nchild); |
assert(p->nchild); |
mdoc_node_delete(m, p->child); |
mdoc_node_delete(mdoc, p->child); |
} |
} |
assert(0 == p->nchild); |
assert(0 == p->nchild); |
|
|
mdoc_node_unlink(m, p); |
mdoc_node_unlink(mdoc, p); |
mdoc_node_free(p); |
mdoc_node_free(p); |
} |
} |
|
|
|
int |
|
mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) |
|
{ |
|
|
|
mdoc_node_unlink(mdoc, p); |
|
return(node_append(mdoc, p)); |
|
} |
|
|
#if 0 |
#if 0 |
/* |
/* |
* Pre-treat a text line. |
* Pre-treat a text line. |
Line 659 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
Line 670 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
* the end-of-line, i.e., will re-enter in the next roff parse. |
* the end-of-line, i.e., will re-enter in the next roff parse. |
*/ |
*/ |
static int |
static int |
mdoc_preptext(struct mdoc *m, int line, char *buf, int offs) |
mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs) |
{ |
{ |
char *start, *end; |
char *start, *end; |
char delim; |
char delim; |
Line 667 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
Line 678 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
while ('\0' != buf[offs]) { |
while ('\0' != buf[offs]) { |
/* Mark starting position if eqn is set. */ |
/* Mark starting position if eqn is set. */ |
start = NULL; |
start = NULL; |
if ('\0' != (delim = roff_eqndelim(m->roff))) |
if ('\0' != (delim = roff_eqndelim(mdoc->roff))) |
if (NULL != (start = strchr(buf + offs, delim))) |
if (NULL != (start = strchr(buf + offs, delim))) |
*start++ = '\0'; |
*start++ = '\0'; |
|
|
/* Parse text as normal. */ |
/* Parse text as normal. */ |
if ( ! mdoc_ptext(m, line, buf, offs)) |
if ( ! mdoc_ptext(mdoc, line, buf, offs)) |
return(0); |
return(0); |
|
|
/* Continue only if an equation exists. */ |
/* Continue only if an equation exists. */ |
Line 689 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
Line 700 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
} |
} |
|
|
/* Parse the equation itself. */ |
/* Parse the equation itself. */ |
roff_openeqn(m->roff, NULL, line, offs, buf); |
roff_openeqn(mdoc->roff, NULL, line, offs, buf); |
|
|
/* Process a finished equation? */ |
/* Process a finished equation? */ |
if (roff_closeeqn(m->roff)) |
if (roff_closeeqn(mdoc->roff)) |
if ( ! mdoc_addeqn(m, roff_eqn(m->roff))) |
if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff))) |
return(0); |
return(0); |
offs += (end - (buf + offs)); |
offs += (end - (buf + offs)); |
} |
} |
Line 707 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
Line 718 mdoc_preptext(struct mdoc *m, int line, char *buf, int |
|
* control character. |
* control character. |
*/ |
*/ |
static int |
static int |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) |
{ |
{ |
char *c, *ws, *end; |
char *c, *ws, *end; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) { |
if (SEC_NONE == mdoc->lastnamed) { |
mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT); |
mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT); |
return(1); |
return(1); |
} |
} |
|
|
assert(m->last); |
assert(mdoc->last); |
n = m->last; |
n = mdoc->last; |
|
|
/* |
/* |
* Divert directly to list processing if we're encountering a |
* Divert directly to list processing if we're encountering a |
Line 732 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 743 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(mdoc, 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 741 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 752 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
} |
} |
|
|
/* |
/* |
Line 770 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 781 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
* Strip trailing tabs in literal context only; |
* Strip trailing tabs in literal context only; |
* outside, they affect the next line. |
* outside, they affect the next line. |
*/ |
*/ |
if (MDOC_LITERAL & m->flags) |
if (MDOC_LITERAL & mdoc->flags) |
continue; |
continue; |
break; |
break; |
case '\\': |
case '\\': |
Line 787 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 798 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
*end = '\0'; |
*end = '\0'; |
|
|
if (ws) |
if (ws) |
mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); |
mdoc_pmsg(mdoc, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); |
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { |
mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN); |
mdoc_pmsg(mdoc, line, (int)(c-buf), MANDOCERR_NOBLANKLN); |
|
|
/* |
/* |
* Insert a `sp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
* blank lines aren't allowed, but enough manuals assume this |
* blank lines aren't allowed, but enough manuals assume this |
* behaviour that we want to work around it. |
* behaviour that we want to work around it. |
*/ |
*/ |
if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) |
if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
return(mdoc_valid_post(m)); |
return(mdoc_valid_post(mdoc)); |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, offs, buf+offs)) |
if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) |
return(0); |
return(0); |
|
|
if (MDOC_LITERAL & m->flags) |
if (MDOC_LITERAL & mdoc->flags) |
return(1); |
return(1); |
|
|
/* |
/* |
Line 820 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 831 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
assert(buf < end); |
assert(buf < end); |
|
|
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0)) |
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0)) |
m->last->flags |= MDOC_EOS; |
mdoc->last->flags |= MDOC_EOS; |
|
|
return(1); |
return(1); |
} |
} |
Line 831 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 842 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
* character. |
* character. |
*/ |
*/ |
static int |
static int |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, sv; |
int i, sv; |
Line 841 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 852 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
/* Empty post-control lines are ignored. */ |
/* Empty post-control lines are ignored. */ |
|
|
if ('"' == buf[offs]) { |
if ('"' == buf[offs]) { |
mdoc_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT); |
mdoc_pmsg(mdoc, ln, offs, MANDOCERR_BADCOMMENT); |
return(1); |
return(1); |
} else if ('\0' == buf[offs]) |
} else if ('\0' == buf[offs]) |
return(1); |
return(1); |
Line 863 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 874 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
|
|
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mandoc_vmsg(MANDOCERR_MACRO, m->parse, |
mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, "%s", buf + sv - 1); |
ln, sv, "%s", buf + sv - 1); |
return(1); |
return(1); |
} |
} |
Line 884 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 895 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
mdoc_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE); |
mdoc_pmsg(mdoc, ln, offs - 1, MANDOCERR_EOLNSPACE); |
|
|
/* |
/* |
* If an initial macro or a list invocation, divert directly |
* If an initial macro or a list invocation, divert directly |
* into macro processing. |
* into macro processing. |
*/ |
*/ |
|
|
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
n = m->last; |
n = mdoc->last; |
assert(m->last); |
assert(mdoc->last); |
|
|
/* |
/* |
* If the first macro of a `Bl -column', open an `It' block |
* If the first macro of a `Bl -column', open an `It' block |
Line 907 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 918 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->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
m->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 923 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 934 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
m->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(mdoc, 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, &offs, buf)) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
goto err; |
goto err; |
|
|
return(1); |
return(1); |
|
|
err: /* Error out. */ |
err: /* Error out. */ |
|
|
m->flags |= MDOC_HALT; |
mdoc->flags |= MDOC_HALT; |
return(0); |
return(0); |
} |
} |
|
|
Line 982 mdoc_isdelim(const char *p) |
|
Line 993 mdoc_isdelim(const char *p) |
|
|
|
if (0 == strcmp(p + 1, ".")) |
if (0 == strcmp(p + 1, ".")) |
return(DELIM_CLOSE); |
return(DELIM_CLOSE); |
if (0 == strcmp(p + 1, "*(Ba")) |
if (0 == strcmp(p + 1, "fR|\\fP")) |
return(DELIM_MIDDLE); |
return(DELIM_MIDDLE); |
|
|
return(DELIM_NONE); |
return(DELIM_NONE); |