=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.1 retrieving revision 1.5 diff -u -p -r1.1 -r1.5 --- mandoc/Attic/validate.c 2008/11/29 14:14:21 1.1 +++ mandoc/Attic/validate.c 2008/11/30 20:00:08 1.5 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.1 2008/11/29 14:14:21 kristaps Exp $ */ +/* $Id: validate.c,v 1.5 2008/11/30 20:00:08 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -28,8 +28,10 @@ #include "libmdocml.h" #include "private.h" +#define INDENT 4 + #ifdef __linux__ /* FIXME */ -#define strlcat strncat +#define strlcat strncat #endif struct md_valid { @@ -50,15 +52,15 @@ static void roffmsg(void *arg, enum roffmsg, static int roffhead(void *); static int rofftail(void *); static int roffin(void *, int, int *, char **); -static int roffdata(void *, char *); +static int roffdata(void *, int, char *); static int roffout(void *, int); -static int roffblkin(void *, int); +static int roffblkin(void *, int, int *, char **); static int roffblkout(void *, int); static int roffspecial(void *, int); static int mbuf_newline(struct md_valid *); static int mbuf_indent(struct md_valid *); -static int mbuf_data(struct md_valid *, char *); +static int mbuf_data(struct md_valid *, int, char *); static int @@ -66,41 +68,32 @@ mbuf_indent(struct md_valid *p) { size_t i; - assert(0 == p->pos); + assert(p->pos == 0); - for (i = 0; i < MIN(p->indent, 4); i++) + /* LINTED */ + for (i = 0; i < MIN(p->indent, INDENT); i++) if ( ! md_buf_putstring(p->mbuf, " ")) return(0); - p->pos = i * 4; + p->pos += i * INDENT; return(1); } static int -mbuf_atnewline(struct md_valid *p) -{ - - return(p->pos == MIN(4, p->indent)); -} - - -static int mbuf_newline(struct md_valid *p) { - if (mbuf_atnewline(p)) - return(1); if ( ! md_buf_putchar(p->mbuf, '\n')) return(0); p->pos = 0; - return(mbuf_indent(p)); + return(1); } static int -mbuf_data(struct md_valid *p, char *buf) +mbuf_data(struct md_valid *p, int space, char *buf) { size_t sz; char *bufp; @@ -111,14 +104,6 @@ mbuf_data(struct md_valid *p, char *buf) if (MD_LITERAL & p->flags) return(md_buf_putstring(p->mbuf, buf)); - if (0 == p->pos) - mbuf_indent(p); - - /* - * Indent if we're at the beginning of a line. Don't indent - * more than 16 or so characters. - */ - while (*buf) { while (*buf && isspace(*buf)) buf++; @@ -136,30 +121,41 @@ mbuf_data(struct md_valid *p, char *buf) /* Process word. */ sz = strlen(bufp); - - if (sz + p->pos < 72) { + + if (0 == p->pos) { + if ( ! mbuf_indent(p)) + return(0); if ( ! md_buf_putstring(p->mbuf, bufp)) return(0); - /* FIXME: check punctuation. */ + if (p->indent * INDENT + sz >= 72) { + if ( ! mbuf_newline(p)) + return(0); + continue; + } - if ( ! md_buf_putchar(p->mbuf, ' ')) - return(0); - p->pos += sz + 1; + p->pos += sz; continue; } - if ( ! mbuf_newline(p)) - return(0); + /* + * FIXME: punctuation shouldn't have a newline before + * it! + */ + if (sz + p->pos >= 72) { + if ( ! mbuf_newline(p)) + return(0); + if ( ! mbuf_indent(p)) + return(0); + } else if (space) + if ( ! md_buf_putchar(p->mbuf, ' ')) + return(0); + if ( ! md_buf_putstring(p->mbuf, bufp)) return(0); - /* FIXME: check punctuation. */ - - if ( ! md_buf_putchar(p->mbuf, ' ')) - return(0); - p->pos += sz + 1; + p->pos += sz + (size_t)(space ? 1 : 0); } return(1); @@ -229,8 +225,20 @@ md_init_valid(const struct md_args *args, static int roffhead(void *arg) { + struct md_valid *p; - return(1); + assert(arg); + p = (struct md_valid *)arg; + + if ( ! md_buf_putstring(p->mbuf, "\n")) + return(0); + + if ( ! md_buf_putstring(p->mbuf, "")) + return(0); + p->indent++; + + return(mbuf_newline(p)); } @@ -242,13 +250,13 @@ rofftail(void *arg) assert(arg); p = (struct md_valid *)arg; - if (mbuf_atnewline(p)) - return(1); - - return(md_buf_putchar(p->mbuf, '\n')); + if (0 != p->pos && ! mbuf_newline(p)) + return(0); + return(md_buf_putstring(p->mbuf, "\n")); } +/* ARGSUSED */ static int roffspecial(void *arg, int tok) { @@ -258,31 +266,48 @@ roffspecial(void *arg, int tok) static int -roffblkin(void *arg, int tok) +roffblkin(void *arg, int tok, int *argc, char **argv) { struct md_valid *p; + int i; assert(arg); p = (struct md_valid *)arg; - if ( ! mbuf_atnewline(p)) { - if ( ! md_buf_putchar(p->mbuf, '\n')) + if (0 != p->pos) { + if ( ! mbuf_newline(p)) return(0); - p->pos = 0; if ( ! mbuf_indent(p)) return(0); - } + } else if ( ! mbuf_indent(p)) + return(0); + if ( ! md_buf_putchar(p->mbuf, '<')) + return(0); if ( ! md_buf_putstring(p->mbuf, toknames[tok])) return(0); - if ( ! md_buf_putchar(p->mbuf, '\n')) + for (i = 0; ROFF_ARGMAX != argc[i]; i++) { + if ( ! md_buf_putchar(p->mbuf, ' ')) + return(0); + if ( ! md_buf_putstring(p->mbuf, tokargnames[argc[i]])) + return(0); + if ( ! md_buf_putstring(p->mbuf, "=\"")) + return(0); + if ( ! md_buf_putstring(p->mbuf, argv[i] ? + argv[i] : "true")) + return(0); + if ( ! md_buf_putstring(p->mbuf, "\"")) + return(0); + } + + if ( ! md_buf_putchar(p->mbuf, '>')) return(0); + if ( ! mbuf_newline(p)) + return(0); - p->pos = 0; p->indent++; - - return(mbuf_indent(p)); + return(1); } @@ -294,20 +319,73 @@ roffblkout(void *arg, int tok) assert(arg); p = (struct md_valid *)arg; - if ( ! md_buf_putchar(p->mbuf, '\n')) + p->indent--; + + if (0 != p->pos) { + if ( ! mbuf_newline(p)) + return(0); + if ( ! mbuf_indent(p)) + return(0); + } else if ( ! mbuf_indent(p)) return(0); - p->pos = 0; - p->indent--; + if ( ! md_buf_putstring(p->mbuf, "mbuf, toknames[tok])) + return(0); + if ( ! md_buf_putstring(p->mbuf, ">")) + return(0); + if ( ! mbuf_newline(p)) + return(0); - return(mbuf_indent(p)); + return(1); } static int -roffin(void *arg, int tok, int *argcp, char **argvp) +roffin(void *arg, int tok, int *argc, char **argv) { + struct md_valid *p; + int i; + assert(arg); + p = (struct md_valid *)arg; + + if (0 == p->pos && ! mbuf_indent(p)) + return(0); + + /* FIXME: put into a buffer before writing (line length). */ + + /* FIXME: not always with a space... */ + + if ( ! md_buf_putstring(p->mbuf, " <")) + return(0); + if ( ! md_buf_putstring(p->mbuf, toknames[tok])) + return(0); + + for (i = 0; ROFF_ARGMAX != argc[i]; i++) { + if ( ! md_buf_putchar(p->mbuf, ' ')) + return(0); + if ( ! md_buf_putstring(p->mbuf, tokargnames[argc[i]])) + return(0); + if ( ! md_buf_putstring(p->mbuf, "=\"")) + return(0); + if ( ! md_buf_putstring(p->mbuf, argv[i] ? + argv[i] : "true")) + return(0); + if ( ! md_buf_putstring(p->mbuf, "\"")) + return(0); + + p->pos += strlen(toknames[tok]) + 4 + + strlen(tokargnames[argc[i]]) + + strlen(argv[i] ? argv[i] : "true"); + } + + if ( ! md_buf_putstring(p->mbuf, ">")) + return(0); + + p->pos += strlen(toknames[tok]) + 3; + return(1); } @@ -315,7 +393,23 @@ roffin(void *arg, int tok, int *argcp, char **argvp) static int roffout(void *arg, int tok) { + struct md_valid *p; + assert(arg); + p = (struct md_valid *)arg; + + if (0 == p->pos && ! mbuf_indent(p)) + return(0); + + if ( ! md_buf_putstring(p->mbuf, "mbuf, toknames[tok])) + return(0); + if ( ! md_buf_putstring(p->mbuf, ">")) + return(0); + + p->pos += strlen(toknames[tok]) + 2; + return(1); } @@ -355,11 +449,11 @@ roffmsg(void *arg, enum roffmsg lvl, static int -roffdata(void *arg, char *buf) +roffdata(void *arg, int space, char *buf) { struct md_valid *p; assert(arg); p = (struct md_valid *)arg; - return(mbuf_data(p, buf)); + return(mbuf_data(p, space, buf)); }