`Sm' no longer produces a linebreak when used in `Bd'.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index bde3aa0768123fc1725b5d59c6dc145438c13ac3..f9a02fda594ebd619bfbc5d363b7c7e182e1f880 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,6 @@
-/*     $Id: man_term.c,v 1.74 2010/06/09 08:07:13 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.85 2010/09/15 14:36:16 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * 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


@@ -70,8 +70,8 @@ struct        termact {
 #define        MAN_NOTEXT       (1 << 0) /* Never has text children. */
 };
 
 #define        MAN_NOTEXT       (1 << 0) /* Never has text children. */
 };
 

-static int               a2width(const struct man_node *);
-static int               a2height(const struct man_node *);
+static int               a2width(const struct termp *, const char *);
+static size_t            a2height(const struct termp *, const char *);

 
 static void              print_man_nodelist(DECL_ARGS);
 static void              print_man_node(DECL_ARGS);
 
 static void              print_man_nodelist(DECL_ARGS);
 static void              print_man_node(DECL_ARGS);


@@ -92,10 +92,9 @@ static       int               pre_RS(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);

-static int               pre_br(DECL_ARGS);
-static int               pre_fi(DECL_ARGS);

 static int               pre_ign(DECL_ARGS);
 static int               pre_ign(DECL_ARGS);

-static int               pre_nf(DECL_ARGS);
+static int               pre_in(DECL_ARGS);
+static int               pre_literal(DECL_ARGS);

 static int               pre_sp(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);


@@ -106,7 +105,7 @@ static      void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {
 static void              post_TP(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {

-       { pre_br, NULL, MAN_NOTEXT }, /* br */
+       { pre_sp, NULL, MAN_NOTEXT }, /* br */

        { NULL, NULL, 0 }, /* TH */
        { pre_SH, post_SH, 0 }, /* SH */
        { pre_SS, post_SS, 0 }, /* SS */
        { NULL, NULL, 0 }, /* TH */
        { pre_SH, post_SH, 0 }, /* SH */
        { pre_SS, post_SS, 0 }, /* SS */


@@ -130,8 +129,8 @@ static      const struct termact termacts[MAN_MAX] = {
        { NULL, NULL, MAN_NOTEXT }, /* na */
        { pre_I, NULL, 0 }, /* i */
        { pre_sp, NULL, MAN_NOTEXT }, /* sp */
        { NULL, NULL, MAN_NOTEXT }, /* na */
        { pre_I, NULL, 0 }, /* i */
        { pre_sp, NULL, MAN_NOTEXT }, /* sp */

-       { pre_nf, NULL, 0 }, /* nf */
-       { pre_fi, NULL, 0 }, /* fi */
+       { pre_literal, NULL, 0 }, /* nf */
+       { pre_literal, NULL, 0 }, /* fi */

        { NULL, NULL, 0 }, /* r */
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */
        { NULL, NULL, 0 }, /* r */
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */


@@ -139,9 +138,10 @@ static     const struct termact termacts[MAN_MAX] = {
        { pre_ign, NULL, 0 }, /* UC */
        { pre_ign, NULL, 0 }, /* PD */
        { pre_sp, NULL, MAN_NOTEXT }, /* Sp */
        { pre_ign, NULL, 0 }, /* UC */
        { pre_ign, NULL, 0 }, /* PD */
        { pre_sp, NULL, MAN_NOTEXT }, /* Sp */

-       { pre_nf, NULL, 0 }, /* Vb */
-       { pre_fi, NULL, 0 }, /* Ve */
+       { pre_literal, NULL, 0 }, /* Vb */
+       { pre_literal, NULL, 0 }, /* Ve */

        { pre_ign, NULL, 0 }, /* AT */
        { pre_ign, NULL, 0 }, /* AT */

+       { pre_in, NULL, MAN_NOTEXT }, /* in */

 };
 
 
 };
 
 


@@ -158,8 +158,7 @@ terminal_man(void *arg, const struct man *man)
 
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
 
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;

-
-       term_begin(p, print_man_head, print_man_foot, man_meta(man));
+       p->tabwidth = term_len(p, 5);

 
        if (NULL == p->symtab)
                switch (p->enc) {
 
        if (NULL == p->symtab)
                switch (p->enc) {


@@ -174,11 +173,12 @@ terminal_man(void *arg, const struct man *man)
        n = man_node(man);
        m = man_meta(man);
 
        n = man_node(man);
        m = man_meta(man);
 

+       term_begin(p, print_man_head, print_man_foot, m);

        p->flags |= TERMP_NOSPACE;
 
        mt.fl = 0;
        p->flags |= TERMP_NOSPACE;
 
        mt.fl = 0;

-       mt.lmargin = INDENT;
-       mt.offset = INDENT;
+       mt.lmargin = term_len(p, INDENT);
+       mt.offset = term_len(p, INDENT);

 
        if (n->child)
                print_man_nodelist(p, &mt, n->child, m);
 
        if (n->child)
                print_man_nodelist(p, &mt, n->child, m);


@@ -187,31 +187,27 @@ terminal_man(void *arg, const struct man *man)
 }
 
 
 }
 
 

-static int
-a2height(const struct man_node *n)
+static size_t
+a2height(const struct termp *p, const char *cp)

 {
        struct roffsu    su;
 
 {
        struct roffsu    su;
 

-       assert(MAN_TEXT == n->type);
-       assert(n->string);
-       if ( ! a2roffsu(n->string, &su, SCALE_VS))
-               SCALE_VS_INIT(&su, strlen(n->string));
+       if ( ! a2roffsu(cp, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, term_strlen(p, cp));

 
 

-       return((int)term_vspan(&su));
+       return(term_vspan(p, &su));

 }
 
 
 static int
 }
 
 
 static int

-a2width(const struct man_node *n)
+a2width(const struct termp *p, const char *cp)

 {
        struct roffsu    su;
 
 {
        struct roffsu    su;
 

-       assert(MAN_TEXT == n->type);
-       assert(n->string);
-       if ( ! a2roffsu(n->string, &su, SCALE_BU))
+       if ( ! a2roffsu(cp, &su, SCALE_BU))

                return(-1);
 
                return(-1);
 

-       return((int)term_hspan(&su));
+       return((int)term_hspan(p, &su));

 }
 
 
 }
 
 


@@ -253,23 +249,25 @@ pre_I(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-pre_fi(DECL_ARGS)
+pre_literal(DECL_ARGS)

 {
 
 {
 

-       mt->fl &= ~MANT_LITERAL;
+       term_newln(p);
+       switch (n->tok) {
+       case (MAN_Vb):
+               /* FALLTHROUGH */
+       case (MAN_nf):
+               mt->fl |= MANT_LITERAL;
+               return(MAN_Vb != n->tok);
+       default:
+               mt->fl &= ~MANT_LITERAL;
+               break;
+       }
+

        return(1);
 }
 
 
        return(1);
 }
 
 

-/* ARGSUSED */
-static int
-pre_nf(DECL_ARGS)
-{
-
-       mt->fl |= MANT_LITERAL;
-       return(MAN_Vb != n->tok);
-}
-

 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int


@@ -357,16 +355,40 @@ pre_B(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-pre_sp(DECL_ARGS)
+pre_in(DECL_ARGS)

 {
 {

-       int              i, len;
+       int              len, less;
+       size_t           v;
+       const char      *cp;

 
 

-       len = n->child ? a2height(n->child) : 1;
+       term_newln(p);

 
 

-       if (0 == len)
-               term_newln(p);
-       for (i = 0; i <= len; i++)
-               term_vspace(p);
+       if (NULL == n->child) {
+               p->offset = mt->offset;
+               return(0);
+       }
+
+       cp = n->child->string;
+       less = 0;
+
+       if ('-' == *cp)
+               less = -1;
+       else if ('+' == *cp)
+               less = 1;
+       else
+               cp--;
+
+       if ((len = a2width(p, ++cp)) < 0)
+               return(0);
+
+       v = (size_t)len;
+
+       if (less < 0)
+               p->offset -= p->offset > v ? v : p->offset;
+       else if (less > 0)
+               p->offset += v;
+       else 
+               p->offset = v;

 
        return(0);
 }
 
        return(0);
 }


@@ -374,10 +396,24 @@ pre_sp(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-pre_br(DECL_ARGS)
+pre_sp(DECL_ARGS)

 {
 {

+       size_t           i, len;
+
+       switch (n->tok) {
+       case (MAN_br):
+               len = 0;
+               break;
+       default:
+               len = n->child ? a2height(p, n->child->string) : 1;
+               break;
+       }
+
+       if (0 == len)
+               term_newln(p);
+       for (i = 0; i < len; i++)
+               term_vspace(p);

 
 

-       term_newln(p);

        return(0);
 }
 
        return(0);
 }
 


@@ -408,11 +444,11 @@ pre_HP(DECL_ARGS)
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))

-               if ((ival = a2width(nn)) >= 0)
+               if ((ival = a2width(p, nn->string)) >= 0)

                        len = (size_t)ival;
 
        if (0 == len)
                        len = (size_t)ival;
 
        if (0 == len)

-               len = 1;
+               len = term_len(p, 1);

 
        p->offset = mt->offset;
        p->rmargin = mt->offset + len;
 
        p->offset = mt->offset;
        p->rmargin = mt->offset + len;


@@ -453,7 +489,7 @@ pre_PP(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->lmargin = INDENT;
+               mt->lmargin = term_len(p, INDENT);

                print_bvspace(p, n);
                break;
        default:
                print_bvspace(p, n);
                break;
        default:


@@ -497,7 +533,7 @@ pre_IP(DECL_ARGS)
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
                                /* Do nothing. */ ;
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
                                /* Do nothing. */ ;

-                       if ((ival = a2width(nn)) >= 0)
+                       if ((ival = a2width(p, nn->string)) >= 0)

                                len = (size_t)ival;
                }
 
                                len = (size_t)ival;
                }
 


@@ -505,7 +541,7 @@ pre_IP(DECL_ARGS)
        case (MAN_HEAD):
                /* Handle zero-width lengths. */
                if (0 == len)
        case (MAN_HEAD):
                /* Handle zero-width lengths. */
                if (0 == len)

-                       len = 1;
+                       len = term_len(p, 1);

 
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;
 
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;


@@ -585,7 +621,7 @@ pre_TP(DECL_ARGS)
                while (nn && MAN_TEXT != nn->type)
                        nn = nn->next;
                if (nn && nn->next)
                while (nn && MAN_TEXT != nn->type)
                        nn = nn->next;
                if (nn && nn->next)

-                       if ((ival = a2width(nn)) >= 0)
+                       if ((ival = a2width(p, nn->string)) >= 0)

                                len = (size_t)ival;
        }
 
                                len = (size_t)ival;
        }
 


@@ -593,7 +629,7 @@ pre_TP(DECL_ARGS)
        case (MAN_HEAD):
                /* Handle zero-length properly. */
                if (0 == len)
        case (MAN_HEAD):
                /* Handle zero-length properly. */
                if (0 == len)

-                       len = 1;
+                       len = term_len(p, 1);

 
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;
 
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;


@@ -648,8 +684,8 @@ pre_SS(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->lmargin = INDENT;
-               mt->offset = INDENT;
+               mt->lmargin = term_len(p, INDENT);
+               mt->offset = term_len(p, INDENT);

                /* If following a prior empty `SS', no vspace. */
                if (n->prev && MAN_SS == n->prev->tok)
                        if (NULL == n->prev->body->child)
                /* If following a prior empty `SS', no vspace. */
                if (n->prev && MAN_SS == n->prev->tok)
                        if (NULL == n->prev->body->child)


@@ -660,7 +696,7 @@ pre_SS(DECL_ARGS)
                break;
        case (MAN_HEAD):
                term_fontrepl(p, TERMFONT_BOLD);
                break;
        case (MAN_HEAD):
                term_fontrepl(p, TERMFONT_BOLD);

-               p->offset = HALFINDENT;
+               p->offset = term_len(p, HALFINDENT);

                break;
        case (MAN_BODY):
                p->offset = mt->offset;
                break;
        case (MAN_BODY):
                p->offset = mt->offset;


@@ -698,8 +734,8 @@ pre_SH(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->lmargin = INDENT;
-               mt->offset = INDENT;
+               mt->lmargin = term_len(p, INDENT);
+               mt->offset = term_len(p, INDENT);

                /* If following a prior empty `SH', no vspace. */
                if (n->prev && MAN_SH == n->prev->tok)
                        if (NULL == n->prev->body->child)
                /* If following a prior empty `SH', no vspace. */
                if (n->prev && MAN_SH == n->prev->tok)
                        if (NULL == n->prev->body->child)


@@ -760,15 +796,15 @@ pre_RS(DECL_ARGS)
        }
 
        if (NULL == (nn = n->parent->head->child)) {
        }
 
        if (NULL == (nn = n->parent->head->child)) {

-               mt->offset = mt->lmargin + INDENT;
+               mt->offset = mt->lmargin + term_len(p, INDENT);

                p->offset = mt->offset;
                return(1);
        }
 
                p->offset = mt->offset;
                return(1);
        }
 

-       if ((ival = a2width(nn)) < 0)
+       if ((ival = a2width(p, nn->string)) < 0)

                return(1);
 
                return(1);
 

-       mt->offset = INDENT + (size_t)ival;
+       mt->offset = term_len(p, INDENT) + (size_t)ival;

        p->offset = mt->offset;
 
        return(1);
        p->offset = mt->offset;
 
        return(1);


@@ -782,13 +818,13 @@ post_RS(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->offset = mt->lmargin = INDENT;
+               mt->offset = mt->lmargin = term_len(p, INDENT);

                break;
        case (MAN_HEAD):
                break;
        default:
                term_newln(p);
                break;
        case (MAN_HEAD):
                break;
        default:
                term_newln(p);

-               p->offset = INDENT;
+               p->offset = term_len(p, INDENT);

                break;
        }
 }
                break;
        }
 }


@@ -877,9 +913,13 @@ print_man_foot(struct termp *p, const void *arg)
        term_vspace(p);
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        term_vspace(p);
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

-       p->rmargin = p->maxrmargin - strlen(buf);
+       p->rmargin = p->maxrmargin - term_strlen(p, buf);

        p->offset = 0;
 
        p->offset = 0;
 

+       /* term_strlen() can return zero. */
+       if (p->rmargin == p->maxrmargin)
+               p->rmargin--;
+

        if (meta->source)
                term_word(p, meta->source);
        if (meta->source)
        if (meta->source)
                term_word(p, meta->source);
        if (meta->source)


@@ -918,14 +958,15 @@ print_man_head(struct termp *p, const void *arg)
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);

-       buflen = strlen(buf);
+       buflen = term_strlen(p, buf);

 
        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
 
        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);

-       titlen = strlen(title);
+       titlen = term_strlen(p, title);

 
        p->offset = 0;
        p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
 
        p->offset = 0;
        p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?

-           (p->maxrmargin - strlen(buf) + 1) / 2 :
+           (p->maxrmargin - 
+            term_strlen(p, buf) + term_len(p, 1)) / 2 :

            p->maxrmargin - buflen;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
            p->maxrmargin - buflen;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;