=================================================================== RCS file: /cvs/mandoc/out.c,v retrieving revision 1.1 retrieving revision 1.9 diff -u -p -r1.1 -r1.9 --- mandoc/out.c 2009/09/21 00:39:02 1.1 +++ mandoc/out.c 2009/11/07 14:14:15 1.9 @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.1 2009/09/21 00:39:02 kristaps Exp $ */ +/* $Id: out.c,v 1.9 2009/11/07 14:14:15 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -18,96 +18,342 @@ #include #include +#include #include #include +#include -#include "mdoc.h" -#include "man.h" #include "out.h" +#ifdef __linux__ +extern size_t strlcat(char *, const char *, size_t); +#endif + +/* + * Convert a `scaling unit' to a consistent form, or fail. Scaling + * units are documented in groff.7, mdoc.7, man.7. + */ int -out_a2list(const struct mdoc_node *n) +a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) { + char buf[BUFSIZ], hasd; int i; + enum roffscale unit; - assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok); - assert(n->args); + if ('\0' == *src) + return(0); - for (i = 0; i < (int)n->args->argc; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(n->args->argv[i].arg); - default: - break; + i = hasd = 0; + + switch (*src) { + case ('+'): + src++; + break; + case ('-'): + buf[i++] = *src++; + break; + default: + break; + } + + if ('\0' == *src) + return(0); + + while (i < BUFSIZ) { + if ( ! isdigit((u_char)*src)) { + if ('.' != *src) + break; + else if (hasd) + break; + else + hasd = 1; } + buf[i++] = *src++; + } - abort(); - /* NOTREACHED */ + if (BUFSIZ == i || (*src && *(src + 1))) + return(0); + + buf[i] = '\0'; + + switch (*src) { + case ('c'): + unit = SCALE_CM; + break; + case ('i'): + unit = SCALE_IN; + break; + case ('P'): + unit = SCALE_PC; + break; + case ('p'): + unit = SCALE_PT; + break; + case ('f'): + unit = SCALE_FS; + break; + case ('v'): + unit = SCALE_VS; + break; + case ('m'): + unit = SCALE_EM; + break; + case ('\0'): + if (SCALE_MAX == def) + return(0); + unit = SCALE_BU; + break; + case ('u'): + unit = SCALE_BU; + break; + case ('M'): + unit = SCALE_MM; + break; + case ('n'): + unit = SCALE_EN; + break; + default: + return(0); + } + + if ((dst->scale = atof(buf)) < 0) + dst->scale = 0; + dst->unit = unit; + dst->pt = hasd; + + return(1); } -int -out_a2width(const char *p) +/* + * Correctly writes the time in nroff form, which differs from standard + * form in that a space isn't printed in lieu of the extra %e field for + * single-digit dates. + */ +void +time2a(time_t t, char *dst, size_t sz) { - int i, len; + struct tm tm; + char buf[5]; + char *p; + size_t nsz; - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; + assert(sz > 1); + localtime_r(&t, &tm); - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p) + 2); + p = dst; + nsz = 0; - return(len + 2); + dst[0] = '\0'; + + if (0 == (nsz = strftime(p, sz, "%B ", &tm))) + return; + + p += (int)nsz; + sz -= nsz; + + if (0 == strftime(buf, sizeof(buf), "%e, ", &tm)) + return; + + nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz); + + if (nsz >= sz) + return; + + p += (int)nsz; + sz -= nsz; + + (void)strftime(p, sz, "%Y", &tm); } +/* Returns length of parsed string. */ int -out_a2offs(const char *p, int indent) +a2roffdeco(enum roffdeco *d, + const char **word, size_t *sz) { - int len, i; + int j, type, sv, t, lim; + const char *wp; - if (0 == strcmp(p, "left")) - return(0); - if (0 == strcmp(p, "indent")) - return(indent + 1); - if (0 == strcmp(p, "indent-two")) - return((indent + 1) * 2); + *d = DECO_NONE; + wp = *word; + type = 1; - if (0 == (len = (int)strlen(p))) + switch (*wp) { + case ('\0'): return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) + case ('('): + wp++; + if ('\0' == *wp) + return(1); + if ('\0' == *(wp + 1)) + return(2); + + *d = DECO_SPECIAL; + *sz = 2; + *word = wp; + return(3); + + case ('*'): + wp++; + + switch (*wp) { + case ('\0'): + return(1); + + case ('('): + wp++; + if ('\0' == *wp) + return(2); + if ('\0' == *(wp + 1)) + return(3); + + *d = DECO_RESERVED; + *sz = 2; + *word = wp; + return(4); + + case ('['): + type = 0; break; - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); + default: + *d = DECO_RESERVED; + *sz = 1; + *word = wp; + return(2); + } + break; - return(len); -} +#if 0 + case ('s'): + wp++; + /* This closely follows mandoc_special(). */ + if ('\0' == *wp) + return(1); + + t = 0; + lim = 1; + + if (*wp == '\'') { + lim = 0; + t = 1; + ++wp; + } else if (*wp == '[') { + lim = 0; + t = 2; + ++wp; + } else if (*wp == '(') { + lim = 2; + t = 3; + ++wp; + } + + if (*wp == '+' || *wp == '-') + ++wp; + + if (*wp == '\'') { + if (t) { + *word = wp; + return; + } + lim = 0; + t = 1; + ++wp; + } else if (*wp == '[') { + if (t) { + *word = wp; + return; + } + lim = 0; + t = 2; + ++wp; + } else if (*wp == '(') { + if (t) { + *word = wp; + return; + } + lim = 2; + t = 3; + ++wp; + } + + if ( ! isdigit((u_char)*wp)) { + *word = --wp; + return; + } + + for (j = 0; isdigit((u_char)*wp); j++) { + if (lim && j >= lim) + break; + ++wp; + } + + if (t && t < 3) { + if (1 == t && *wp != '\'') { + *word = --wp; + return; + } + if (2 == t && *wp != ']') { + *word = --wp; + return; + } + ++wp; + } + *word = --wp; + return; +#endif + + case ('f'): + wp++; + + switch (*wp) { + case ('\0'): + return(1); + case ('3'): + /* FALLTHROUGH */ + case ('B'): + *d = DECO_BOLD; + break; + case ('2'): + /* FALLTHROUGH */ + case ('I'): + *d = DECO_ITALIC; + break; + case ('P'): + *d = DECO_PREVIOUS; + break; + case ('1'): + /* FALLTHROUGH */ + case ('R'): + *d = DECO_ROMAN; + break; + default: + break; + } + + return(2); + + case ('['): + break; + + default: + *d = DECO_SPECIAL; + *word = wp; + *sz = 1; + return(1); + } + + *word = ++wp; + for (j = 0; *wp && ']' != *wp; wp++, j++) + /* Loop... */ ; + + if ('\0' == *wp) + return(j + 1); + + *d = type ? DECO_SPECIAL : DECO_RESERVED; + *sz = j; + return (j + 2); +}