Cleaned up arg_width and arg_column functions.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 122e353470f43cd5637f53e3998c44425bf3c243..1a59a3a0257a304ee0ad5041a09a29804f950fc3 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.36 2009/07/12 20:30:35 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.40 2009/07/14 15:49:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -147,7 +147,6 @@ static      int       termp_ft_pre(DECL_ARGS);
 static int       termp_ic_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
-static int       termp_lb_pre(DECL_ARGS);
 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_ms_pre(DECL_ARGS);
 static int       termp_mt_pre(DECL_ARGS);
@@ -281,7 +280,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
-       { termp_lb_pre, termp_lb_post }, /* Lb */
+       { NULL, termp_lb_post }, /* Lb */
        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 
@@ -518,28 +517,26 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {
-       size_t           v;
        int              i, len;
+       const char      *p;
 
        assert(pos < (int)arg->sz && pos >= 0);
        assert(arg->value[pos]);
 
-       if (0 == (len = (int)strlen(arg->value[pos])))
+       p = arg->value[pos];
+
+       if (0 == (len = (int)strlen(p)))
                return(0);
 
        for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)arg->value[pos][i]))
+               if ( ! isdigit((u_char)p[i]))
                        break;
 
-       if (i == len - 1) {
-               if ('n' == arg->value[pos][len - 1] ||
-                               'm' == arg->value[pos][len - 1]) {
-                       v = (size_t)atoi(arg->value[pos]);
-                       return(v + 2);
-               }
+       if (i == len - 1) 
+               if ('n' == p[len - 1] || 'm' == p[len - 1])
+                       return((size_t)atoi(p) + 2);
 
-       }
-       return(strlen(arg->value[pos]) + 2);
+       return((size_t)len + 2);
 }
 
 
@@ -572,34 +569,46 @@ arg_listtype(const struct mdoc_node *n)
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        /* FALLTHROUGH */
+               case (MDOC_Hang):
+                       /* FALLTHROUGH */
                case (MDOC_Ohang):
                        return(n->args->argv[i].arg);
                default:
                        break;
                }
 
-       /* FIXME: mandated by parser. */
-
-       errx(1, "list type not supported");
-       /* NOTREACHED */
+       return(-1);
 }
 
 
 static size_t
 arg_offset(const struct mdoc_argv *arg)
 {
+       int              len, i;
+       const char      *p;
 
        assert(*arg->value);
-       if (0 == strcmp(*arg->value, "left"))
+       p = *arg->value;
+
+       if (0 == strcmp(p, "left"))
                return(0);
-       if (0 == strcmp(*arg->value, "indent"))
+       if (0 == strcmp(p, "indent"))
                return(INDENT + 1);
-       if (0 == strcmp(*arg->value, "indent-two"))
+       if (0 == strcmp(p, "indent-two"))
                return((INDENT + 1) * 2);
 
-       /* FIXME: needs to support field-widths (10n, etc.). */
+       if (0 == (len = (int)strlen(p)))
+               return(0);
+
+       for (i = 0; i < len - 1; i++) 
+               if ( ! isdigit((u_char)p[i]))
+                       break;
+
+       if (i == len - 1) 
+               if ('n' == p[len - 1] || 'm' == p[len - 1])
+                       return((size_t)atoi(p));
 
-       return(strlen(*arg->value));
+       return((size_t)len);
 }
 
 
@@ -702,7 +711,7 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *n;
        char                    buf[7];
-       int                     i, type, keys[3], vals[3], sv;
+       int                     i, type, keys[3], vals[3];
        size_t                  width, offset;
 
        if (MDOC_BLOCK == node->type)
@@ -727,6 +736,7 @@ termp_it_pre(DECL_ARGS)
        (void)arg_getattrs(keys, vals, 3, bl);
 
        type = arg_listtype(bl);
+       assert(-1 != type);
 
        /* Calculate real width and offset. */
 
@@ -753,7 +763,7 @@ termp_it_pre(DECL_ARGS)
        /* 
         * List-type can override the width in the case of fixed-head
         * values (bullet, dash/hyphen, enum).  Tags need a non-zero
-        * offset.
+        * offset.  FIXME: double-check that correct.
         */
 
        switch (type) {
@@ -769,6 +779,10 @@ termp_it_pre(DECL_ARGS)
                if (width < 5)
                        width = 5;
                break;
+       case (MDOC_Hang):
+               if (0 == width)
+                       width = 8;
+               break;
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;
@@ -826,16 +840,30 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Enum):
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
-               /* FALLTHROUGH */
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOLPAD;
+               break;
+       case (MDOC_Hang):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOLPAD;
+
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_HANG;
+               break;
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->flags |= TERMP_NOBREAK;
                else
                        p->flags |= TERMP_NOLPAD;
-               if (MDOC_HEAD == node->type && MDOC_Tag == type)
-                       if (NULL == node->next ||
-                                       NULL == node->next->child)
-                               p->flags |= TERMP_NONOBREAK;
+
+               if (MDOC_HEAD != node->type)
+                       break;
+               if (NULL == node->next || NULL == node->next->child)
+                       p->flags |= TERMP_DANGLE;
                break;
        case (MDOC_Column):
                if (MDOC_HEAD == node->type) {
@@ -873,6 +901,8 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
+       case (MDOC_Hang):
+               /* FALLTHROUGH */
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->rmargin = p->offset + width;
@@ -891,18 +921,19 @@ termp_it_pre(DECL_ARGS)
         * HEAD character (temporarily bold, in some cases).  
         */
 
-       sv = p->flags;
        if (MDOC_HEAD == node->type)
                switch (type) {
                case (MDOC_Bullet):
                        p->flags |= TERMP_BOLD;
                        term_word(p, "\\[bu]");
+                       p->flags &= ~TERMP_BOLD;
                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):
                        p->flags |= TERMP_BOLD;
                        term_word(p, "\\(hy");
+                       p->flags &= ~TERMP_BOLD;
                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;
@@ -914,8 +945,6 @@ termp_it_pre(DECL_ARGS)
                        break;
                }
 
-       p->flags = sv; /* Restore saved flags. */
-
        /* 
         * If we're not going to process our children, indicate so here.
         */
@@ -955,6 +984,7 @@ termp_it_post(DECL_ARGS)
                return;
 
        type = arg_listtype(node->parent->parent->parent);
+       assert(-1 != type);
 
        switch (type) {
        case (MDOC_Diag):
@@ -1283,23 +1313,6 @@ termp_bt_pre(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_lb_pre(DECL_ARGS)
-{
-       const char      *lb;
-
-       assert(node->child && MDOC_TEXT == node->child->type);
-       lb = mdoc_a2lib(node->child->string);
-       if (lb) {
-               term_word(p, lb);
-               return(0);
-       }
-       term_word(p, "library");
-       return(1);
-}
-
-
 /* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)