version 1.8, 2008/12/04 23:10:51 |
version 1.9, 2008/12/05 11:28:17 |
Line 82 static int mlg_roffblkbodyin(void *, int, |
|
Line 82 static int mlg_roffblkbodyin(void *, int, |
|
int *, char **); |
int *, char **); |
static int mlg_roffblkbodyout(void *, int); |
static int mlg_roffblkbodyout(void *, int); |
|
|
static int mlg_endblk(struct md_mlg *, enum md_ns, int); |
|
static int mlg_begintag(struct md_mlg *, enum md_ns, |
static int mlg_begintag(struct md_mlg *, enum md_ns, |
int, int *, char **); |
int, int *, char **); |
static int mlg_endtag(struct md_mlg *, enum md_ns, int); |
static int mlg_endtag(struct md_mlg *, enum md_ns, int); |
Line 105 extern size_t strlcpy(char *, const char *, size_t); |
|
Line 104 extern size_t strlcpy(char *, const char *, size_t); |
|
|
|
|
|
static int |
static int |
mlg_endblk(struct md_mlg *p, enum md_ns ns, int tok) |
|
{ |
|
|
|
p->indent--; |
|
|
|
if (0 != p->pos) { |
|
if ( ! mlg_newline(p)) |
|
return(0); |
|
if ( ! mlg_indent(p)) |
|
return(0); |
|
} else if ( ! mlg_indent(p)) |
|
return(0); |
|
|
|
mlg_mode(p, MD_BLK_OUT); |
|
if ( ! mlg_endtag(p, ns, tok)) |
|
return(0); |
|
return(mlg_newline(p)); |
|
} |
|
|
|
|
|
static int |
|
mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
int *argc, char **argv) |
int *argc, char **argv) |
{ |
{ |
Line 137 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
Line 115 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok, |
|
case (MD_NS_INLINE): |
case (MD_NS_INLINE): |
if ( ! (ML_OVERRIDE_ONE & p->flags) && |
if ( ! (ML_OVERRIDE_ONE & p->flags) && |
! (ML_OVERRIDE_ALL & p->flags) && |
! (ML_OVERRIDE_ALL & p->flags) && |
p->pos + 11 > COLUMNS) |
p->pos + 11 >= COLUMNS) |
if ( ! mlg_newline(p)) |
if ( ! mlg_newline(p)) |
return(0); |
return(0); |
if (0 != p->pos && (MD_TEXT == p->last || |
if (0 != p->pos && (MD_TEXT == p->last || |
Line 195 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
Line 173 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
{ |
{ |
ssize_t res; |
ssize_t res; |
|
|
/* TODO: extra rules for block/inline. */ |
assert(MD_NS_DEFAULT != ns); |
|
|
|
switch (ns) { |
|
case (MD_NS_INLINE): |
|
break; |
|
default: |
|
p->indent--; |
|
if (0 != p->pos) { |
|
if ( ! mlg_newline(p)) |
|
return(0); |
|
if ( ! mlg_indent(p)) |
|
return(0); |
|
} else if ( ! mlg_indent(p)) |
|
return(0); |
|
break; |
|
} |
|
|
if ( ! ml_nputs(p->mbuf, "</", 2, &p->pos)) |
if ( ! ml_nputs(p->mbuf, "</", 2, &p->pos)) |
return(0); |
return(0); |
|
|
Line 207 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
Line 200 mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok) |
|
assert(res >= 0); |
assert(res >= 0); |
p->pos += (size_t)res; |
p->pos += (size_t)res; |
|
|
/* TODO: extra rules for block/inline. */ |
if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos)) |
|
return(0); |
|
|
|
switch (ns) { |
|
case (MD_NS_INLINE): |
|
mlg_mode(p, MD_INLINE_OUT); |
|
break; |
|
default: |
|
mlg_mode(p, MD_BLK_OUT); |
|
break; |
|
} |
|
|
return(ml_nputs(p->mbuf, ">", 1, &p->pos)); |
return(1); |
} |
} |
|
|
|
|
Line 218 mlg_indent(struct md_mlg *p) |
|
Line 221 mlg_indent(struct md_mlg *p) |
|
{ |
{ |
size_t count; |
size_t count; |
|
|
count = p->indent > MAXINDENT ? (size_t)MAXINDENT : p->indent; |
count = p->indent > MAXINDENT ? |
|
(size_t)MAXINDENT : p->indent; |
count *= INDENT; |
count *= INDENT; |
|
|
assert(0 == p->pos); |
assert(0 == p->pos); |
Line 409 mlg_rofftail(void *arg) |
|
Line 413 mlg_rofftail(void *arg) |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
mlg_roffspecial(void *arg, int tok, const char *start, char **more) |
mlg_roffspecial(void *arg, int tok, const char *start, char **more) |
{ |
{ |
Line 421 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 424 mlg_roffspecial(void *arg, int tok, const char *start, |
|
switch (tok) { |
switch (tok) { |
case (ROFF_Xr): |
case (ROFF_Xr): |
if ( ! *more) { |
if ( ! *more) { |
mlg_err(p, start, start, |
mlg_err(p, start, start, "missing argument"); |
"missing required argument"); |
|
return(0); |
return(0); |
} |
} |
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL)) |
if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL)) |
Line 432 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 434 mlg_roffspecial(void *arg, int tok, const char *start, |
|
if (*more) { |
if (*more) { |
if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) |
if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos)) |
return(0); |
return(0); |
if ( ! mlg_data(p, 0, start, *more++)) |
if ( ! ml_puts(p->mbuf, *more++, &p->pos)) |
return(0); |
return(0); |
if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) |
if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos)) |
return(0); |
return(0); |
Line 443 mlg_roffspecial(void *arg, int tok, const char *start, |
|
Line 445 mlg_roffspecial(void *arg, int tok, const char *start, |
|
} |
} |
if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) |
if ( ! mlg_endtag(p, MD_NS_INLINE, tok)) |
return(0); |
return(0); |
mlg_mode(p, MD_INLINE_OUT); |
|
break; |
break; |
case (ROFF_Fn): |
case (ROFF_Fn): |
break; |
break; |
|
|
mlg_roffblkout(void *arg, int tok) |
mlg_roffblkout(void *arg, int tok) |
{ |
{ |
|
|
return(mlg_endblk((struct md_mlg *)arg, MD_NS_BLOCK, tok)); |
return(mlg_endtag((struct md_mlg *)arg, MD_NS_BLOCK, tok)); |
} |
} |
|
|
|
|
|
|
mlg_roffblkbodyout(void *arg, int tok) |
mlg_roffblkbodyout(void *arg, int tok) |
{ |
{ |
|
|
return(mlg_endblk((struct md_mlg *)arg, MD_NS_BODY, tok)); |
return(mlg_endtag((struct md_mlg *)arg, MD_NS_BODY, tok)); |
} |
} |
|
|
|
|
|
|
mlg_roffblkheadout(void *arg, int tok) |
mlg_roffblkheadout(void *arg, int tok) |
{ |
{ |
|
|
return(mlg_endblk((struct md_mlg *)arg, MD_NS_HEAD, tok)); |
return(mlg_endtag((struct md_mlg *)arg, MD_NS_HEAD, tok)); |
} |
} |
|
|
|
|
Line 528 mlg_roffin(void *arg, int tok, int *argc, char **argv) |
|
Line 529 mlg_roffin(void *arg, int tok, int *argc, char **argv) |
|
static int |
static int |
mlg_roffout(void *arg, int tok) |
mlg_roffout(void *arg, int tok) |
{ |
{ |
struct md_mlg *p; |
|
|
|
assert(arg); |
return(mlg_endtag((struct md_mlg *)arg, MD_NS_INLINE, tok)); |
p = (struct md_mlg *)arg; |
|
|
|
if (0 == p->pos && ! mlg_indent(p)) |
|
return(0); |
|
|
|
mlg_mode(p, MD_INLINE_OUT); |
|
return(mlg_endtag(p, MD_NS_INLINE, tok)); |
|
} |
} |
|
|
|
|