Smarten BADCHAR check to allow ASCII_HYPH.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 5114438055bc03acf150ffee1b42ea5f9bb7b34c..3503483af294e9fea933c53c65abc05f2beec2d7 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.125 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.130 2010/05/24 21:51:20 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -61,7 +61,6 @@ static        int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);
 static int       arg_disptype(const struct mdoc_node *);
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);
 static int       arg_disptype(const struct mdoc_node *);

-static int       arg_listtype(const struct mdoc_node *);

 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);
 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);


@@ -275,6 +274,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
 
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;

+       p->tabwidth = 5;

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


@@ -512,47 +512,6 @@ arg_disptype(const struct mdoc_node *n)
 }
 
 
 }
 
 

-static int
-arg_listtype(const struct mdoc_node *n)
-{
-       int              i, len;
-
-       assert(MDOC_BLOCK == n->type);
-
-       len = (int)(n->args ? n->args->argc : 0);
-
-       for (i = 0; i < len; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       return(n->args->argv[i].arg);
-               default:
-                       break;
-               }
-
-       return(-1);
-}
-
-

 static size_t
 a2offs(const struct mdoc_argv *arg)
 {
 static size_t
 a2offs(const struct mdoc_argv *arg)
 {


@@ -655,13 +614,13 @@ print_bvspace(struct termp *p,
 
        /* A `-column' does not assert vspace within the list. */
 
 
        /* A `-column' does not assert vspace within the list. */
 

-       if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl))
+       if (MDOC_Bl == bl->tok && LIST_column == bl->data.list)

                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 
                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 

-       if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) 
+       if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list)

                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)
                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)


@@ -705,8 +664,9 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];

-       int                     i, type, keys[3], vals[3];
+       int                     i, keys[3], vals[3];

        size_t                  width, offset, ncols, dcol;
        size_t                  width, offset, ncols, dcol;

+       enum mdoc_list          type;

 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);


@@ -725,8 +685,7 @@ termp_it_pre(DECL_ARGS)
 
        arg_getattrs(keys, vals, 3, bl);
 
 
        arg_getattrs(keys, vals, 3, bl);
 

-       type = arg_listtype(bl);
-       assert(-1 != type);
+       type = bl->data.list;

 
        /* 
         * First calculate width and offset.  This is pretty easy unless
 
        /* 
         * First calculate width and offset.  This is pretty easy unless


@@ -740,7 +699,7 @@ termp_it_pre(DECL_ARGS)
                offset = a2offs(&bl->args->argv[vals[1]]);
 
        switch (type) {
                offset = a2offs(&bl->args->argv[vals[1]]);
 
        switch (type) {

-       case (MDOC_Column):
+       case (LIST_column):

                if (MDOC_BODY == n->type)
                        break;
                /*
                if (MDOC_BODY == n->type)
                        break;
                /*


@@ -798,25 +757,25 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                if (width < 4)
                        width = 4;
                break;
                if (width < 4)
                        width = 4;
                break;

-       case (MDOC_Enum):
+       case (LIST_enum):

                if (width < 5)
                        width = 5;
                break;
                if (width < 5)
                        width = 5;
                break;

-       case (MDOC_Hang):
+       case (LIST_hang):

                if (0 == width)
                        width = 8;
                break;
                if (0 == width)
                        width = 8;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Tag):
+       case (LIST_tag):

                if (0 == width)
                        width = 10;
                break;
                if (0 == width)
                        width = 10;
                break;


@@ -832,11 +791,11 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_BODY == n->type)
                        term_word(p, "\\ \\ ");
                break;
                if (MDOC_BODY == n->type)
                        term_word(p, "\\ \\ ");
                break;

-       case (MDOC_Inset):
+       case (LIST_inset):

                if (MDOC_BODY == n->type) 
                        term_word(p, "\\ ");
                break;
                if (MDOC_BODY == n->type) 
                        term_word(p, "\\ ");
                break;


@@ -847,7 +806,7 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_HEAD == n->type)
                        term_fontpush(p, TERMFONT_BOLD);
                break;
                if (MDOC_HEAD == n->type)
                        term_fontpush(p, TERMFONT_BOLD);
                break;


@@ -863,19 +822,19 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else
                        p->flags |= TERMP_NOLPAD;
                break;
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else
                        p->flags |= TERMP_NOLPAD;
                break;

-       case (MDOC_Hang):
+       case (LIST_hang):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else


@@ -898,7 +857,7 @@ termp_it_pre(DECL_ARGS)
                } else
                        p->flags |= TERMP_HANG;
                break;
                } else
                        p->flags |= TERMP_HANG;
                break;

-       case (MDOC_Tag):
+       case (LIST_tag):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
                else
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
                else


@@ -909,7 +868,7 @@ termp_it_pre(DECL_ARGS)
                if (NULL == n->next || NULL == n->next->child)
                        p->flags |= TERMP_DANGLE;
                break;
                if (NULL == n->next || NULL == n->next->child)
                        p->flags |= TERMP_DANGLE;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                if (MDOC_HEAD == n->type) {
                        assert(n->next);
                        if (MDOC_BODY == n->next->type)
                if (MDOC_HEAD == n->type) {
                        assert(n->next);
                        if (MDOC_BODY == n->next->type)


@@ -920,7 +879,7 @@ termp_it_pre(DECL_ARGS)
                                p->flags |= TERMP_NOLPAD;
                }
                break;
                                p->flags |= TERMP_NOLPAD;
                }
                break;

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                break;
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                break;


@@ -937,7 +896,7 @@ termp_it_pre(DECL_ARGS)
        p->offset += offset;
 
        switch (type) {
        p->offset += offset;
 
        switch (type) {

-       case (MDOC_Hang):
+       case (LIST_hang):

                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when
                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when


@@ -948,22 +907,22 @@ termp_it_pre(DECL_ARGS)
                                 MDOC_Bd == n->next->child->tok))
                        break;
                /* FALLTHROUGH */
                                 MDOC_Bd == n->next->child->tok))
                        break;
                /* FALLTHROUGH */

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Tag):
+       case (LIST_tag):

                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
                else 
                        p->offset += width;
                break;
                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
                else 
                        p->offset += width;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                assert(width);
                p->rmargin = p->offset + width;
                /* 
                assert(width);
                p->rmargin = p->offset + width;
                /* 


@@ -986,19 +945,19 @@ termp_it_pre(DECL_ARGS)
 
        if (MDOC_HEAD == n->type)
                switch (type) {
 
        if (MDOC_HEAD == n->type)
                switch (type) {

-               case (MDOC_Bullet):
+               case (LIST_bullet):

                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\[bu]");
                        term_fontpop(p);
                        break;
                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\[bu]");
                        term_fontpop(p);
                        break;

-               case (MDOC_Dash):
+               case (LIST_dash):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Hyphen):
+               case (LIST_hyphen):

                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\(hy");
                        term_fontpop(p);
                        break;
                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\(hy");
                        term_fontpop(p);
                        break;

-               case (MDOC_Enum):
+               case (LIST_enum):

                        (pair->ppair->ppair->count)++;
                        snprintf(buf, sizeof(buf), "%d.", 
                                        pair->ppair->ppair->count);
                        (pair->ppair->ppair->count)++;
                        snprintf(buf, sizeof(buf), "%d.", 
                                        pair->ppair->ppair->count);


@@ -1013,19 +972,19 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Item):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

                if (MDOC_HEAD == n->type)
                        return(0);
                break;
                if (MDOC_HEAD == n->type)
                        return(0);
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                if (MDOC_BODY == n->type)
                        return(0);
                break;
                if (MDOC_BODY == n->type)
                        return(0);
                break;


@@ -1041,29 +1000,28 @@ termp_it_pre(DECL_ARGS)
 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {

-       int                type;
+       enum mdoc_list     type;

 
        if (MDOC_BLOCK == n->type)
                return;
 
 
        if (MDOC_BLOCK == n->type)
                return;
 

-       type = arg_listtype(n->parent->parent->parent);
-       assert(-1 != type);
+       type = n->parent->parent->parent->data.list;

 
        switch (type) {
 
        switch (type) {

-       case (MDOC_Item):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Diag):
+       case (LIST_diag):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Inset):
+       case (LIST_inset):

                if (MDOC_BODY == n->type)
                if (MDOC_BODY == n->type)

-                       term_flushln(p);
+                       term_newln(p);

                break;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                if (MDOC_HEAD == n->type)
                        term_flushln(p);
                break;
        default:
                if (MDOC_HEAD == n->type)
                        term_flushln(p);
                break;
        default:

-               term_flushln(p);
+               term_newln(p);

                break;
        }
 
                break;
        }
 


@@ -1087,6 +1045,7 @@ termp_nm_pre(DECL_ARGS)
 {
 
        if (NULL == n->child && NULL == m->name)
 {
 
        if (NULL == n->child && NULL == m->name)

+               return(1);

 
        if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
                term_newln(p);
 
        if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
                term_newln(p);


@@ -1635,6 +1594,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

+       size_t                   tabwidth;

        int                      i, type;
        size_t                   rm, rmax;
        const struct mdoc_node  *nn;
        int                      i, type;
        size_t                   rm, rmax;
        const struct mdoc_node  *nn;


@@ -1664,6 +1624,8 @@ termp_bd_pre(DECL_ARGS)
        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 
        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 

+       tabwidth = p->tabwidth;
+       p->tabwidth = 8;

        rm = p->rmargin;
        rmax = p->maxrmargin;
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
        rm = p->rmargin;
        rmax = p->maxrmargin;
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;


@@ -1671,13 +1633,12 @@ termp_bd_pre(DECL_ARGS)
        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;
                print_mdoc_node(p, pair, m, nn);
        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;
                print_mdoc_node(p, pair, m, nn);

-               if (NULL == nn->next)
-                       continue;
-               if (nn->prev && nn->prev->line < nn->line)
-                       term_flushln(p);
-               else if (NULL == nn->prev)
+               if (NULL == nn->prev ||
+                   nn->prev->line < nn->line ||
+                   NULL == nn->next)

                        term_flushln(p);
        }
                        term_flushln(p);
        }

+       p->tabwidth = tabwidth;

 
        p->rmargin = rm;
        p->maxrmargin = rmax;
 
        p->rmargin = rm;
        p->maxrmargin = rmax;


@@ -1705,7 +1666,7 @@ termp_bd_post(DECL_ARGS)
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;

-       term_flushln(p);
+       term_newln(p);

 
        p->rmargin = rm;
        p->maxrmargin = rmax;
 
        p->rmargin = rm;
        p->maxrmargin = rmax;