=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.139 retrieving revision 1.151 diff -u -p -r1.139 -r1.151 --- mandoc/term.c 2010/05/24 21:51:20 1.139 +++ mandoc/term.c 2010/06/27 01:26:20 1.151 @@ -1,6 +1,6 @@ -/* $Id: term.c,v 1.139 2010/05/24 21:51:20 schwarze Exp $ */ +/* $Id: term.c,v 1.151 2010/06/27 01:26:20 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,21 +22,17 @@ #include #include +#include #include #include #include -#include #include "mandoc.h" #include "chars.h" #include "out.h" #include "term.h" -#include "man.h" -#include "mdoc.h" #include "main.h" -static struct termp *term_alloc(enum termenc, size_t); -static void term_free(struct termp *); static void spec(struct termp *, const char *, size_t); static void res(struct termp *, const char *, size_t); static void buffera(struct termp *, const char *, size_t); @@ -45,51 +41,51 @@ static void adjbuf(struct termp *p, size_t); static void encode(struct termp *, const char *, size_t); -void * -ascii_alloc(size_t width) +void +term_free(struct termp *p) { - return(term_alloc(TERMENC_ASCII, width)); + if (p->buf) + free(p->buf); + if (p->symtab) + chars_free(p->symtab); + + free(p); } void -terminal_free(void *arg) +term_begin(struct termp *p, term_margin head, + term_margin foot, const void *arg) { - term_free((struct termp *)arg); + p->headf = head; + p->footf = foot; + p->argf = arg; + (*p->begin)(p); } -static void -term_free(struct termp *p) +void +term_end(struct termp *p) { - if (p->buf) - free(p->buf); - if (p->symtab) - chars_free(p->symtab); - - free(p); + (*p->end)(p); } -static struct termp * -term_alloc(enum termenc enc, size_t width) +struct termp * +term_alloc(enum termenc enc) { - struct termp *p; + struct termp *p; p = calloc(1, sizeof(struct termp)); if (NULL == p) { perror(NULL); exit(EXIT_FAILURE); } - p->tabwidth = 5; + p->enc = enc; - /* Enforce some lower boundary. */ - if (width < 60) - width = 60; - p->defrmargin = width - 2; return(p); } @@ -138,6 +134,7 @@ term_flushln(struct termp *p) size_t vend; /* end of word visual position on output */ size_t bp; /* visual right border position */ int j; /* temporary loop index */ + int jhy; /* last hyphen before line overflow */ size_t maxvis, mmax; /* @@ -190,26 +187,28 @@ term_flushln(struct termp *p) */ /* LINTED */ - for ( ; j < (int)p->col; j++) { + for (jhy = 0; j < (int)p->col; j++) { if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) break; - if (8 == p->buf[j]) - vend--; - else + if (8 != p->buf[j]) { + if (vend > vis && vend < bp && + ASCII_HYPH == p->buf[j]) + jhy = j; vend++; + } else + vend--; } /* * Find out whether we would exceed the right margin. * If so, break to the next line. */ - if (vend > bp && vis > 0) { + if (vend > bp && 0 == jhy && vis > 0) { vend -= vis; - putchar('\n'); + (*p->endline)(p); if (TERMP_NOBREAK & p->flags) { p->viscol = p->rmargin; - for (j = 0; j < (int)p->rmargin; j++) - putchar(' '); + (*p->advance)(p, p->rmargin); vend += p->rmargin - p->offset; } else { p->viscol = 0; @@ -231,6 +230,8 @@ term_flushln(struct termp *p) /* Write out the [remaining] word. */ for ( ; i < (int)p->col; i++) { + if (vend > bp && jhy > 0 && i > jhy) + break; if ('\t' == p->buf[i]) break; if (' ' == p->buf[i]) { @@ -251,12 +252,16 @@ term_flushln(struct termp *p) * so write preceding white space now. */ if (vbl) { - for (j = 0; j < (int)vbl; j++) - putchar(' '); + (*p->advance)(p, vbl); p->viscol += vbl; vbl = 0; } - putchar(p->buf[i]); + + if (ASCII_HYPH == p->buf[i]) + (*p->letter)(p, '-'); + else + (*p->letter)(p, p->buf[i]); + p->viscol += 1; } vend += vbl; @@ -268,7 +273,7 @@ term_flushln(struct termp *p) if ( ! (TERMP_NOBREAK & p->flags)) { p->viscol = 0; - putchar('\n'); + (*p->endline)(p); return; } @@ -301,13 +306,12 @@ term_flushln(struct termp *p) if (maxvis > vis + /* LINTED */ ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) { p->viscol += maxvis - vis; - for ( ; vis < maxvis; vis++) - putchar(' '); + (*p->advance)(p, maxvis - vis); + vis += (maxvis - vis); } else { /* ...or newline break. */ - putchar('\n'); + (*p->endline)(p); p->viscol = p->rmargin; - for (i = 0; i < (int)p->rmargin; i++) - putchar(' '); + (*p->advance)(p, p->rmargin); } } @@ -343,7 +347,7 @@ term_vspace(struct termp *p) term_newln(p); p->viscol = 0; - putchar('\n'); + (*p->endline)(p); } @@ -476,9 +480,14 @@ term_word(struct termp *p, const char *word) } if ( ! (TERMP_NOSPACE & p->flags)) { - bufferc(p, ' '); - if (TERMP_SENTENCE & p->flags) + if ( ! (TERMP_KEEP & p->flags)) { + if (TERMP_PREKEEP & p->flags) + p->flags |= TERMP_KEEP; bufferc(p, ' '); + if (TERMP_SENTENCE & p->flags) + bufferc(p, ' '); + } else + bufferc(p, ASCII_NBRSP); } if ( ! (p->flags & TERMP_NONOSPACE)) @@ -618,8 +627,28 @@ encode(struct termp *p, const char *word, size_t sz) size_t -term_vspan(const struct roffsu *su) +term_len(const struct termp *p, size_t sz) { + + return((*p->width)(p, ' ') * sz); +} + + +size_t +term_strlen(const struct termp *p, const char *cp) +{ + size_t sz; + + for (sz = 0; *cp; cp++) + sz += (*p->width)(p, *cp); + + return(sz); +} + + +size_t +term_vspan(const struct termp *p, const struct roffsu *su) +{ double r; switch (su->unit) { @@ -654,7 +683,7 @@ term_vspan(const struct roffsu *su) size_t -term_hspan(const struct roffsu *su) +term_hspan(const struct termp *p, const struct roffsu *su) { double r;