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

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index b4dfa3df5002a39754994483aa03b7fbfa70f59d..08ae01d4af13dca6f4b32bbbf594c61686991d3b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.30 2009/07/12 17:49:32 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>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -80,93 +80,99 @@ const       int ttypes[TTYPE_NMAX] = {
        TERMP_BOLD              /* TTYPE_LIST */
 };
 
        TERMP_BOLD              /* TTYPE_LIST */
 };
 

-/* 
- * This is used to preserve a style of value across a macro, instead of
- * losing it while the body is processed.
- */

 struct termpair {
        struct termpair  *ppair;
 struct termpair {
        struct termpair  *ppair;

-       int               flag;         /* Cross-body struct termp:flags. */
-       int               count;        /* Enum count. */
+       int               flag; 
+       int               count;

 };
 
 };
 

-#define        DECL_ARGS \
-       struct termp *p, struct termpair *pair, \
-       const struct mdoc_meta *meta, \
-       const struct mdoc_node *node
-
-#define        DECL_PRE(name) \
-static int               name##_pre(DECL_ARGS)
-#define        DECL_POST(name) \
-static void              name##_post(DECL_ARGS)
-#define        DECL_PREPOST(name) \
-DECL_PRE(name); \
-DECL_POST(name);
-
-DECL_PREPOST(termp__t);
-DECL_PREPOST(termp_aq);
-DECL_PREPOST(termp_bd);
-DECL_PREPOST(termp_bq);
-DECL_PREPOST(termp_brq);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_fo);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_in);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_lb);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_pq);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp__j);
-DECL_PRE(termp_ap);
-DECL_PRE(termp_ar);
-DECL_PRE(termp_at);
-DECL_PRE(termp_bf);
-DECL_PRE(termp_bt);
-DECL_PRE(termp_cd);
-DECL_PRE(termp_cm);
-DECL_PRE(termp_em);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_fa);
-DECL_PRE(termp_fl);
-DECL_PRE(termp_ic);
-DECL_PRE(termp_lk);
-DECL_PRE(termp_ms);
-DECL_PRE(termp_mt);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_nm);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_xx);
-DECL_PRE(termp_pa);
-DECL_PRE(termp_pp);
-DECL_PRE(termp_rs);
-DECL_PRE(termp_rv);
-DECL_PRE(termp_sm);
-DECL_PRE(termp_st);
-DECL_PRE(termp_sx);
-DECL_PRE(termp_sy);
-DECL_PRE(termp_ud);
-DECL_PRE(termp_va);
-DECL_PRE(termp_xr);
-
-DECL_POST(termp___);
-DECL_POST(termp_bl);
-DECL_POST(termp_bx);
+#define        DECL_ARGS struct termp *p, \
+                 struct termpair *pair, \
+                 const struct mdoc_meta *meta, \
+                 const struct mdoc_node *node

 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 
 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 

+static void      termp____post(DECL_ARGS);
+static void      termp__t_post(DECL_ARGS);
+static void      termp_aq_post(DECL_ARGS);
+static void      termp_bd_post(DECL_ARGS);
+static void      termp_bl_post(DECL_ARGS);
+static void      termp_bq_post(DECL_ARGS);
+static void      termp_brq_post(DECL_ARGS);
+static void      termp_bx_post(DECL_ARGS);
+static void      termp_d1_post(DECL_ARGS);
+static void      termp_dq_post(DECL_ARGS);
+static void      termp_fd_post(DECL_ARGS);
+static void      termp_fn_post(DECL_ARGS);
+static void      termp_fo_post(DECL_ARGS);
+static void      termp_ft_post(DECL_ARGS);
+static void      termp_in_post(DECL_ARGS);
+static void      termp_it_post(DECL_ARGS);
+static void      termp_lb_post(DECL_ARGS);
+static void      termp_op_post(DECL_ARGS);
+static void      termp_pf_post(DECL_ARGS);
+static void      termp_pq_post(DECL_ARGS);
+static void      termp_qq_post(DECL_ARGS);
+static void      termp_sh_post(DECL_ARGS);
+static void      termp_sq_post(DECL_ARGS);
+static void      termp_ss_post(DECL_ARGS);
+static void      termp_vt_post(DECL_ARGS);
+
+static int       termp__j_pre(DECL_ARGS);
+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_bd_pre(DECL_ARGS);
+static int       termp_bf_pre(DECL_ARGS);
+static int       termp_bq_pre(DECL_ARGS);
+static int       termp_brq_pre(DECL_ARGS);
+static int       termp_bt_pre(DECL_ARGS);
+static int       termp_cd_pre(DECL_ARGS);
+static int       termp_cm_pre(DECL_ARGS);
+static int       termp_d1_pre(DECL_ARGS);
+static int       termp_dq_pre(DECL_ARGS);
+static int       termp_em_pre(DECL_ARGS);
+static int       termp_ex_pre(DECL_ARGS);
+static int       termp_fa_pre(DECL_ARGS);
+static int       termp_fd_pre(DECL_ARGS);
+static int       termp_fl_pre(DECL_ARGS);
+static int       termp_fn_pre(DECL_ARGS);
+static int       termp_fo_pre(DECL_ARGS);
+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_lk_pre(DECL_ARGS);
+static int       termp_ms_pre(DECL_ARGS);
+static int       termp_mt_pre(DECL_ARGS);
+static int       termp_nd_pre(DECL_ARGS);
+static int       termp_nm_pre(DECL_ARGS);
+static int       termp_ns_pre(DECL_ARGS);
+static int       termp_op_pre(DECL_ARGS);
+static int       termp_pa_pre(DECL_ARGS);
+static int       termp_pf_pre(DECL_ARGS);
+static int       termp_pp_pre(DECL_ARGS);
+static int       termp_pq_pre(DECL_ARGS);
+static int       termp_qq_pre(DECL_ARGS);
+static int       termp_rs_pre(DECL_ARGS);
+static int       termp_rv_pre(DECL_ARGS);
+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_sx_pre(DECL_ARGS);
+static int       termp_sy_pre(DECL_ARGS);
+static int       termp_ud_pre(DECL_ARGS);
+static int       termp_va_pre(DECL_ARGS);
+static int       termp_vt_pre(DECL_ARGS);
+static int       termp_xr_pre(DECL_ARGS);
+static int       termp_xx_pre(DECL_ARGS);
+

 static const struct termact termacts[MDOC_MAX] = {
        { termp_ap_pre, NULL }, /* Ap */
        { NULL, NULL }, /* Dd */
 static const struct termact termacts[MDOC_MAX] = {
        { termp_ap_pre, NULL }, /* Ap */
        { NULL, NULL }, /* Dd */


@@ -205,7 +211,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { 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 */
        { termp_va_pre, NULL }, /* Va */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */


@@ -223,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 */
        { 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 */
        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */


@@ -274,7 +280,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
        { 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 */ 
        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 


@@ -318,7 +324,6 @@ mdoc_run(struct termp *p, const struct mdoc *m)
         * Main output function.  When this is called, assume that the
         * tree is properly formed.
         */
         * Main output function.  When this is called, assume that the
         * tree is properly formed.
         */

-

        print_head(p, mdoc_meta(m));
        assert(mdoc_node(m));
        assert(MDOC_ROOT == mdoc_node(m)->type);
        print_head(p, mdoc_meta(m));
        assert(mdoc_node(m));
        assert(MDOC_ROOT == mdoc_node(m)->type);


@@ -566,16 +571,15 @@ arg_listtype(const struct mdoc_node *n)
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        /* FALLTHROUGH */

+               case (MDOC_Hang):
+                       /* FALLTHROUGH */

                case (MDOC_Ohang):
                        return(n->args->argv[i].arg);
                default:
                        break;
                }
 
                case (MDOC_Ohang):
                        return(n->args->argv[i].arg);
                default:
                        break;
                }
 

-       /* FIXME: mandated by parser. */
-
-       errx(1, "list type not supported");
-       /* NOTREACHED */
+       return(-1);

 }
 
 
 }
 
 


@@ -721,6 +725,7 @@ termp_it_pre(DECL_ARGS)
        (void)arg_getattrs(keys, vals, 3, bl);
 
        type = arg_listtype(bl);
        (void)arg_getattrs(keys, vals, 3, bl);
 
        type = arg_listtype(bl);

+       assert(-1 != type);

 
        /* Calculate real width and offset. */
 
 
        /* Calculate real width and offset. */
 


@@ -747,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
        /* 
         * 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) {
         */
 
        switch (type) {


@@ -763,6 +768,8 @@ termp_it_pre(DECL_ARGS)
                if (width < 5)
                        width = 5;
                break;
                if (width < 5)
                        width = 5;
                break;

+       case (MDOC_Hang):
+               /* FALLTHROUGH */

        case (MDOC_Tag):
                if (0 == width)
                        width = 10;
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;


@@ -780,6 +787,8 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Diag):
                term_word(p, "\\ ");
                /* FALLTHROUGH */
        case (MDOC_Diag):
                term_word(p, "\\ ");
                /* FALLTHROUGH */

+       case (MDOC_Hang):
+               /* FALLTHROUGH */

        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;


@@ -821,11 +830,17 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
                /* 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;
        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)
                if (MDOC_HEAD == node->type && MDOC_Tag == type)
                        if (NULL == node->next ||
                                        NULL == node->next->child)


@@ -867,6 +882,8 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */

+       case (MDOC_Hang):
+               /* FALLTHROUGH */

        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->rmargin = p->offset + width;
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->rmargin = p->offset + width;


@@ -949,6 +966,7 @@ termp_it_post(DECL_ARGS)
                return;
 
        type = arg_listtype(node->parent->parent->parent);
                return;
 
        type = arg_listtype(node->parent->parent->parent);

+       assert(-1 != type);

 
        switch (type) {
        case (MDOC_Diag):
 
        switch (type) {
        case (MDOC_Diag):


@@ -1033,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)
 /* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)


@@ -1062,12 +1068,9 @@ termp_rv_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser. */
-
-       if (-1 == (i = arg_getattr(MDOC_Std, node)))
-               errx(1, "expected -std argument");
-       if (1 != node->args->argv[i].sz)
-               errx(1, "expected -std argument");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

 
        term_newln(p);
        term_word(p, "The");
 
        term_newln(p);
        term_word(p, "The");


@@ -1097,12 +1100,9 @@ termp_ex_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser? */
-
-       if (-1 == (i = arg_getattr(MDOC_Std, node)))
-               errx(1, "expected -std argument");
-       if (1 != node->args->argv[i].sz)
-               errx(1, "expected -std argument");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

 
        term_word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];
 
        term_word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];


@@ -1196,7 +1196,11 @@ static void
 termp_vt_post(DECL_ARGS)
 {
 
 termp_vt_post(DECL_ARGS)
 {
 

-       if (node->sec == SEC_SYNOPSIS)
+       if (node->sec != SEC_SYNOPSIS)
+               return;
+       if (node->next && MDOC_Vt == node->next->tok)
+               term_newln(p);
+       else if (node->next)

                term_vspace(p);
 }
 
                term_vspace(p);
 }
 


@@ -1291,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)
 /* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)


@@ -1830,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)
 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)


@@ -1929,14 +1898,13 @@ termp_fo_pre(DECL_ARGS)
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {

+               p->flags |= TERMP_NOSPACE;

                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
        } else if (MDOC_HEAD != node->type) 
                return(1);
 
                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
        } else if (MDOC_HEAD != node->type) 
                return(1);
 

-       /* XXX - groff shows only first parameter */
-

        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);