version 1.28, 2008/12/10 13:41:58 |
version 1.29, 2008/12/10 17:31:57 |
|
|
}; |
}; |
|
|
struct md_mlg { |
struct md_mlg { |
const struct md_args *args; |
struct ml_args args; |
const struct md_rbuf *rbuf; |
|
|
|
struct md_mbuf *mbuf; |
|
struct rofftree *tree; |
struct rofftree *tree; |
size_t indent; |
size_t indent; |
size_t pos; |
size_t pos; |
|
|
int flags; |
int flags; |
#define ML_OVERRIDE_ONE (1 << 0) |
#define ML_OVERRIDE_ONE (1 << 0) |
#define ML_OVERRIDE_ALL (1 << 1) |
#define ML_OVERRIDE_ALL (1 << 1) |
void *data; |
|
}; |
}; |
|
|
static int mlg_roffmsg(void *arg, |
static int mlg_roffmsg(void *arg, |
Line 143 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
Line 139 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
MD_INLINE_OUT == p->last) |
MD_INLINE_OUT == p->last) |
&& ! (ML_OVERRIDE_ONE & p->flags) |
&& ! (ML_OVERRIDE_ONE & p->flags) |
&& ! (ML_OVERRIDE_ALL & p->flags)) |
&& ! (ML_OVERRIDE_ALL & p->flags)) |
if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos)) |
return(0); |
return(0); |
if (0 == p->pos && ! mlg_indent(p)) |
if (0 == p->pos && ! mlg_indent(p)) |
return(0); |
return(0); |
Line 162 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
Line 158 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
break; |
break; |
} |
} |
|
|
if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, "<", 1, &p->pos)) |
return(0); |
return(0); |
|
|
res = (*p->cbs.ml_begintag)(p->mbuf, p->data, |
res = (*p->cbs.ml_begintag)(&p->args, ns, tok, argc, argv); |
p->args, ns, tok, argc, argv); |
|
if (-1 == res) |
if (-1 == res) |
return(0); |
return(0); |
|
|
assert(res >= 0); |
assert(res >= 0); |
p->pos += (size_t)res; |
p->pos += (size_t)res; |
|
|
if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, ">", 1, &p->pos)) |
return(0); |
return(0); |
|
|
switch (ns) { |
switch (ns) { |
Line 211 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
Line 206 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
break; |
break; |
} |
} |
|
|
if ( ! ml_nputs(p->mbuf, "</", 2, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, "</", 2, &p->pos)) |
return(0); |
return(0); |
|
|
res = (*p->cbs.ml_endtag)(p->mbuf, p->data, p->args, ns, tok); |
res = (*p->cbs.ml_endtag)(&p->args, ns, tok); |
if (-1 == res) |
if (-1 == res) |
return(0); |
return(0); |
|
|
assert(res >= 0); |
assert(res >= 0); |
p->pos += (size_t)res; |
p->pos += (size_t)res; |
|
|
if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, ">", 1, &p->pos)) |
return(0); |
return(0); |
|
|
switch (ns) { |
switch (ns) { |
Line 242 mlg_indent(struct md_mlg *p) |
|
Line 237 mlg_indent(struct md_mlg *p) |
|
{ |
{ |
|
|
assert(0 == p->pos); |
assert(0 == p->pos); |
return(ml_putchars(p->mbuf, ' ', INDENT_SZ * |
return(ml_putchars(p->args.mbuf, ' ', INDENT_SZ * |
INDENT(p->indent), &p->pos)); |
INDENT(p->indent), &p->pos)); |
} |
} |
|
|
Line 252 mlg_newline(struct md_mlg *p) |
|
Line 247 mlg_newline(struct md_mlg *p) |
|
{ |
{ |
|
|
p->pos = 0; |
p->pos = 0; |
return(ml_nputs(p->mbuf, "\n", 1, NULL)); |
return(ml_nputs(p->args.mbuf, "\n", 1, NULL)); |
} |
} |
|
|
|
|
Line 280 mlg_nstring(struct md_mlg *p, const char *start, |
|
Line 275 mlg_nstring(struct md_mlg *p, const char *start, |
|
int c; |
int c; |
ssize_t res; |
ssize_t res; |
|
|
assert(p->mbuf); |
assert(p->args.mbuf); |
assert(0 != p->indent); |
assert(0 != p->indent); |
|
|
res = (*p->cbs.ml_beginstring)(p->mbuf, p->args, buf, sz); |
res = (*p->cbs.ml_beginstring)(&p->args, buf, sz); |
if (-1 == res) |
if (-1 == res) |
return(0); |
return(0); |
|
|
if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos))) |
if (0 == (c = ml_nputstring(p->args.mbuf, buf, sz, &p->pos))) |
return(mlg_err(p, start, buf, "bad string " |
return(mlg_err(p, start, buf, "bad string " |
"encoding: `%s'", buf)); |
"encoding: `%s'", buf)); |
else if (-1 == c) |
else if (-1 == c) |
return(0); |
return(0); |
|
|
res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); |
res = (*p->cbs.ml_endstring)(&p->args, buf, sz); |
if (-1 == res) |
if (-1 == res) |
return(0); |
return(0); |
|
|
Line 307 mlg_data(struct md_mlg *p, int space, |
|
Line 302 mlg_data(struct md_mlg *p, int space, |
|
{ |
{ |
size_t sz; |
size_t sz; |
|
|
assert(p->mbuf); |
assert(p->args.mbuf); |
assert(0 != p->indent); |
assert(0 != p->indent); |
|
|
if (ML_OVERRIDE_ONE & p->flags || |
if (ML_OVERRIDE_ONE & p->flags || |
Line 335 mlg_data(struct md_mlg *p, int space, |
|
Line 330 mlg_data(struct md_mlg *p, int space, |
|
if ( ! mlg_indent(p)) |
if ( ! mlg_indent(p)) |
return(0); |
return(0); |
} else if (space) { |
} else if (space) { |
if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos)) |
return(0); |
return(0); |
} |
} |
|
|
Line 357 mlg_exit(struct md_mlg *p, int flush) |
|
Line 352 mlg_exit(struct md_mlg *p, int flush) |
|
int c; |
int c; |
|
|
c = roff_free(p->tree, flush); |
c = roff_free(p->tree, flush); |
(*p->cbs.ml_free)(p->data); |
(*p->cbs.ml_free)(p->args.data); |
|
|
free(p); |
free(p); |
|
|
Line 391 mlg_alloc(const struct md_args *args, |
|
Line 386 mlg_alloc(const struct md_args *args, |
|
if (NULL == (p = calloc(1, sizeof(struct md_mlg)))) |
if (NULL == (p = calloc(1, sizeof(struct md_mlg)))) |
err(1, "calloc"); |
err(1, "calloc"); |
|
|
p->args = args; |
p->args.args = args; |
p->mbuf = mbuf; |
p->args.mbuf = mbuf; |
p->rbuf = rbuf; |
p->args.rbuf = rbuf; |
|
|
(void)memcpy(&p->cbs, cbs, sizeof(struct ml_cbs)); |
(void)memcpy(&p->cbs, cbs, sizeof(struct ml_cbs)); |
|
|
if (NULL == (p->tree = roff_alloc(&cb, p))) |
if (NULL == (p->tree = roff_alloc(&cb, p))) |
free(p); |
free(p); |
else if ( ! (*p->cbs.ml_alloc)(&p->data)) |
else if ( ! (*p->cbs.ml_alloc)(&p->args.data)) |
free(p); |
free(p); |
else |
else |
return(p); |
return(p); |
Line 419 mlg_roffhead(void *arg, const struct tm *tm, const cha |
|
Line 414 mlg_roffhead(void *arg, const struct tm *tm, const cha |
|
|
|
mlg_mode(p, MD_BLK_IN); |
mlg_mode(p, MD_BLK_IN); |
|
|
if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, |
if ( ! (*p->cbs.ml_begin)(&p->args, tm, os, title, sec, vol)) |
tm, os, title, sec, vol)) |
|
return(0); |
return(0); |
|
|
p->indent++; |
p->indent++; |
Line 441 mlg_rofftail(void *arg, const struct tm *tm, const cha |
|
Line 435 mlg_rofftail(void *arg, const struct tm *tm, const cha |
|
if ( ! mlg_newline(p)) |
if ( ! mlg_newline(p)) |
return(0); |
return(0); |
|
|
if ( ! (*p->cbs.ml_end)(p->mbuf, p->args, |
if ( ! (*p->cbs.ml_end)(&p->args, tm, os, title, sec, vol)) |
tm, os, title, sec, vol)) |
|
return(0); |
return(0); |
|
|
mlg_mode(p, MD_BLK_OUT); |
mlg_mode(p, MD_BLK_OUT); |
Line 466 mlg_literal_special(struct md_mlg *p, int tok, const c |
|
Line 459 mlg_literal_special(struct md_mlg *p, int tok, const c |
|
return(0); |
return(0); |
|
|
while (*more) { |
while (*more) { |
if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos)) |
return(0); |
return(0); |
if ( ! mlg_string(p, start, *more++)) |
if ( ! mlg_string(p, start, *more++)) |
return(0); |
return(0); |
Line 485 mlg_ref_special(struct md_mlg *p, int tok, |
|
Line 478 mlg_ref_special(struct md_mlg *p, int tok, |
|
return(0); |
return(0); |
|
|
assert(*more); |
assert(*more); |
if ( ! ml_puts(p->mbuf, *more++, &p->pos)) |
if ( ! ml_puts(p->args.mbuf, *more++, &p->pos)) |
return(0); |
return(0); |
|
|
if (*more) { |
if (*more) { |
if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, "(", 1, &p->pos)) |
return(0); |
return(0); |
if ( ! mlg_string(p, start, *more++)) |
if ( ! mlg_string(p, start, *more++)) |
return(0); |
return(0); |
if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, ")", 1, &p->pos)) |
return(0); |
return(0); |
} |
} |
|
|
Line 531 mlg_atom_special(struct md_mlg *p, int tok, |
|
Line 524 mlg_atom_special(struct md_mlg *p, int tok, |
|
const char *start, const char **more) |
const char *start, const char **more) |
{ |
{ |
|
|
|
if (ROFFSec_SYNOP == p->args.section) { |
|
if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Pp, NULL, more)) |
|
return(0); |
|
if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Pp)) |
|
return(0); |
|
} |
|
|
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
return(0); |
return(0); |
|
|
Line 559 mlg_function_special(struct md_mlg *p, |
|
Line 559 mlg_function_special(struct md_mlg *p, |
|
if (NULL == *more) |
if (NULL == *more) |
return(1); |
return(1); |
|
|
if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, "(", 1, &p->pos)) |
return(0); |
return(0); |
|
|
p->flags |= ML_OVERRIDE_ONE; |
p->flags |= ML_OVERRIDE_ONE; |
Line 572 mlg_function_special(struct md_mlg *p, |
|
Line 572 mlg_function_special(struct md_mlg *p, |
|
return(0); |
return(0); |
|
|
while (*more) { |
while (*more) { |
if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos)) |
if ( ! ml_nputs(p->args.mbuf, ", ", 2, &p->pos)) |
return(0); |
return(0); |
if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) |
if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more)) |
return(0); |
return(0); |
Line 582 mlg_function_special(struct md_mlg *p, |
|
Line 582 mlg_function_special(struct md_mlg *p, |
|
return(0); |
return(0); |
} |
} |
|
|
return(ml_nputs(p->mbuf, ")", 1, &p->pos)); |
return(ml_nputs(p->args.mbuf, ")", 1, &p->pos)); |
} |
} |
|
|
|
|
Line 644 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 644 mlg_roffspecial(void *arg, int tok, const char *start, |
|
return(mlg_ref_special(p, tok, start, more)); |
return(mlg_ref_special(p, tok, start, more)); |
|
|
case (ROFF_Sh): |
case (ROFF_Sh): |
|
p->args.section = roff_sec(more); |
return(mlg_anchor_special(p, tok, more)); |
return(mlg_anchor_special(p, tok, more)); |
|
|
case (ROFF_Sx): |
case (ROFF_Sx): |
|
|
mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
const char *buf, const char *pos, const char *msg) |
const char *buf, const char *pos, const char *msg) |
{ |
{ |
char *level; |
char *level, b[256]; |
char b[256]; |
size_t sz; |
int i; |
int i; |
|
|
|
sz = sizeof(b); |
|
|
switch (lvl) { |
switch (lvl) { |
case (ROFF_WARN): |
case (ROFF_WARN): |
level = "warning"; |
level = "warning"; |
if ( ! (MD_WARN_ALL & p->args->warnings)) |
if ( ! (MD_WARN_ALL & p->args.args->warnings)) |
return(1); |
return(1); |
break; |
break; |
case (ROFF_ERROR): |
case (ROFF_ERROR): |
Line 836 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
Line 839 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
|
|
if (pos) { |
if (pos) { |
assert(pos >= buf); |
assert(pos >= buf); |
if (0 < p->args->verbosity) { |
if (0 < p->args.args->verbosity) { |
(void)snprintf(b, sizeof(b), |
(void)snprintf(b, sz, "%s:%zu: %s: %s\n", |
"%s:%zu: %s: %s\n", |
p->args.rbuf->name, |
p->rbuf->name, p->rbuf->line, |
p->args.rbuf->line, |
level, msg); |
level, msg); |
(void)strlcat(b, "Error at: ", sizeof(b)); |
|
(void)strlcat(b, p->rbuf->linebuf, sizeof(b)); |
|
|
|
(void)strlcat(b, "\n ", sizeof(b)); |
(void)strlcat(b, "Error at: ", sz); |
|
(void)strlcat(b, p->args.rbuf->linebuf, sz); |
|
(void)strlcat(b, "\n ", sz); |
|
|
for (i = 0; i < pos - buf; i++) |
for (i = 0; i < pos - buf; i++) |
(void)strlcat(b, " ", sizeof(b)); |
(void)strlcat(b, " ", sz); |
(void)strlcat(b, "^", sizeof(b)); |
|
|
|
|
(void)strlcat(b, "^", sz); |
} else |
} else |
(void)snprintf(b, sizeof(b), |
(void)snprintf(b, sz, "%s:%zu: %s: %s (%zu)", |
"%s:%zu: %s: %s (col %zu)", |
p->args.rbuf->name, |
p->rbuf->name, p->rbuf->line, |
p->args.rbuf->line, |
level, msg, pos - buf); |
level, msg, pos - buf); |
} else |
} else |
(void)snprintf(b, sizeof(b), "%s: %s: %s", |
(void)snprintf(b, sz, "%s: %s: %s", |
p->rbuf->name, level, msg); |
p->args.rbuf->name, level, msg); |
|
|
(void)fprintf(stderr, "%s\n", b); |
(void)fprintf(stderr, "%s\n", b); |
return(lvl == ROFF_WARN ? 1 : 0); |
return(lvl == ROFF_WARN ? 1 : 0); |