=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.99 retrieving revision 1.106 diff -u -p -r1.99 -r1.106 --- mandoc/term.c 2009/09/16 09:41:24 1.99 +++ mandoc/term.c 2009/10/18 13:34:17 1.106 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.99 2009/09/16 09:41:24 kristaps Exp $ */ +/* $Id: term.c,v 1.106 2009/10/18 13:34:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -20,14 +20,15 @@ #include #include +#include "chars.h" #include "term.h" #include "man.h" #include "mdoc.h" +#include "main.h" +#include "out.h" -extern void man_run(struct termp *, - const struct man *); -extern void mdoc_run(struct termp *, - const struct mdoc *); +/* FIXME: accomodate non-breaking, non-collapsing white-space. */ +/* FIXME: accomodate non-breaking, collapsing white-space. */ static struct termp *term_alloc(enum termenc); static void term_free(struct termp *); @@ -39,8 +40,6 @@ static void do_reserved(struct termp *, const char *, size_t); static void buffer(struct termp *, char); static void encode(struct termp *, char); -static int isopendelim(const char *); -static int isclosedelim(const char *); void * @@ -52,32 +51,6 @@ ascii_alloc(void) void -terminal_man(void *arg, const struct man *man) -{ - struct termp *p; - - p = (struct termp *)arg; - if (NULL == p->symtab) - p->symtab = term_ascii2htab(); - - man_run(p, man); -} - - -void -terminal_mdoc(void *arg, const struct mdoc *mdoc) -{ - struct termp *p; - - p = (struct termp *)arg; - if (NULL == p->symtab) - p->symtab = term_ascii2htab(); - - mdoc_run(p, mdoc); -} - - -void terminal_free(void *arg) { @@ -91,8 +64,8 @@ term_free(struct termp *p) if (p->buf) free(p->buf); - if (TERMENC_ASCII == p->enc && p->symtab) - term_asciifree(p->symtab); + if (p->symtab) + chars_free(p->symtab); free(p); } @@ -112,62 +85,6 @@ term_alloc(enum termenc enc) } -static int -isclosedelim(const char *p) -{ - - if ( ! (*p && 0 == *(p + 1))) - return(0); - - switch (*p) { - case('.'): - /* FALLTHROUGH */ - case(','): - /* FALLTHROUGH */ - case(';'): - /* FALLTHROUGH */ - case(':'): - /* FALLTHROUGH */ - case('?'): - /* FALLTHROUGH */ - case('!'): - /* FALLTHROUGH */ - case(')'): - /* FALLTHROUGH */ - case(']'): - /* FALLTHROUGH */ - case('}'): - return(1); - default: - break; - } - - return(0); -} - - -static int -isopendelim(const char *p) -{ - - if ( ! (*p && 0 == *(p + 1))) - return(0); - - switch (*p) { - case('('): - /* FALLTHROUGH */ - case('['): - /* FALLTHROUGH */ - case('{'): - return(1); - default: - break; - } - - return(0); -} - - /* * Flush a line of text. A "line" is loosely defined as being something * that should be followed by a newline, regardless of whether it's @@ -213,7 +130,7 @@ void term_flushln(struct termp *p) { int i, j; - size_t vbl, vsz, vis, maxvis, mmax, bp; + size_t vbl, vsz, vis, maxvis, mmax, bp, os; static int overstep = 0; /* @@ -226,6 +143,9 @@ term_flushln(struct termp *p) assert(p->offset < p->rmargin); assert((int)(p->rmargin - p->offset) - overstep > 0); + /* Save the overstep. */ + os = (size_t)overstep; + maxvis = /* LINTED */ p->rmargin - p->offset - overstep; mmax = /* LINTED */ @@ -287,6 +207,9 @@ term_flushln(struct termp *p) putchar(' '); vis = 0; } + /* Remove the overstep width. */ + bp += os; + os = 0; } else { for (j = 0; j < (int)vbl; j++) putchar(' '); @@ -389,7 +312,7 @@ do_special(struct termp *p, const char *word, size_t l size_t sz; int i; - rhs = term_a2ascii(p->symtab, word, len, &sz); + rhs = chars_a2ascii(p->symtab, word, len, &sz); if (NULL == rhs) { #if 0 @@ -412,7 +335,7 @@ do_reserved(struct termp *p, const char *word, size_t size_t sz; int i; - rhs = term_a2res(p->symtab, word, len, &sz); + rhs = chars_a2res(p->symtab, word, len, &sz); if (NULL == rhs) { #if 0 @@ -542,24 +465,58 @@ term_word(struct termp *p, const char *word) { const char *sv; - if (isclosedelim(word)) - if ( ! (TERMP_IGNDELIM & p->flags)) - p->flags |= TERMP_NOSPACE; + sv = word; + if (word[0] && 0 == word[1]) + switch (word[0]) { + case('.'): + /* FALLTHROUGH */ + case(','): + /* FALLTHROUGH */ + case(';'): + /* FALLTHROUGH */ + case(':'): + /* FALLTHROUGH */ + case('?'): + /* FALLTHROUGH */ + case('!'): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case(']'): + /* FALLTHROUGH */ + case('}'): + if ( ! (TERMP_IGNDELIM & p->flags)) + p->flags |= TERMP_NOSPACE; + break; + default: + break; + } + if ( ! (TERMP_NOSPACE & p->flags)) buffer(p, ' '); if ( ! (p->flags & TERMP_NONOSPACE)) p->flags &= ~TERMP_NOSPACE; - for (sv = word; *word; word++) + for ( ; *word; word++) if ('\\' != *word) encode(p, *word); else do_escaped(p, &word); - if (isopendelim(sv)) - p->flags |= TERMP_NOSPACE; + if (sv[0] && 0 == sv[1]) + switch (sv[0]) { + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + p->flags |= TERMP_NOSPACE; + break; + default: + break; + } } @@ -602,3 +559,85 @@ encode(struct termp *p, char c) } buffer(p, c); } + + +int +a2height(const char *p) +{ + struct roffsu su; + double r; + + if ( ! a2roffsu(p, &su)) + return(-1); + + switch (su.unit) { + case (SCALE_CM): + r = su.scale * 2; + break; + case (SCALE_IN): + r = su.scale * 6; + break; + case (SCALE_PC): + r = su.scale; + break; + case (SCALE_PT): + r = su.scale / 8; + break; + case (SCALE_MM): + r = su.scale / 1000; + break; + case (SCALE_VS): + r = su.scale; + break; + default: + r = su.scale - 1; + break; + } + + if (r < 0.0) + r = 0.0; + return(/* LINTED */(int) + r); +} + + +int +a2width(const char *p) +{ + struct roffsu su; + double r; + + if ( ! a2roffsu(p, &su)) + return(-1); + + switch (su.unit) { + case (SCALE_CM): + r = (4 * su.scale) + 2; /* FIXME: double-check. */ + break; + case (SCALE_IN): + r = (10 * su.scale) + 2; /* FIXME: double-check. */ + break; + case (SCALE_PC): + r = (10 * su.scale) / 6; /* FIXME: double-check. */ + break; + case (SCALE_PT): + r = (10 * su.scale) / 72; /* FIXME: double-check. */ + break; + case (SCALE_MM): + r = su.scale / 1000; /* FIXME: double-check. */ + break; + case (SCALE_VS): + r = su.scale * 2 - 1; /* FIXME: double-check. */ + break; + default: + r = su.scale + 2; + break; + } + + if (r < 0.0) + r = 0.0; + return((int)/* LINTED */ + r); +} + +