.Bl -column phrases ignore spacing rules for trailing punctuation

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 31e91e92b37e25a4228ba8c3a3c2740b5a3fb229..41c6c65556bbec0aed4135fb4287a407a181a07f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,6 +1,7 @@
-/*     $Id: term.c,v 1.153 2010/06/28 22:46:21 kristaps Exp $ */
+/*     $Id: term.c,v 1.167 2010/08/20 01:02:07 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,9 +34,9 @@
 #include "term.h"
 #include "main.h"
 
 #include "term.h"
 #include "main.h"
 

-static void              spec(struct termp *, const char *, size_t);
+static void              spec(struct termp *, enum roffdeco,
+                               const char *, size_t);

 static void              res(struct termp *, const char *, size_t);
 static void              res(struct termp *, const char *, size_t);

-static void              buffera(struct termp *, const char *, size_t);

 static void              bufferc(struct termp *, char);
 static void              adjbuf(struct termp *p, size_t);
 static void              encode(struct termp *, const char *, size_t);
 static void              bufferc(struct termp *, char);
 static void              adjbuf(struct termp *p, size_t);
 static void              encode(struct termp *, const char *, size_t);


@@ -82,7 +83,7 @@ term_alloc(enum termenc enc)
        p = calloc(1, sizeof(struct termp));
        if (NULL == p) {
                perror(NULL);
        p = calloc(1, sizeof(struct termp));
        if (NULL == p) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit(MANDOCLEVEL_SYSERR);

        }
 
        p->enc = enc;
        }
 
        p->enc = enc;


@@ -161,21 +162,17 @@ term_flushln(struct termp *p)
         */
        vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
 
         */
        vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
 

-       /* 
-        * FIXME: if bp is zero, we still output the first word before
-        * breaking the line.
-        */
-

        vis = vend = i = 0;
        vis = vend = i = 0;

-       while (i < (int)p->col) {

 
 

+       while (i < (int)p->col) {

                /*
                /*

-                * Handle literal tab characters.
+                * Handle literal tab characters: collapse all
+                * subsequent tabs into a single huge set of spaces.

                 */
                for (j = i; j < (int)p->col; j++) {
                        if ('\t' != p->buf[j])
                                break;
                 */
                for (j = i; j < (int)p->col; j++) {
                        if ('\t' != p->buf[j])
                                break;

-                       vend = (vis/p->tabwidth+1)*p->tabwidth;
+                       vend = (vis / p->tabwidth + 1) * p->tabwidth;

                        vbl += vend - vis;
                        vis = vend;
                }
                        vbl += vend - vis;
                        vis = vend;
                }


@@ -191,15 +188,21 @@ term_flushln(struct termp *p)
                for (jhy = 0; j < (int)p->col; j++) {
                        if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;
                for (jhy = 0; j < (int)p->col; j++) {
                        if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;

-                       if (8 != p->buf[j]) {
-                               if (vend > vis && vend < bp &&
-                                   ASCII_HYPH == p->buf[j])
-                                       jhy = j;
-                               vend += (*p->width)(p, p->buf[j]);
-                       } else {
+
+                       /* Back over the the last printed character. */
+                       if (8 == p->buf[j]) {

                                assert(j);
                                vend -= (*p->width)(p, p->buf[j - 1]);
                                assert(j);
                                vend -= (*p->width)(p, p->buf[j - 1]);

+                               continue;

                        }
                        }

+
+                       /* Regular word. */
+                       /* Break at the hyphen point if we overrun. */
+                       if (vend > vis && vend < bp && 
+                                       ASCII_HYPH == p->buf[j])
+                               jhy = j;
+
+                       vend += (*p->width)(p, p->buf[j]);

                }
 
                /*
                }
 
                /*


@@ -238,10 +241,10 @@ term_flushln(struct termp *p)
                        if ('\t' == p->buf[i])
                                break;
                        if (' ' == p->buf[i]) {
                        if ('\t' == p->buf[i])
                                break;
                        if (' ' == p->buf[i]) {

-                               while (' ' == p->buf[i]) {
-                                       vbl += (*p->width)(p, p->buf[i]);
+                               j = i;
+                               while (' ' == p->buf[i])

                                        i++;
                                        i++;

-                               }
+                               vbl += (i - j) * (*p->width)(p, ' ');

                                break;
                        }
                        if (ASCII_NBRSP == p->buf[i]) {
                                break;
                        }
                        if (ASCII_NBRSP == p->buf[i]) {


@@ -308,7 +311,8 @@ term_flushln(struct termp *p)
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */

-                       ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
+                       ((TERMP_TWOSPACE & p->flags) ? 
+                        (*p->width)(p, ' ') : 0)) {

                p->viscol += maxvis - vis;
                (*p->advance)(p, maxvis - vis);
                vis += (maxvis - vis);
                p->viscol += maxvis - vis;
                (*p->advance)(p, maxvis - vis);
                vis += (maxvis - vis);


@@ -356,14 +360,16 @@ term_vspace(struct termp *p)
 
 
 static void
 
 
 static void

-spec(struct termp *p, const char *word, size_t len)
+spec(struct termp *p, enum roffdeco d, const char *word, size_t len)

 {
        const char      *rhs;
        size_t           sz;
 
 {
        const char      *rhs;
        size_t           sz;
 

-       rhs = chars_a2ascii(p->symtab, word, len, &sz);
+       rhs = chars_spec2str(p->symtab, word, len, &sz);

        if (rhs) 
                encode(p, rhs, sz);
        if (rhs) 
                encode(p, rhs, sz);

+       else if (DECO_SSPECIAL == d)
+               encode(p, word, len);

 }
 
 
 }
 
 


@@ -373,7 +379,7 @@ res(struct termp *p, const char *word, size_t len)
        const char      *rhs;
        size_t           sz;
 
        const char      *rhs;
        size_t           sz;
 

-       rhs = chars_a2res(p->symtab, word, len, &sz);
+       rhs = chars_res2str(p->symtab, word, len, &sz);

        if (rhs)
                encode(p, rhs, sz);
 }
        if (rhs)
                encode(p, rhs, sz);
 }


@@ -496,17 +502,18 @@ term_word(struct termp *p, const char *word)
 
        if ( ! (p->flags & TERMP_NONOSPACE))
                p->flags &= ~TERMP_NOSPACE;
 
        if ( ! (p->flags & TERMP_NONOSPACE))
                p->flags &= ~TERMP_NOSPACE;

+       else
+               p->flags |= TERMP_NOSPACE;

 
        p->flags &= ~TERMP_SENTENCE;
 
 
        p->flags &= ~TERMP_SENTENCE;
 

-       /* FIXME: use strcspn. */
-

        while (*word) {
        while (*word) {

-               if ('\\' != *word) {
-                       encode(p, word, 1);
-                       word++;
+               if ((ssz = strcspn(word, "\\")) > 0)
+                       encode(p, word, ssz);
+
+               word += ssz;
+               if ('\\' != *word)

                        continue;
                        continue;

-               }

 
                seq = ++word;
                sz = a2roffdeco(&deco, &seq, &ssz);
 
                seq = ++word;
                sz = a2roffdeco(&deco, &seq, &ssz);


@@ -516,7 +523,9 @@ term_word(struct termp *p, const char *word)
                        res(p, seq, ssz);
                        break;
                case (DECO_SPECIAL):
                        res(p, seq, ssz);
                        break;
                case (DECO_SPECIAL):

-                       spec(p, seq, ssz);
+                       /* FALLTHROUGH */
+               case (DECO_SSPECIAL):
+                       spec(p, deco, seq, ssz);

                        break;
                case (DECO_BOLD):
                        term_fontrepl(p, TERMFONT_BOLD);
                        break;
                case (DECO_BOLD):
                        term_fontrepl(p, TERMFONT_BOLD);


@@ -543,7 +552,7 @@ term_word(struct termp *p, const char *word)
         * Note that we don't process the pipe: the parser sees it as
         * punctuation, but we don't in terms of typography.
         */
         * Note that we don't process the pipe: the parser sees it as
         * punctuation, but we don't in terms of typography.
         */

-       if (sv[0] && 0 == sv[1])
+       if (sv[0] && '\0' == sv[1])

                switch (sv[0]) {
                case('('):
                        /* FALLTHROUGH */
                switch (sv[0]) {
                case('('):
                        /* FALLTHROUGH */


@@ -568,23 +577,11 @@ adjbuf(struct termp *p, size_t sz)
        p->buf = realloc(p->buf, p->maxcols);
        if (NULL == p->buf) {
                perror(NULL);
        p->buf = realloc(p->buf, p->maxcols);
        if (NULL == p->buf) {
                perror(NULL);

-               exit(EXIT_FAILURE);
+               exit(MANDOCLEVEL_SYSERR);

        }
 }
 
 
        }
 }
 
 

-static void
-buffera(struct termp *p, const char *word, size_t sz)
-{
-
-       if (p->col + sz >= p->maxcols) 
-               adjbuf(p, p->col + sz);
-
-       memcpy(&p->buf[(int)p->col], word, sz);
-       p->col += sz;
-}
-
-

 static void
 bufferc(struct termp *p, char c)
 {
 static void
 bufferc(struct termp *p, char c)
 {


@@ -609,23 +606,31 @@ encode(struct termp *p, const char *word, size_t sz)
         */
 
        if (TERMFONT_NONE == (f = term_fonttop(p))) {
         */
 
        if (TERMFONT_NONE == (f = term_fonttop(p))) {

-               buffera(p, word, sz);
+               if (p->col + sz >= p->maxcols) 
+                       adjbuf(p, p->col + sz);
+               memcpy(&p->buf[(int)p->col], word, sz);
+               p->col += sz;

                return;
        }
 
                return;
        }
 

+       /* Pre-buffer, assuming worst-case. */
+
+       if (p->col + 1 + (sz * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (sz * 3));
+

        for (i = 0; i < (int)sz; i++) {
                if ( ! isgraph((u_char)word[i])) {
        for (i = 0; i < (int)sz; i++) {
                if ( ! isgraph((u_char)word[i])) {

-                       bufferc(p, word[i]);
+                       p->buf[(int)p->col++] = word[i];

                        continue;
                }
 
                if (TERMFONT_UNDER == f)
                        continue;
                }
 
                if (TERMFONT_UNDER == f)

-                       bufferc(p, '_');
+                       p->buf[(int)p->col++] = '_';

                else
                else

-                       bufferc(p, word[i]);
+                       p->buf[(int)p->col++] = word[i];

 
 

-               bufferc(p, 8);
-               bufferc(p, word[i]);
+               p->buf[(int)p->col++] = 8;
+               p->buf[(int)p->col++] = word[i];

        }
 }
 
        }
 }
 


@@ -650,6 +655,7 @@ term_strlen(const struct termp *p, const char *cp)
 }
 
 
 }
 
 

+/* ARGSUSED */

 size_t
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
 size_t
 term_vspan(const struct termp *p, const struct roffsu *su)
 {


@@ -689,39 +695,11 @@ term_vspan(const struct termp *p, const struct roffsu *su)
 size_t
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
 size_t
 term_hspan(const struct termp *p, const struct roffsu *su)
 {

-       double           r;
+       double           v;

 
 

-       /* XXX: CM, IN, and PT are approximations. */
-
-       switch (su->unit) {
-       case (SCALE_CM):
-               r = 4 * su->scale;
-               break;
-       case (SCALE_IN):
-               /* XXX: this is an approximation. */
-               r = 10 * su->scale;
-               break;
-       case (SCALE_PC):
-               r = (10 * su->scale) / 6;
-               break;
-       case (SCALE_PT):
-               r = (10 * su->scale) / 72;
-               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;
-               break;
-       }
-
-       if (r < 0.0)
-               r = 0.0;
-       return((size_t)/* LINTED */
-                       r);
+       v = ((*p->hspan)(p, su));
+       if (v < 0.0)
+               v = 0.0;
+       return((size_t) /* LINTED */
+                       v);

 }
 }

-
-