=================================================================== RCS file: /cvs/mandoc/Attic/mdocterm.c,v retrieving revision 1.17 retrieving revision 1.23 diff -u -p -r1.17 -r1.23 --- mandoc/Attic/mdocterm.c 2009/02/27 09:14:02 1.17 +++ mandoc/Attic/mdocterm.c 2009/03/01 23:23:55 1.23 @@ -1,4 +1,4 @@ -/* $Id: mdocterm.c,v 1.17 2009/02/27 09:14:02 kristaps Exp $ */ +/* $Id: mdocterm.c,v 1.23 2009/03/01 23:23:55 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,6 +16,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -110,7 +112,7 @@ main(int argc, char *argv[]) if (NULL == (mdoc = mmain_mdoc(p))) mmain_exit(p, 1); - termp.maxrmargin = 80; /* XXX */ + termp.maxrmargin = 78; /* XXX */ termp.rmargin = termp.maxrmargin; termp.maxcols = 1024; termp.offset = termp.col = 0; @@ -171,9 +173,10 @@ flushln(struct termp *p) for (i = 0; i < p->col; i++) { /* * Count up visible word characters. Control sequences - * (starting with the CSI) aren't counted. + * (starting with the CSI) aren't counted. A space + * generates a non-printing word, which is valid (the + * space is printed according to regular spacing rules). */ - assert( ! xisspace(p->buf[i])); /* LINTED */ for (j = i, vsz = 0; j < p->col; j++) { @@ -185,26 +188,29 @@ flushln(struct termp *p) } else vsz++; } - assert(vsz > 0); /* + * If we're breaking normally... + * * If a word is too long and we're within a line, put it * on the next line. Puke if we're being asked to write * something that will exceed the right margin (i.e., - * from a fresh line or when we're not allowed to break - * the line with TERMP_NOBREAK). + * from a fresh line). + * + * If we're not breaking... + * + * Don't let the visible size exceed the full margin. */ - /* FIXME: allow selective right-margin breaking. */ - - if (vis && vis + vsz > maxvis) { - if (p->flags & TERMP_NOBREAK) + if ( ! (TERMP_NOBREAK & p->flags)) { + if (vis && vis + vsz > maxvis) { + putchar('\n'); + for (j = 0; j < p->offset; j++) + putchar(' '); + vis = 0; + } else if (vis + vsz > maxvis) errx(1, "word breaks right margin"); - putchar('\n'); - for (j = 0; j < p->offset; j++) - putchar(' '); - vis = 0; - } else if (vis + vsz > maxvis) + } else if (vis + vsz > p->maxrmargin) errx(1, "word breaks right margin"); /* @@ -224,15 +230,22 @@ flushln(struct termp *p) } } + if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) { + putchar('\n'); + for (i = 0; i < p->rmargin; i++) + putchar(' '); + p->col = 0; + return; + } + /* * If we're not to right-marginalise it (newline), then instead * pad to the right margin and stay off. */ if (p->flags & TERMP_NOBREAK) { - if ( ! (p->flags & TERMP_NORPAD)) - for ( ; vis < maxvis; vis++) - putchar(' '); + for ( ; vis < maxvis; vis++) + putchar(' '); } else putchar('\n'); @@ -463,6 +476,10 @@ pescape(struct termp *p, const char *word, size_t *i, /* FALLTHROUGH */ case ('.'): chara(p, word[*i]); + break; + case ('e'): + chara(p, '\\'); + break; default: break; } @@ -482,8 +499,6 @@ pword(struct termp *p, const char *word, size_t len) { size_t i; - /*assert(len > 0);*/ /* Can be, if literal. */ - /* * Handle pwords, partial words, which may be either a single * word or a phrase that cannot be broken down (such as a @@ -552,7 +567,14 @@ word(struct termp *p, const char *word) if ( ! xisspace(word[i])) { j++; continue; + } + + /* Escaped spaces don't delimit... */ + if (i > 0 && xisspace(word[i]) && '\\' == word[i - 1]) { + j++; + continue; } + if (0 == j) continue; assert(i >= j); @@ -674,15 +696,21 @@ footer(struct termp *p, const struct mdoc_meta *meta) static void header(struct termp *p, const struct mdoc_meta *meta) { - char *buf, *title, *bufp; + char *buf, *title, *bufp, *vbuf; const char *pp; + struct utsname uts; + p->rmargin = p->maxrmargin; + p->offset = 0; + if (NULL == (buf = malloc(p->rmargin))) err(1, "malloc"); if (NULL == (title = malloc(p->rmargin))) err(1, "malloc"); + if (NULL == (vbuf = malloc(p->rmargin))) + err(1, "malloc"); - if (NULL == (pp = mdoc_vol2a(meta->vol))) + if (NULL == (pp = mdoc_vol2a(meta->vol))) { switch (meta->msec) { case (MSEC_1): /* FALLTHROUGH */ @@ -707,12 +735,21 @@ header(struct termp *p, const struct mdoc_meta *meta) pp = mdoc_vol2a(VOL_KM); break; default: - /* FIXME: capitalise. */ - if (NULL == (pp = mdoc_msec2a(meta->msec))) - pp = mdoc_msec2a(MSEC_local); break; } + } + vbuf[0] = 0; + if (pp) { + if (-1 == uname(&uts)) + err(1, "uname"); + (void)strlcat(vbuf, uts.sysname, p->rmargin); + (void)strlcat(vbuf, " ", p->rmargin); + } else if (NULL == (pp = mdoc_msec2a(meta->msec))) + pp = mdoc_msec2a(MSEC_local); + + (void)strlcat(vbuf, pp, p->rmargin); + /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -728,9 +765,9 @@ header(struct termp *p, const struct mdoc_meta *meta) if (mdoc_arch2a(meta->arch)) (void)snprintf(buf, p->rmargin, "%s (%s)", - pp, mdoc_arch2a(meta->arch)); + vbuf, mdoc_arch2a(meta->arch)); else - (void)strlcpy(buf, pp, p->rmargin); + (void)strlcpy(buf, vbuf, p->rmargin); pp = mdoc_msec2a(meta->msec); @@ -767,5 +804,6 @@ header(struct termp *p, const struct mdoc_meta *meta) p->flags &= ~TERMP_NOSPACE; free(title); + free(vbuf); free(buf); }