Cleanup, no functional change:

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 85135aba31beb1b8959185aac41a28425aa63bb9..7bf5ebf7f09ca9c1aa3e48cd69cf6ed333a691d7 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.151 2018/06/25 13:01:19 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.158 2018/12/03 21:00:10 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -35,13 +35,11 @@
 
 /* FIXME: have PD set the default vspace width. */
 
-#define        INDENT            5
-
 #define        MAN_ARGS          const struct roff_meta *man, \
                          const struct roff_node *n, \
                          struct html *h
 
-struct htmlman {
+struct man_html_act {
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 };
@@ -53,8 +51,6 @@ static        void              print_man_head(const struct roff_meta *,
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
 static int               fillmode(struct html *, int);
-static int               a2width(const struct roff_node *,
-                               struct roffsu *);
 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);
@@ -65,7 +61,9 @@ static        int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);
+static int               man_SY_pre(MAN_ARGS);
 static int               man_UR_pre(MAN_ARGS);
+static int               man_abort_pre(MAN_ARGS);
 static int               man_alt_pre(MAN_ARGS);
 static int               man_ign_pre(MAN_ARGS);
 static int               man_in_pre(MAN_ARGS);
@@ -74,14 +72,15 @@ static      void              man_root_post(const struct roff_meta *,
 static void              man_root_pre(const struct roff_meta *,
                                struct html *);
 
-static const struct htmlman __mans[MAN_MAX - MAN_TH] = {
+static const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
        { man_IP_pre, NULL }, /* TP */
-       { man_PP_pre, NULL }, /* LP */
+       { man_IP_pre, NULL }, /* TQ */
+       { man_abort_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
-       { man_PP_pre, NULL }, /* P */
+       { man_abort_pre, NULL }, /* P */
        { man_IP_pre, NULL }, /* IP */
        { man_HP_pre, NULL }, /* HP */
        { man_SM_pre, NULL }, /* SM */
@@ -104,6 +103,8 @@ static      const struct htmlman __mans[MAN_MAX - MAN_TH] = {
        { man_ign_pre, NULL }, /* PD */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
+       { man_SY_pre, NULL }, /* SY */
+       { NULL, NULL }, /* YS */
        { man_OP_pre, NULL }, /* OP */
        { NULL, NULL }, /* EX */
        { NULL, NULL }, /* EE */
@@ -112,7 +113,6 @@ static      const struct htmlman __mans[MAN_MAX - MAN_TH] = {
        { man_UR_pre, NULL }, /* MT */
        { NULL, NULL }, /* ME */
 };
-static const struct htmlman *const mans = __mans - MAN_TH;
 
 
 /*
@@ -235,10 +235,8 @@ print_man_node(MAN_ARGS)
                        want_fillmode = MAN_fi;
                        /* FALLTHROUGH */
                case MAN_PP:  /* These have no head.            */
-               case MAN_LP:  /* They will simply               */
-               case MAN_P:   /* reopen .nf in the body.        */
-               case MAN_RS:
-               case MAN_UR:
+               case MAN_RS:  /* They will simply               */
+               case MAN_UR:  /* reopen .nf in the body.        */
                case MAN_MT:
                        fillmode(h, MAN_fi);
                        break;
@@ -265,7 +263,7 @@ print_man_node(MAN_ARGS)
                    n->flags & NODE_LINE && *n->string == ' ' &&
                    (h->flags & HTML_NONEWLINE) == 0)
                        print_otag(h, TAG_BR, "");
-               if (*n->string != '\0')
+               if (want_fillmode == MAN_nf || *n->string != '\0')
                        break;
                print_paragraph(h);
                return;
@@ -321,8 +319,9 @@ print_man_node(MAN_ARGS)
                }
 
                assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
-               if (mans[n->tok].pre)
-                       child = (*mans[n->tok].pre)(man, n, h);
+               if (man_html_acts[n->tok - MAN_TH].pre != NULL)
+                       child = (*man_html_acts[n->tok - MAN_TH].pre)(man,
+                           n, h);
 
                /* Some block macros resume .nf in the body. */
                if (save_fillmode && n->type == ROFFT_BODY)
@@ -338,8 +337,11 @@ print_man_node(MAN_ARGS)
        print_stagq(h, t);
 
        if (fillmode(h, 0) == MAN_nf &&
-           n->next != NULL && n->next->flags & NODE_LINE)
+           n->next != NULL && n->next->flags & NODE_LINE) {
+               /* In .nf = <pre>, print even empty lines. */
+               h->col++;
                print_endline(h);
+       }
 }
 
 /*
@@ -368,14 +370,6 @@ fillmode(struct html *h, int want)
        return had;
 }
 
-static int
-a2width(const struct roff_node *n, struct roffsu *su)
-{
-       if (n->type != ROFFT_TEXT)
-               return 0;
-       return a2roffsu(n->string, su, SCALE_EN) != NULL;
-}
-
 static void
 man_root_pre(const struct roff_meta *man, struct html *h)
 {
@@ -530,25 +524,25 @@ man_IP_pre(MAN_ARGS)
                return 1;
        }
 
-       /* FIXME: width specification. */
-
        print_otag(h, TAG_DT, "");
 
-       /* For IP, only print the first header element. */
-
-       if (MAN_IP == n->tok && n->child)
-               print_man_node(man, n->child, h);
-
-       /* For TP, only print next-line header elements. */
-
-       if (MAN_TP == n->tok) {
+       switch(n->tok) {
+       case MAN_IP:  /* Only print the first header element. */
+               if (n->child != NULL)
+                       print_man_node(man, n->child, h);
+               break;
+       case MAN_TP:  /* Only print next-line header elements. */
+       case MAN_TQ:
                nn = n->child;
-               while (NULL != nn && 0 == (NODE_LINE & nn->flags))
+               while (nn != NULL && (NODE_LINE & nn->flags) == 0)
                        nn = nn->next;
-               while (NULL != nn) {
+               while (nn != NULL) {
                        print_man_node(man, nn, h);
                        nn = nn->next;
                }
+               break;
+       default:
+               abort();
        }
 
        return 0;
@@ -625,18 +619,31 @@ man_ign_pre(MAN_ARGS)
 static int
 man_RS_pre(MAN_ARGS)
 {
-       struct roffsu    su;
-
        if (n->type == ROFFT_HEAD)
                return 0;
-       else if (n->type == ROFFT_BODY)
-               return 1;
-
-       SCALE_HS_INIT(&su, INDENT);
-       if (n->head->child)
-               a2width(n->head->child, &su);
+       if (n->type == ROFFT_BLOCK)
+               print_otag(h, TAG_DIV, "c", "Bd-indent");
+       return 1;
+}
 
-       print_otag(h, TAG_DIV, "sul", &su);
+static int
+man_SY_pre(MAN_ARGS)
+{
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               print_otag(h, TAG_TABLE, "c", "Nm");
+               print_otag(h, TAG_TR, "");
+               break;
+       case ROFFT_HEAD:
+               print_otag(h, TAG_TD, "");
+               print_otag(h, TAG_CODE, "cT", "Nm");
+               break;
+       case ROFFT_BODY:
+               print_otag(h, TAG_TD, "");
+               break;
+       default:
+               abort();
+       }
        return 1;
 }
 
@@ -664,3 +671,9 @@ man_UR_pre(MAN_ARGS)
 
        return 0;
 }
+
+static int
+man_abort_pre(MAN_ARGS)
+{
+       abort();
+}