version 1.22, 2008/12/08 16:29:57 |
version 1.23, 2008/12/09 17:09:12 |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
#include "libmdocml.h" |
|
#include "private.h" |
#include "private.h" |
#include "ml.h" |
#include "ml.h" |
|
|
|
|
void *data; |
void *data; |
}; |
}; |
|
|
static void mlg_roffmsg(void *arg, |
static int mlg_roffmsg(void *arg, |
enum roffmsg, const char *, |
enum roffmsg, const char *, |
const char *, const char *); |
const char *, const char *); |
static int mlg_roffhead(void *, const struct tm *, |
static int mlg_roffhead(void *, const struct tm *, |
Line 87 static int mlg_roffblkbodyout(void *, int); |
|
Line 86 static int mlg_roffblkbodyout(void *, int); |
|
static int mlg_ref_special(struct md_mlg *, int, |
static int mlg_ref_special(struct md_mlg *, int, |
const char *, const char **); |
const char *, const char **); |
static int mlg_formatted_special(struct md_mlg *, |
static int mlg_formatted_special(struct md_mlg *, |
int, const int *, |
int, const char *, const int *, |
const char **, const char **); |
const char **, const char **); |
static int mlg_literal_special(struct md_mlg *, |
static int mlg_literal_special(struct md_mlg *, |
int, const char *, const int *, |
int, const char *, const int *, |
Line 109 static int mlg_string(struct md_mlg *, |
|
Line 108 static int mlg_string(struct md_mlg *, |
|
const char *, const char *); |
const char *, const char *); |
static int mlg_data(struct md_mlg *, int, |
static int mlg_data(struct md_mlg *, int, |
const char *, const char *); |
const char *, const char *); |
static void mlg_err(struct md_mlg *, const char *, |
static int mlg_err(struct md_mlg *, const char *, |
const char *, const char *, ...); |
const char *, const char *, ...); |
static void mlg_msg(struct md_mlg *, |
static int mlg_msg(struct md_mlg *, |
enum roffmsg, const char *, |
enum roffmsg, const char *, |
const char *, const char *); |
const char *, const char *); |
static void mlg_vmsg(struct md_mlg *, enum roffmsg, |
static int mlg_vmsg(struct md_mlg *, enum roffmsg, |
const char *, const char *, |
const char *, const char *, |
const char *, va_list); |
const char *, va_list); |
|
|
Line 291 mlg_nstring(struct md_mlg *p, const char *start, |
|
Line 290 mlg_nstring(struct md_mlg *p, const char *start, |
|
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->mbuf, buf, sz, &p->pos))) |
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) |
return(0); |
return(0); |
} else if (-1 == c) |
|
return(0); |
|
|
|
res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); |
res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz); |
if (-1 == res) |
if (-1 == res) |
Line 462 mlg_literal_special(struct md_mlg *p, int tok, const c |
|
Line 460 mlg_literal_special(struct md_mlg *p, int tok, const c |
|
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
return(0); |
return(0); |
|
|
/* FIXME: must be ml-filtered. */ |
lit = roff_literal(tok, argc, argv, more); |
|
|
lit = ml_literal(tok, argc, argv, more); |
|
assert(lit); |
assert(lit); |
|
|
if ( ! ml_puts(p->mbuf, lit, &p->pos)) |
if ( ! mlg_string(p, start, lit)) |
return(0); |
return(0); |
|
|
while (*more) { |
while (*more) { |
if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) |
if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos)) |
return(0); |
return(0); |
Line 507 mlg_ref_special(struct md_mlg *p, int tok, |
|
Line 504 mlg_ref_special(struct md_mlg *p, int tok, |
|
|
|
|
|
static int |
static int |
mlg_formatted_special(struct md_mlg *p, int tok, |
mlg_formatted_special(struct md_mlg *p, int tok, const char *start, |
const int *argc, const char **argv, const char **more) |
const int *argc, const char **argv, const char **more) |
{ |
{ |
char buf[256], *lit; |
char buf[256], *lit; |
Line 515 mlg_formatted_special(struct md_mlg *p, int tok, |
|
Line 512 mlg_formatted_special(struct md_mlg *p, int tok, |
|
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more)) |
return(0); |
return(0); |
|
|
/* FIXME: must be ml-filtered. */ |
lit = roff_fmtstring(tok); |
|
|
lit = ml_literal(tok, argc, argv, more); |
|
|
|
assert(lit); |
assert(lit); |
assert(*more); |
assert(*more); |
(void)snprintf(buf, sizeof(buf), lit, *more++); |
(void)snprintf(buf, sizeof(buf), lit, *more++); |
assert(NULL == *more); |
assert(NULL == *more); |
|
|
if ( ! ml_puts(p->mbuf, buf, &p->pos)) |
if ( ! mlg_string(p, start, buf)) |
return(0); |
return(0); |
|
|
return(mlg_endtag(p, MD_NS_INLINE, tok)); |
return(mlg_endtag(p, MD_NS_INLINE, tok)); |
Line 631 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 626 mlg_roffspecial(void *arg, int tok, const char *start, |
|
case (ROFF_Ex): |
case (ROFF_Ex): |
/* NOTREACHED */ |
/* NOTREACHED */ |
case (ROFF_Rv): |
case (ROFF_Rv): |
return(mlg_formatted_special(p, tok, |
return(mlg_formatted_special(p, tok, start, |
argc, argv, more)); |
argc, argv, more)); |
|
|
case (ROFF_At): |
case (ROFF_At): |
Line 659 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 654 mlg_roffspecial(void *arg, int tok, const char *start, |
|
break; |
break; |
} |
} |
|
|
mlg_err(p, start, start, "`%s' not yet supported", |
return(mlg_err(p, start, start, "`%s' not yet supported", |
toknames[tok]); |
toknames[tok])); |
return(0); |
|
} |
} |
|
|
|
|
Line 736 mlg_roffout(void *arg, int tok) |
|
Line 730 mlg_roffout(void *arg, int tok) |
|
} |
} |
|
|
|
|
static void |
static int |
mlg_roffmsg(void *arg, enum roffmsg lvl, const char *buf, |
mlg_roffmsg(void *arg, enum roffmsg lvl, const char *buf, |
const char *pos, const char *msg) |
const char *pos, const char *msg) |
{ |
{ |
|
|
mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg); |
return(mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg)); |
} |
} |
|
|
|
|
Line 762 mlg_roffdata(void *arg, int space, |
|
Line 756 mlg_roffdata(void *arg, int space, |
|
} |
} |
|
|
|
|
static void |
static int |
mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, |
mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, |
const char *pos, const char *fmt, va_list ap) |
const char *pos, const char *fmt, va_list ap) |
{ |
{ |
char buf[128]; |
char buf[128]; |
|
|
(void)vsnprintf(buf, sizeof(buf), fmt, ap); |
(void)vsnprintf(buf, sizeof(buf), fmt, ap); |
mlg_msg(p, lvl, start, pos, buf); |
return(mlg_msg(p, lvl, start, pos, buf)); |
} |
} |
|
|
|
|
static void |
static int |
mlg_err(struct md_mlg *p, const char *start, |
mlg_err(struct md_mlg *p, const char *start, |
const char *pos, const char *fmt, ...) |
const char *pos, const char *fmt, ...) |
{ |
{ |
va_list ap; |
va_list ap; |
|
int c; |
|
|
va_start(ap, fmt); |
va_start(ap, fmt); |
mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); |
c = mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap); |
va_end(ap); |
va_end(ap); |
|
return(c); |
} |
} |
|
|
|
|
static void |
static int |
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) |
{ |
{ |
Line 795 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
Line 791 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
|
|
switch (lvl) { |
switch (lvl) { |
case (ROFF_WARN): |
case (ROFF_WARN): |
if ( ! (MD_WARN_ALL & p->args->warnings)) |
|
return; |
|
level = "warning"; |
level = "warning"; |
|
if ( ! (MD_WARN_ALL & p->args->warnings)) |
|
return(1); |
break; |
break; |
case (ROFF_ERROR): |
case (ROFF_ERROR): |
level = "error"; |
level = "error"; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
if (pos) { |
if (pos) { |
Line 831 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
Line 828 mlg_msg(struct md_mlg *p, enum roffmsg lvl, |
|
p->rbuf->name, level, msg); |
p->rbuf->name, level, msg); |
|
|
(void)fprintf(stderr, "%s\n", b); |
(void)fprintf(stderr, "%s\n", b); |
|
return(lvl == ROFF_WARN ? 1 : 0); |
} |
} |
|
|