version 1.136, 2010/05/17 22:11:42 |
version 1.145, 2010/05/31 21:32:57 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* 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 69 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
Line 69 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
/* LINTED */ |
/* LINTED */ |
"Dx", "%Q", "br", "sp", |
"Dx", "%Q", "br", "sp", |
/* LINTED */ |
/* LINTED */ |
"%U" |
"%U", "Ta" |
}; |
}; |
|
|
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
Line 276 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
Line 276 mdoc_macro(struct mdoc *m, enum mdoct tok, |
|
if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG)) |
if ( ! mdoc_pmsg(m, ln, pp, 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"); |
if (NULL == m->meta.vol) |
if (NULL == m->meta.vol) |
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 (0 == m->meta.date) |
m->meta.date = time(NULL); |
m->meta.date = time(NULL); |
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
Line 542 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
Line 542 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
static int |
static int |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
{ |
{ |
int i; |
char *c, *ws, *end; |
|
struct mdoc_node *n; |
|
|
/* Ignore bogus comments. */ |
/* Ignore bogus comments. */ |
|
|
Line 556 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 557 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
if (SEC_NONE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) |
return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT)); |
return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT)); |
|
|
/* Literal just gets pulled in as-is. */ |
assert(m->last); |
|
n = m->last; |
if (MDOC_LITERAL & m->flags) |
|
return(mdoc_word_alloc(m, line, offs, buf + offs)); |
|
|
|
/* Check for a blank line, which may also consist of spaces. */ |
/* |
|
* Divert directly to list processing if we're encountering a |
|
* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry |
|
* (a MDOC_BODY means it's already open, in which case we should |
|
* process within its context in the normal way). |
|
*/ |
|
|
for (i = offs; ' ' == buf[i]; i++) |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
/* Skip to first non-space. */ ; |
LIST_column == n->data.list) { |
|
/* `Bl' is open without any children. */ |
|
m->flags |= MDOC_FREECOL; |
|
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
|
} |
|
|
if ('\0' == buf[i]) { |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if ( ! mdoc_pmsg(m, line, offs, MANDOCERR_NOBLANKLN)) |
NULL != n->parent && |
|
MDOC_Bl == n->parent->tok && |
|
LIST_column == n->parent->data.list) { |
|
/* `Bl' has block-level `It' children. */ |
|
m->flags |= MDOC_FREECOL; |
|
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
|
} |
|
|
|
/* |
|
* Search for the beginning of unescaped trailing whitespace (ws) |
|
* and for the first character not to be output (end). |
|
*/ |
|
|
|
/* FIXME: replace with strcspn(). */ |
|
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; |
|
continue; |
|
case '\t': |
|
/* |
|
* Always warn about trailing tabs, |
|
* even outside literal context, |
|
* where they should be put on the next line. |
|
*/ |
|
if (NULL == ws) |
|
ws = c; |
|
/* |
|
* Strip trailing tabs in literal context only; |
|
* outside, they affect the next line. |
|
*/ |
|
if (MDOC_LITERAL & m->flags) |
|
continue; |
|
break; |
|
case '\\': |
|
/* Skip the escaped character, too, if any. */ |
|
if (c[1]) |
|
c++; |
|
/* FALLTHROUGH */ |
|
default: |
|
ws = NULL; |
|
break; |
|
} |
|
end = c + 1; |
|
} |
|
*end = '\0'; |
|
|
|
if (ws) |
|
if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE)) |
return(0); |
return(0); |
|
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
|
if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN)) |
|
return(0); |
|
|
/* |
/* |
* Insert a `Pp' in the case of a blank line. Technically, |
* Insert a `Pp' 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 |
Line 582 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 649 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
return(1); |
return(1); |
} |
} |
|
|
/* |
if ( ! mdoc_word_alloc(m, line, offs, buf+offs)) |
* Warn if the last un-escaped character is whitespace. Then |
|
* strip away the remaining spaces (tabs stay!). |
|
*/ |
|
|
|
i = (int)strlen(buf); |
|
assert(i); |
|
|
|
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
|
if (i > 1 && '\\' != buf[i - 2]) |
|
if ( ! mdoc_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE)) |
|
return(0); |
|
|
|
for (--i; i && ' ' == buf[i]; i--) |
|
/* Spin back to non-space. */ ; |
|
|
|
/* Jump ahead of escaped whitespace. */ |
|
i += '\\' == buf[i] ? 2 : 1; |
|
|
|
buf[i] = '\0'; |
|
} |
|
|
|
/* Allocate the whole word. */ |
|
|
|
if ( ! mdoc_word_alloc(m, line, offs, buf + offs)) |
|
return(0); |
return(0); |
|
|
|
if (MDOC_LITERAL & m->flags) |
|
return(1); |
|
|
/* |
/* |
* End-of-sentence check. If the last character is an unescaped |
* End-of-sentence check. If the last character is an unescaped |
* EOS character, then flag the node as being the end of a |
* EOS character, then flag the node as being the end of a |
* sentence. The front-end will know how to interpret this. |
* sentence. The front-end will know how to interpret this. |
*/ |
*/ |
|
|
assert(i); |
assert(buf < end); |
if (mandoc_eos(buf, (size_t)i)) |
|
|
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) |
m->last->flags |= MDOC_EOS; |
m->last->flags |= MDOC_EOS; |
|
|
return(1); |
return(1); |
Line 633 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 680 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
buf, strlen(buf) > 3 ? "..." : ""); |
buf, strlen(buf) > 3 ? "..." : ""); |
|
|
/* FIXME: logic should be in driver. */ |
/* FIXME: logic should be in driver. */ |
|
/* FIXME: broken, will error out and not omit a message. */ |
return(MDOC_IGN_MACRO & m->pflags ? rc : 0); |
return(MDOC_IGN_MACRO & m->pflags ? rc : 0); |
} |
} |
|
|
Line 644 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 692 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
int |
int |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j, sv; |
int i, j, sv; |
char mac[5]; |
char mac[5]; |
|
struct mdoc_node *n; |
|
|
/* Empty lines are ignored. */ |
/* Empty lines are ignored. */ |
|
|
Line 714 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 763 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
goto err; |
goto err; |
|
|
/* |
/* |
* Begin recursive parse sequence. Since we're at the start of |
* If an initial macro or a list invocation, divert directly |
* the line, we don't need to do callable/parseable checks. |
* into macro processing. |
*/ |
*/ |
|
|
|
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
|
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
|
goto err; |
|
return(1); |
|
} |
|
|
|
n = m->last; |
|
assert(m->last); |
|
|
|
/* |
|
* If the first macro of a `Bl -column', open an `It' block |
|
* context around the parsed macro. |
|
*/ |
|
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
|
LIST_column == n->data.list) { |
|
m->flags |= MDOC_FREECOL; |
|
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
|
goto err; |
|
return(1); |
|
} |
|
|
|
/* |
|
* If we're following a block-level `It' within a `Bl -column' |
|
* context (perhaps opened in the above block or in ptext()), |
|
* then open an `It' block context around the parsed macro. |
|
*/ |
|
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
|
NULL != n->parent && |
|
MDOC_Bl == n->parent->tok && |
|
LIST_column == n->parent->data.list) { |
|
m->flags |= MDOC_FREECOL; |
|
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
|
goto err; |
|
return(1); |
|
} |
|
|
|
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
|
|