In -Tman .Bl -compact, skip the blank line only before the first item

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 1ee33ece179b5170e7342dfad7080f4a0d49fdf9..26292b98f2359dc78d55873f870a1a3a4ddaa692 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,7 +1,7 @@
-/*     $Id: term.c,v 1.200 2011/09/19 22:36:16 schwarze Exp $ */
+/*     $Id: term.c,v 1.204 2012/07/10 15:35:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2011, 2012 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
@@ -33,6 +33,7 @@
 #include "term.h"
 #include "main.h"
 
+static size_t           cond_width(const struct termp *, int, int *);
 static void             adjbuf(struct termp *p, int);
 static void             bufferc(struct termp *, char);
 static void             encode(struct termp *, const char *, size_t);
@@ -184,14 +185,12 @@ term_flushln(struct termp *p)
                if (vend > bp && 0 == jhy && vis > 0) {
                        vend -= vis;
                        (*p->endline)(p);
+                       p->viscol = 0;
                        if (TERMP_NOBREAK & p->flags) {
-                               p->viscol = p->rmargin;
-                               (*p->advance)(p, p->rmargin);
+                               vbl = p->rmargin;
                                vend += p->rmargin - p->offset;
-                       } else {
-                               p->viscol = 0;
+                       } else
                                vbl = p->offset;
-                       }
 
                        /* Remove the p->overstep width. */
 
@@ -266,16 +265,11 @@ term_flushln(struct termp *p)
                p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
 
                /*
-                * Behave exactly the same way as groff:
                 * If we have overstepped the margin, temporarily move
                 * it to the right and flag the rest of the line to be
                 * shorter.
-                * If we landed right at the margin, be happy.
-                * If we are one step before the margin, temporarily
-                * move it one step LEFT and flag the rest of the line
-                * to be longer.
                 */
-               if (p->overstep < -1)
+               if (p->overstep < 0)
                        p->overstep = 0;
                return;
 
@@ -318,7 +312,10 @@ term_vspace(struct termp *p)
 
        term_newln(p);
        p->viscol = 0;
-       (*p->endline)(p);
+       if (0 < p->skipvsp)
+               p->skipvsp--;
+       else
+               (*p->endline)(p);
 }
 
 void
@@ -418,12 +415,17 @@ term_word(struct termp *p, const char *word)
        p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
 
        while ('\0' != *word) {
-               if ((ssz = strcspn(word, "\\")) > 0)
+               if ('\\' != *word) {
+                       if (TERMP_SKIPCHAR & p->flags) {
+                               p->flags &= ~TERMP_SKIPCHAR;
+                               word++;
+                               continue;
+                       }
+                       ssz = strcspn(word, "\\");
                        encode(p, word, ssz);
-
-               word += (int)ssz;
-               if ('\\' != *word)
+                       word += (int)ssz;
                        continue;
+               }
 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
@@ -479,9 +481,14 @@ term_word(struct termp *p, const char *word)
                        term_fontlast(p);
                        break;
                case (ESCAPE_NOSPACE):
-                       if ('\0' == *word)
+                       if (TERMP_SKIPCHAR & p->flags)
+                               p->flags &= ~TERMP_SKIPCHAR;
+                       else if ('\0' == *word)
                                p->flags |= TERMP_NOSPACE;
                        break;
+               case (ESCAPE_SKIPCHAR):
+                       p->flags |= TERMP_SKIPCHAR;
+                       break;
                default:
                        break;
                }
@@ -521,6 +528,11 @@ encode1(struct termp *p, int c)
 {
        enum termfont     f;
 
+       if (TERMP_SKIPCHAR & p->flags) {
+               p->flags &= ~TERMP_SKIPCHAR;
+               return;
+       }
+
        if (p->col + 4 >= p->maxcols)
                adjbuf(p, p->col + 4);
 
@@ -544,6 +556,11 @@ encode(struct termp *p, const char *word, size_t sz)
        enum termfont     f;
        int               i, len;
 
+       if (TERMP_SKIPCHAR & p->flags) {
+               p->flags &= ~TERMP_SKIPCHAR;
+               return;
+       }
+
        /* LINTED */
        len = sz;
 
@@ -592,12 +609,22 @@ term_len(const struct termp *p, size_t sz)
        return((*p->width)(p, ' ') * sz);
 }
 
+static size_t
+cond_width(const struct termp *p, int c, int *skip)
+{
+
+       if (*skip) {
+               (*skip) = 0;
+               return(0);
+       } else
+               return((*p->width)(p, c));
+}
 
 size_t
 term_strlen(const struct termp *p, const char *cp)
 {
        size_t           sz, rsz, i;
-       int              ssz, c;
+       int              ssz, skip, c;
        const char      *seq, *rhs;
        enum mandoc_esc  esc;
        static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' };
@@ -609,10 +636,11 @@ term_strlen(const struct termp *p, const char *cp)
         */
 
        sz = 0;
+       skip = 0;
        while ('\0' != *cp) {
                rsz = strcspn(cp, rej);
                for (i = 0; i < rsz; i++)
-                       sz += (*p->width)(p, *cp++);
+                       sz += cond_width(p, *cp++, &skip);
 
                c = 0;
                switch (*cp) {
@@ -629,14 +657,14 @@ term_strlen(const struct termp *p, const char *cp)
                                                (seq + 1, ssz - 1);
                                        if ('\0' == c)
                                                break;
-                                       sz += (*p->width)(p, c);
+                                       sz += cond_width(p, c, &skip);
                                        continue;
                                case (ESCAPE_SPECIAL):
                                        c = mchars_spec2cp
                                                (p->symtab, seq, ssz);
                                        if (c <= 0)
                                                break;
-                                       sz += (*p->width)(p, c);
+                                       sz += cond_width(p, c, &skip);
                                        continue;
                                default:
                                        break;
@@ -646,12 +674,12 @@ term_strlen(const struct termp *p, const char *cp)
 
                        switch (esc) {
                        case (ESCAPE_UNICODE):
-                               sz += (*p->width)(p, '?');
+                               sz += cond_width(p, '?', &skip);
                                break;
                        case (ESCAPE_NUMBERED):
                                c = mchars_num2char(seq, ssz);
                                if ('\0' != c)
-                                       sz += (*p->width)(p, c);
+                                       sz += cond_width(p, c, &skip);
                                break;
                        case (ESCAPE_SPECIAL):
                                rhs = mchars_spec2str
@@ -663,6 +691,9 @@ term_strlen(const struct termp *p, const char *cp)
                                rhs = seq;
                                rsz = ssz;
                                break;
+                       case (ESCAPE_SKIPCHAR):
+                               skip = 1;
+                               break;
                        default:
                                break;
                        }
@@ -670,15 +701,20 @@ term_strlen(const struct termp *p, const char *cp)
                        if (NULL == rhs)
                                break;
 
+                       if (skip) {
+                               skip = 0;
+                               break;
+                       }
+
                        for (i = 0; i < rsz; i++)
                                sz += (*p->width)(p, *rhs++);
                        break;
                case (ASCII_NBRSP):
-                       sz += (*p->width)(p, ' ');
+                       sz += cond_width(p, ' ', &skip);
                        cp++;
                        break;
                case (ASCII_HYPH):
-                       sz += (*p->width)(p, '-');
+                       sz += cond_width(p, '-', &skip);
                        cp++;
                        break;
                default: