mandoc/mdoc.c - diff

Return to mdoc.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc.c between version 1.173 and 1.174

version 1.173, 2010/12/25 13:50:37

version 1.174, 2011/01/01 10:51:30

Line 277 mdoc_macro(MACRO_PROT_ARGS)

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

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

MDOC_PBODY & m->flags)

MDOC_PBODY & m->flags) {

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

mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);

return(1);

}

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

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

! (MDOC_PBODY & m->flags)) {

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

mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);

return(0);

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

m->meta.msec = mandoc_strdup("1");

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

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

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

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

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

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

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

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

mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);

return(1);

}

/* No text before an initial macro. */

if (SEC_NONE == m->lastnamed)

if (SEC_NONE == m->lastnamed) {

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

mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);

return(1);

}

assert(m->last);

n = m->last;

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

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

mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);

return(0);

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

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

mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);

return(0);

* Insert a `sp' in the case of a blank line. Technically,

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

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

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

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

mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);

goto err;

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

CVSweb