Err/warn fix (schwarze@openbsd.org).

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 5709f1bf9b9ad4278b4417437242be18f7b86189..08ae01d4af13dca6f4b32bbbf594c61686991d3b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.34 2009/07/12 20:07:04 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.38 2009/07/13 07:23:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -127,7 +127,6 @@ static      int       termp__t_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_ar_pre(DECL_ARGS);
-static int       termp_at_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
@@ -148,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);
@@ -167,7 +165,6 @@ static      int       termp_sh_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
-static int       termp_st_pre(DECL_ARGS);
 static int       termp_sx_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
@@ -214,7 +211,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
-       { termp_st_pre, NULL }, /* St */ 
+       { NULL, NULL }, /* St */ 
        { termp_va_pre, NULL }, /* Va */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */
@@ -232,7 +229,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { termp_aq_pre, termp_aq_post }, /* Aq */
-       { termp_at_pre, NULL }, /* At */
+       { NULL, NULL }, /* At */
        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */
@@ -283,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 */ 
@@ -574,16 +571,15 @@ 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);
 }
 
 
@@ -729,6 +725,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. */
 
@@ -755,7 +752,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) {
@@ -771,6 +768,8 @@ termp_it_pre(DECL_ARGS)
                if (width < 5)
                        width = 5;
                break;
+       case (MDOC_Hang):
+               /* FALLTHROUGH */
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;
@@ -788,6 +787,8 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Diag):
                term_word(p, "\\ ");
                /* FALLTHROUGH */
+       case (MDOC_Hang):
+               /* FALLTHROUGH */
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;
@@ -829,11 +830,17 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
+       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 && MDOC_Tag == type)
                        if (NULL == node->next ||
                                        NULL == node->next->child)
@@ -875,6 +882,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;
@@ -957,6 +966,7 @@ termp_it_post(DECL_ARGS)
                return;
 
        type = arg_listtype(node->parent->parent->parent);
+       assert(-1 != type);
 
        switch (type) {
        case (MDOC_Diag):
@@ -1041,18 +1051,6 @@ termp_pp_pre(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_st_pre(DECL_ARGS)
-{
-       const char      *cp;
-
-       if (node->child && (cp = mdoc_a2st(node->child->string)))
-               term_word(p, cp);
-       return(0);
-}
-
-
 /* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)
@@ -1297,23 +1295,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)
@@ -1836,24 +1817,6 @@ termp_in_post(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_at_pre(DECL_ARGS)
-{
-       const char      *att;
-
-       att = NULL;
-
-       if (node->child)
-               att = mdoc_a2att(node->child->string);
-       if (NULL == att)
-               att = "AT&T UNIX";
-
-       term_word(p, att);
-       return(0);
-}
-
-
 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)