mandoc/mdoc.c - diff

Return to mdoc.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc.c between version 1.159 and 1.232

version 1.159, 2010/07/18 17:00:26

version 1.232, 2014/11/28 04:47:03

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 15

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <sys/types.h>

Line 29

Line 27

#include <string.h>

#include <time.h>

#include "mdoc.h"

#include "mandoc.h"

#include "mandoc_aux.h"

#include "libmdoc.h"

#include "libmandoc.h"

const char *const __mdoc_macronames[MDOC_MAX] = {

const char *const __mdoc_macronames[MDOC_MAX + 1] = {

"Ap", "Dd", "Dt", "Os",

"Sh", "Ss", "Pp", "D1",

"Dl", "Bd", "Ed", "Bl",

Line 44 const char *const __mdoc_macronames[MDOC_MAX] = {

"Ic", "In", "Li", "Nd",

"Nm", "Op", "Ot", "Pa",

"Rv", "St", "Va", "Vt",

/* LINTED */

"Xr", "%A", "%B", "%D",

/* LINTED */

"%I", "%J", "%N", "%O",

/* LINTED */

"%P", "%R", "%T", "%V",

"Ac", "Ao", "Aq", "At",

"Bc", "Bf", "Bo", "Bq",

Line 65 const char *const __mdoc_macronames[MDOC_MAX] = {

Line 62 const char *const __mdoc_macronames[MDOC_MAX] = {

"Bk", "Ek", "Bt", "Hf",

"Fr", "Ud", "Lb", "Lp",

"Lk", "Mt", "Brq", "Bro",

/* LINTED */

"Brc", "%C", "Es", "En",

/* LINTED */

"Dx", "%Q", "br", "sp",

/* LINTED */

"%U", "Ta", "ll", "text",

"%U", "Ta"

};

const char *const __mdoc_argnames[MDOC_ARG_MAX] = {

"split", "nosplit", "ragged",

"unfilled", "literal", "file",

"offset", "bullet", "dash",

"hyphen", "item", "enum",

"tag", "diag", "hang",

"ohang", "inset", "column",

"width", "compact", "std",

"filled", "words", "emphasis",

"symbolic", "nested", "centered"

};

Line 89 const char * const *mdoc_macronames = __mdoc_macroname

Line 83 const char * const *mdoc_macronames = __mdoc_macroname

const char * const *mdoc_argnames = __mdoc_argnames;

static void mdoc_node_free(struct mdoc_node *);

static void mdoc_node_unlink(struct mdoc *,

struct mdoc_node *);

static void mdoc_free1(struct mdoc *);

static void mdoc_alloc1(struct mdoc *);

static struct mdoc_node *node_alloc(struct mdoc *, int, int,

enum mdoct, enum mdoc_type);

static int node_append(struct mdoc *,

static void node_append(struct mdoc *, struct mdoc_node *);

struct mdoc_node *);

static int mdoc_ptext(struct mdoc *, int, char *, int);

static int mdoc_pmacro(struct mdoc *, int, char *, int);

static int macrowarn(struct mdoc *, int,

const char *, int);

const struct mdoc_node *

mdoc_node(const struct mdoc *m)

mdoc_node(const struct mdoc *mdoc)

{

return(MDOC_HALT & m->flags ? NULL : m->first);

return(mdoc->first);

}

const struct mdoc_meta *

mdoc_meta(const struct mdoc *m)

mdoc_meta(const struct mdoc *mdoc)

{

return(MDOC_HALT & m->flags ? NULL : &m->meta);

return(&mdoc->meta);

}

* Frees volatile resources (parse tree, meta-data, fields).

Line 128 mdoc_free1(struct mdoc *mdoc)

Line 117 mdoc_free1(struct mdoc *mdoc)

if (mdoc->first)

mdoc_node_delete(mdoc, mdoc->first);

if (mdoc->meta.title)

free(mdoc->meta.msec);

free(mdoc->meta.title);

free(mdoc->meta.vol);

if (mdoc->meta.os)

free(mdoc->meta.arch);

free(mdoc->meta.os);

free(mdoc->meta.date);

if (mdoc->meta.name)

free(mdoc->meta.title);

free(mdoc->meta.name);

free(mdoc->meta.os);

if (mdoc->meta.arch)

free(mdoc->meta.name);

free(mdoc->meta.arch);

if (mdoc->meta.vol)

free(mdoc->meta.vol);

if (mdoc->meta.msec)

free(mdoc->meta.msec);

}

* Allocate all volatile resources (parse tree, meta-data, fields).

Line 156 mdoc_alloc1(struct mdoc *mdoc)

Line 139 mdoc_alloc1(struct mdoc *mdoc)

mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));

mdoc->first = mdoc->last;

mdoc->last->type = MDOC_ROOT;

mdoc->last->tok = MDOC_MAX;

mdoc->next = MDOC_NEXT_CHILD;

}

* Free up volatile resources (see mdoc_free1()) then re-initialises the

* data with mdoc_alloc1(). After invocation, parse data has been reset

Line 174 mdoc_reset(struct mdoc *mdoc)

Line 157 mdoc_reset(struct mdoc *mdoc)

mdoc_alloc1(mdoc);

}

* Completely free up all volatile and non-volatile parse resources.

* After invocation, the pointer is no longer usable.

Line 187 mdoc_free(struct mdoc *mdoc)

Line 169 mdoc_free(struct mdoc *mdoc)

free(mdoc);

}

* Allocate volatile and non-volatile parse resources.

struct mdoc *

mdoc_alloc(struct regset *regs, void *data,

mdoc_alloc(struct roff *roff, struct mparse *parse,

int pflags, mandocmsg msg)

const char *defos, int quick)

{

struct mdoc *p;

p = mandoc_calloc(1, sizeof(struct mdoc));

p->msg = msg;

p->parse = parse;

p->data = data;

p->defos = defos;

p->pflags = pflags;

p->quick = quick;

p->regs = regs;

p->roff = roff;

mdoc_hash_init();

mdoc_alloc1(p);

return(p);

}

int

mdoc_endparse(struct mdoc *mdoc)

{

mdoc_macroend(mdoc);

* Climb back up the parse tree, validating open scopes. Mostly calls

return(1);

* through to macro_end() in macro.c.

}

int

mdoc_endparse(struct mdoc *m)

mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)

{

struct mdoc_node *n;

if (MDOC_HALT & m->flags)

n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);

return(0);

n->eqn = ep;

else if (mdoc_macroend(m))

if (ep->ln > mdoc->last->line)

return(1);

n->flags |= MDOC_LINE;

m->flags |= MDOC_HALT;

node_append(mdoc, n);

return(0);

mdoc->next = MDOC_NEXT_SIBLING;

return(1);

}

int

mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)

{

struct mdoc_node *n;

n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);

n->span = sp;

node_append(mdoc, n);

mdoc->next = MDOC_NEXT_SIBLING;

return(1);

}

* Main parse routine. Parses a single line -- really just hands off to

* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).

int

mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)

mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)

{

if (MDOC_HALT & m->flags)

if (mdoc->last->type != MDOC_EQN || ln > mdoc->last->line)

return(0);

mdoc->flags |= MDOC_NEWLINE;

m->flags |= MDOC_NEWLINE;

* Let the roff nS register switch SYNOPSIS mode early,

* such that the parser knows at all times

* whether this mode is on or off.

* Note that this mode is also switched by the Sh macro.

if (m->regs->regs[(int)REG_nS].set) {

if (roff_getreg(mdoc->roff, "nS"))

if (m->regs->regs[(int)REG_nS].v.u)

mdoc->flags |= MDOC_SYNOPSIS;

m->flags |= MDOC_SYNOPSIS;

else

mdoc->flags &= ~MDOC_SYNOPSIS;

m->flags &= ~MDOC_SYNOPSIS;

}

return(('.' == buf[offs] || '\'' == 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));

}

void

int

mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t,

int ln, int pos, const char *fmt, ...)

{

char buf[256];

va_list ap;

va_start(ap, fmt);

vsnprintf(buf, sizeof(buf) - 1, fmt, ap);

va_end(ap);

return((*mdoc->msg)(t, mdoc->data, ln, pos, buf));

}

int

mdoc_macro(MACRO_PROT_ARGS)

{

assert(tok < MDOC_MAX);

/* If we're in the body, deny prologue calls. */

if (mdoc->flags & MDOC_PBODY) {

if (tok == MDOC_Dt) {

if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&

mandoc_vmsg(MANDOCERR_DT_LATE,

MDOC_PBODY & m->flags)

mdoc->parse, line, ppos,

return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));

"Dt %s", buf + *pos);

return;

/* If we're in the prologue, deny "body" macros. */

}

} else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {

if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&

if (mdoc->meta.title == NULL) {

! (MDOC_PBODY & m->flags)) {

mandoc_vmsg(MANDOCERR_DT_NOTITLE,

if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))

mdoc->parse, line, ppos, "%s %s",

return(0);

mdoc_macronames[tok], buf + *pos);

if (NULL == m->meta.title)

mdoc->meta.title = mandoc_strdup("UNTITLED");

m->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)

mdoc->flags |= MDOC_PBODY;

m->meta.os = mandoc_strdup("LOCAL");

if (0 == m->meta.date)

m->meta.date = time(NULL);

m->flags |= MDOC_PBODY;

}

(*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);

return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf));

}

static int

static void

node_append(struct mdoc *mdoc, struct mdoc_node *p)

{

Line 315 node_append(struct mdoc *mdoc, struct mdoc_node *p)

Line 287 node_append(struct mdoc *mdoc, struct mdoc_node *p)

assert(MDOC_ROOT != p->type);

switch (mdoc->next) {

case (MDOC_NEXT_SIBLING):

case MDOC_NEXT_SIBLING:

mdoc->last->next = p;

p->prev = mdoc->last;

p->parent = mdoc->last->parent;

break;

case (MDOC_NEXT_CHILD):

case MDOC_NEXT_CHILD:

mdoc->last->child = p;

p->parent = mdoc->last;

break;

Line 331 node_append(struct mdoc *mdoc, struct mdoc_node *p)

Line 303 node_append(struct mdoc *mdoc, struct mdoc_node *p)

p->parent->nchild++;

if ( ! mdoc_valid_pre(mdoc, p))

return(0);

* Copy over the normalised-data pointer of our parent. Not

if ( ! mdoc_action_pre(mdoc, p))

* everybody has one, but copying a null pointer is fine.

return(0);

switch (p->type) {

case (MDOC_HEAD):

case MDOC_BODY:

if (ENDBODY_NOT != p->end)

break;

/* FALLTHROUGH */

case MDOC_TAIL:

/* FALLTHROUGH */

case MDOC_HEAD:

p->norm = p->parent->norm;

break;

default:

break;

}

mdoc_valid_pre(mdoc, p);

switch (p->type) {

case MDOC_HEAD:

assert(MDOC_BLOCK == p->parent->type);

p->parent->head = p;

break;

case (MDOC_TAIL):

case MDOC_TAIL:

assert(MDOC_BLOCK == p->parent->type);

p->parent->tail = p;

break;

case (MDOC_BODY):

case MDOC_BODY:

if (p->end)

break;

assert(MDOC_BLOCK == p->parent->type);

Line 358 node_append(struct mdoc *mdoc, struct mdoc_node *p)

Line 346 node_append(struct mdoc *mdoc, struct mdoc_node *p)

mdoc->last = p;

switch (p->type) {

case (MDOC_TEXT):

case MDOC_TBL:

if ( ! mdoc_valid_post(mdoc))

/* FALLTHROUGH */

return(0);

case MDOC_TEXT:

if ( ! mdoc_action_post(mdoc))

mdoc_valid_post(mdoc);

return(0);

break;

default:

break;

}

return(1);

}

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)

{

struct mdoc_node *p;

p = mandoc_calloc(1, sizeof(struct mdoc_node));

p->sec = m->lastsec;

p->sec = mdoc->lastsec;

p->line = line;

p->pos = pos;

p->lastline = line;

p->tok = tok;

p->type = type;

/* Flag analysis. */

if (MDOC_SYNOPSIS & m->flags)

if (MDOC_SYNOPSIS & mdoc->flags)

p->flags |= MDOC_SYNPRETTY;

else

p->flags &= ~MDOC_SYNPRETTY;

if (MDOC_NEWLINE & m->flags)

if (MDOC_NEWLINE & mdoc->flags)

p->flags |= MDOC_LINE;

m->flags &= ~MDOC_NEWLINE;

mdoc->flags &= ~MDOC_NEWLINE;

return(p);

}

void

int

mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)

{

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))

node_append(mdoc, p);

return(0);

mdoc->next = MDOC_NEXT_CHILD;

m->next = MDOC_NEXT_CHILD;

return(1);

}

struct mdoc_node *

int

mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)

{

struct mdoc_node *p;

assert(m->first);

assert(mdoc->first);

assert(m->last);

assert(mdoc->last);

p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD);

p = node_alloc(m, line, pos, tok, MDOC_HEAD);

node_append(mdoc, p);

if ( ! node_append(m, p))

mdoc->next = MDOC_NEXT_CHILD;

return(0);

return(p);

m->next = MDOC_NEXT_CHILD;

return(1);

}

struct mdoc_node *

int

mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)

{

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))

node_append(mdoc, p);

return(0);

mdoc->next = MDOC_NEXT_CHILD;

m->next = MDOC_NEXT_CHILD;

return(p);

return(1);

}

void

int

mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,

mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,

struct mdoc_node *body, enum mdoc_endbody end)

{

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->norm = body->norm;

p->end = end;

if ( ! node_append(m, p))

node_append(mdoc, p);

return(0);

mdoc->next = MDOC_NEXT_SIBLING;

m->next = MDOC_NEXT_SIBLING;

return(1);

}

struct mdoc_node *

int

mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,

mdoc_block_alloc(struct mdoc *m, int line, int pos,

enum mdoct tok, struct mdoc_arg *args)

{

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;

if (p->args)

(args->refcnt)++;

if ( ! node_append(m, p))

return(0);

switch (tok) {

m->next = MDOC_NEXT_CHILD;

case MDOC_Bd:

return(1);

/* FALLTHROUGH */

case MDOC_Bf:

/* FALLTHROUGH */

case MDOC_Bl:

/* FALLTHROUGH */

case MDOC_En:

/* FALLTHROUGH */

case MDOC_Rs:

p->norm = mandoc_calloc(1, sizeof(union mdoc_data));

break;

default:

break;

}

node_append(mdoc, p);

mdoc->next = MDOC_NEXT_CHILD;

return(p);

}

void

int

mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,

mdoc_elem_alloc(struct mdoc *m, int line, int pos,

enum mdoct tok, struct mdoc_arg *args)

{

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;

if (p->args)

(args->refcnt)++;

if ( ! node_append(m, p))

return(0);

switch (tok) {

m->next = MDOC_NEXT_CHILD;

case MDOC_An:

return(1);

p->norm = mandoc_calloc(1, sizeof(union mdoc_data));

break;

default:

break;

}

node_append(mdoc, p);

mdoc->next = MDOC_NEXT_CHILD;

}

void

int

mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p)

mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)

{

struct mdoc_node *n;

size_t sv, len;

len = strlen(p);

n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT);

n->string = roff_strdup(mdoc->roff, p);

node_append(mdoc, n);

mdoc->next = MDOC_NEXT_SIBLING;

}

n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);

void

n->string = mandoc_malloc(len + 1);

mdoc_word_append(struct mdoc *mdoc, const char *p)

sv = strlcpy(n->string, p, len + 1);

{

struct mdoc_node *n;

char *addstr, *newstr;

/* Prohibit truncation. */

n = mdoc->last;

assert(sv < len + 1);

addstr = roff_strdup(mdoc->roff, p);

mandoc_asprintf(&newstr, "%s %s", n->string, addstr);

if ( ! node_append(m, n))

free(addstr);

return(0);

free(n->string);

n->string = newstr;

m->next = MDOC_NEXT_SIBLING;

mdoc->next = MDOC_NEXT_SIBLING;

return(1);

}

static void

mdoc_node_free(struct mdoc_node *p)

{

if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)

* XXX: if these end up being problematic in terms of memory

free(p->norm);

* management and dereferencing freed blocks, then make them

* into reference-counted double-pointers.

if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)

if (p->data.Bd)

free(p->data.Bd);

if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)

if (p->data.Bl)

free(p->data.Bl);

if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)

if (p->data.Bf)

free(p->data.Bf);

if (p->string)

free(p->string);

if (p->args)

Line 541 mdoc_node_free(struct mdoc_node *p)

Line 523 mdoc_node_free(struct mdoc_node *p)

free(p);

}

static void

mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)

mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)

{

/* Adjust siblings. */

Line 559 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)

Line 540 mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)

n->parent->nchild--;

if (n->parent->child == n)

n->parent->child = n->prev ? n->prev : n->next;

if (n->parent->last == n)

n->parent->last = n->prev ? n->prev : NULL;

}

/* Adjust parse point, if applicable. */

if (m && m->last == n) {

if (mdoc && mdoc->last == n) {

if (n->prev) {

m->last = n->prev;

mdoc->last = n->prev;

m->next = MDOC_NEXT_SIBLING;

mdoc->next = MDOC_NEXT_SIBLING;

} 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

mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)

mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)

{

while (p->child) {

assert(p->nchild);

mdoc_node_delete(m, p->child);

mdoc_node_delete(mdoc, p->child);

}

assert(0 == p->nchild);

mdoc_node_unlink(m, p);

mdoc_node_unlink(mdoc, p);

mdoc_node_free(p);

}

void

mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p)

{

mdoc_node_unlink(mdoc, p);

node_append(mdoc, p);

}

* Parse free-form text, that is, a line that does not begin with the

* control character.

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;

struct mdoc_node *n;

/* Ignore bogus comments. */

assert(mdoc->last);

n = mdoc->last;

if ('\\' == buf[offs] &&

'.' == buf[offs + 1] &&

'"' == buf[offs + 2])

return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));

/* No text before an initial macro. */

if (SEC_NONE == m->lastnamed)

return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));

assert(m->last);

n = m->last;

* Divert directly to list processing if we're encountering a

* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry

Line 626 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

Line 603 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

LIST_column == n->data.Bl->type) {

LIST_column == n->norm->Bl.type) {

/* `Bl' is open without any children. */

m->flags |= MDOC_FREECOL;

mdoc->flags |= MDOC_FREECOL;

return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));

mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);

return(1);

}

if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

NULL != n->parent &&

MDOC_Bl == n->parent->tok &&

LIST_column == n->parent->data.Bl->type) {

LIST_column == n->parent->norm->Bl.type) {

/* `Bl' has block-level `It' children. */

m->flags |= MDOC_FREECOL;

mdoc->flags |= MDOC_FREECOL;

return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));

mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);

return(1);

}

Line 650 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

Line 629 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

ws = NULL;

for (c = end = buf + offs; *c; c++) {

switch (*c) {

case '-':

if (mandoc_hyph(buf + offs, c))

*c = ASCII_HYPH;

ws = NULL;

break;

case ' ':

if (NULL == ws)

ws = c;

Line 671 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

Line 645 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

* Strip trailing tabs in literal context only;

* outside, they affect the next line.

if (MDOC_LITERAL & m->flags)

if (MDOC_LITERAL & mdoc->flags)

continue;

break;

case '\\':

Line 688 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

Line 662 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

*end = '\0';

if (ws)

if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))

mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,

return(0);

line, (int)(ws-buf), NULL);

if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {

if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {

if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))

mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,

return(0);

line, (int)(c - buf), NULL);

* Insert a `Pp' 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

* behaviour that we want to work around it.

if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))

mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL);

return(0);

mdoc->next = MDOC_NEXT_SIBLING;

mdoc_valid_post(mdoc);

m->next = MDOC_NEXT_SIBLING;

return(1);

}

if ( ! mdoc_word_alloc(m, line, offs, buf+offs))

mdoc_word_alloc(mdoc, line, offs, buf+offs);

return(0);

if (MDOC_LITERAL & m->flags)

if (mdoc->flags & MDOC_LITERAL)

return(1);

Line 721 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

Line 693 mdoc_ptext(struct mdoc *m, int line, char *buf, int of

assert(buf < end);

if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))

if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))

m->last->flags |= MDOC_EOS;

mdoc->last->flags |= MDOC_EOS;

return(1);

}

static int

macrowarn(struct mdoc *m, int ln, const char *buf, int offs)

{

int rc;

rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs,

"unknown macro: %s%s",

buf, strlen(buf) > 3 ? "..." : "");

/* FIXME: logic should be in driver. */

/* FIXME: broken, will error out and not omit a message. */

return(MDOC_IGN_MACRO & m->pflags ? rc : 0);

}

* Parse a macro line, that is, a line beginning with the control

* character.

static int

mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)

mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)

{

struct mdoc_node *n;

const char *cp;

enum mdoct tok;

int i, j, sv;

int i, sv;

char mac[5];

struct mdoc_node *n;

/* Empty lines are ignored. */

sv = offs;

offs++;

* Copy the first word into a nil-terminated buffer.

* Stop when a space, tab, escape, or eoln is encountered.

if ('\0' == buf[offs])

i = 0;

return(1);

while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)

mac[i++] = buf[offs++];

i = offs;

mac[i] = '\0';

/* Accept whitespace after the initial control char. */

tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;

if (' ' == buf[i]) {

if (tok == MDOC_MAX) {

i++;

mandoc_msg(MANDOCERR_MACRO, mdoc->parse,

while (buf[i] && ' ' == buf[i])

ln, sv, buf + sv - 1);

i++;

return(1);

if ('\0' == buf[i])

return(1);

}

sv = i;

/* Skip a leading escape sequence or tab. */

/* Copy the first word into a nil-terminated buffer. */

switch (buf[offs]) {

case '\\':

for (j = 0; j < 4; j++, i++) {

cp = buf + offs + 1;

if ('\0' == (mac[j] = buf[i]))

mandoc_escape(&cp, NULL, NULL);

break;

offs = cp - buf;

else if (' ' == buf[i])

break;

case '\t':

offs++;

/* Check for invalid characters. */

break;

default:

if (isgraph((u_char)buf[i]))

break;

continue;

if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))

return(0);

i--;

}

mac[j] = '\0';

/* Jump to the next non-whitespace word. */

if (j == 4 || j < 2) {

while (buf[offs] && ' ' == buf[offs])

if ( ! macrowarn(m, ln, mac, sv))

offs++;

goto err;

return(1);

}

if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {

if ( ! macrowarn(m, ln, mac, sv))

goto err;

return(1);

}

/* The macro is sane. Jump to the next word. */

while (buf[i] && ' ' == buf[i])

i++;

* Trailing whitespace. Note that tabs are allowed to be passed

* into the parser as "text", so we only warn about spaces here.

if ('\0' == buf[i] && ' ' == buf[i - 1])

if ('\0' == buf[offs] && ' ' == buf[offs - 1])

if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))

mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,

goto err;

ln, offs - 1, NULL);

* If an initial macro or a list invocation, divert directly

* 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, &i, buf))

mdoc_macro(mdoc, tok, ln, sv, &offs, buf);

goto err;

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

Line 841 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off

Line 780 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off

if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

LIST_column == n->data.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))

mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);

goto err;

return(1);

}

Line 855 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off

Line 793 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off

if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

NULL != n->parent &&

MDOC_Bl == n->parent->tok &&

LIST_column == n->parent->data.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))

mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);

goto err;

return(1);

}

/* Normal processing of a macro. */

if ( ! mdoc_macro(m, tok, ln, sv, &i, buf))

mdoc_macro(mdoc, tok, ln, sv, &offs, buf);

goto err;

/* In quick mode (for mandocdb), abort after the NAME section. */

if (mdoc->quick && MDOC_Sh == tok &&

SEC_NAME != mdoc->last->sec)

return(2);

return(1);

}

err: /* Error out. */

enum mdelim

mdoc_isdelim(const char *p)

{

m->flags |= MDOC_HALT;

if ('\0' == p[0])

return(0);

return(DELIM_NONE);

if ('\0' == p[1])

switch (p[0]) {

case '(':

/* FALLTHROUGH */

case '[':

return(DELIM_OPEN);

case '|':

return(DELIM_MIDDLE);

case '.':

/* FALLTHROUGH */

case ',':

/* FALLTHROUGH */

case ';':

/* FALLTHROUGH */

case ':':

/* FALLTHROUGH */

case '?':

/* FALLTHROUGH */

case '!':

/* FALLTHROUGH */

case ')':

/* FALLTHROUGH */

case ']':

return(DELIM_CLOSE);

default:

return(DELIM_NONE);

}

if ('\\' != p[0])

return(DELIM_NONE);

if (0 == strcmp(p + 1, "."))

return(DELIM_CLOSE);

if (0 == strcmp(p + 1, "fR|\\fP"))

return(DELIM_MIDDLE);

return(DELIM_NONE);

}

void

mdoc_deroff(char **dest, const struct mdoc_node *n)

{

char *cp;

size_t sz;

if (MDOC_TEXT != n->type) {

for (n = n->child; n; n = n->next)

mdoc_deroff(dest, n);

return;

}

/* Skip leading whitespace. */

for (cp = n->string; '\0' != *cp; cp++)

if (0 == isspace((unsigned char)*cp))

break;

/* Skip trailing whitespace. */

for (sz = strlen(cp); sz; sz--)

if (0 == isspace((unsigned char)cp[sz-1]))

break;

/* Skip empty strings. */

if (0 == sz)

return;

if (NULL == *dest) {

*dest = mandoc_strndup(cp, sz);

return;

}

mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);

free(*dest);

*dest = cp;

}

CVSweb