Lint-check (removed unused variable).

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 08ae01d4af13dca6f4b32bbbf594c61686991d3b..41338aa576cd5317de9720790796fec4060206b6 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.38 2009/07/13 07:23:07 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.44 2009/07/17 10:56:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -130,6 +130,7 @@ static      int       termp_ar_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
+static int       termp_br_pre(DECL_ARGS);
 static int       termp_brq_pre(DECL_ARGS);
 static int       termp_bt_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
@@ -292,6 +293,8 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* En */ 
        { termp_xx_pre, NULL }, /* Dx */ 
        { NULL, NULL }, /* %Q */ 
+       { termp_br_pre, NULL }, /* br */
+       { NULL, NULL }, /* sp */ 
 };
 
 #ifdef __linux__
@@ -407,7 +410,7 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
 
        tm = localtime(&meta->date);
 
-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+       if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
                err(1, "strftime");
 
        (void)strlcpy(os, meta->os, p->rmargin);
@@ -517,28 +520,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);
 }
 
 
@@ -586,18 +587,31 @@ arg_listtype(const struct mdoc_node *n)
 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);
 }
 
 
@@ -700,7 +714,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)
@@ -769,7 +783,9 @@ termp_it_pre(DECL_ARGS)
                        width = 5;
                break;
        case (MDOC_Hang):
-               /* FALLTHROUGH */
+               if (0 == width)
+                       width = 8;
+               break;
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;
@@ -784,11 +800,6 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
-       case (MDOC_Diag):
-               term_word(p, "\\ ");
-               /* FALLTHROUGH */
-       case (MDOC_Hang):
-               /* FALLTHROUGH */
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;
@@ -829,22 +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):
-               /* FALLTHROUGH */
-       case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->flags |= TERMP_NOBREAK;
                else
                        p->flags |= TERMP_NOLPAD;
 
-               if (MDOC_HEAD == node->type && MDOC_Hang == type)
-                       p->flags |= TERMP_NONOBREAK;
+               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) {
@@ -902,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)++;
@@ -925,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.
         */
@@ -970,6 +988,7 @@ termp_it_post(DECL_ARGS)
 
        switch (type) {
        case (MDOC_Diag):
+               term_word(p, "\\ ");
                /* FALLTHROUGH */
        case (MDOC_Item):
                /* FALLTHROUGH */
@@ -1122,13 +1141,8 @@ termp_nd_pre(DECL_ARGS)
        if (MDOC_BODY != node->type)
                return(1);
 
-       /* 
-        * XXX: signed off by jmc@openbsd.org.  This technically
-        * produces a minus sign after the Nd, which is wrong, but is
-        * consistent with the historic OpenBSD tmac file.
-        */
 #if defined(__OpenBSD__) || defined(__linux__)
-       term_word(p, "\\-");
+       term_word(p, "\\(en");
 #else
        term_word(p, "\\(em");
 #endif
@@ -1817,6 +1831,16 @@ termp_in_post(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static int
+termp_br_pre(DECL_ARGS)
+{
+
+       term_newln(p);
+       return(1);
+}
+
+
 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)