If a tbl(7) column contains both text cells and numeric cells,

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 6aee4ffed81f7d9f349b985736ac3cafca67d258..12cf8ea786b71545b6e5e8ff549323afeb4ff62e 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.148 2018/04/24 00:36:53 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.156 2018/08/18 02:08:27 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * 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. */
 
 
 /* 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
 
 #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);
 };
        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 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);
 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);


@@ -65,6 +61,7 @@ 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_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_alt_pre(MAN_ARGS);
 static int               man_ign_pre(MAN_ARGS);
 static int               man_UR_pre(MAN_ARGS);
 static int               man_alt_pre(MAN_ARGS);
 static int               man_ign_pre(MAN_ARGS);


@@ -74,11 +71,12 @@ static      void              man_root_post(const struct roff_meta *,
 static void              man_root_pre(const struct roff_meta *,
                                struct html *);
 
 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 */
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
        { man_IP_pre, NULL }, /* TP */

+       { man_IP_pre, NULL }, /* TQ */

        { man_PP_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */
        { man_PP_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* P */


@@ -104,6 +102,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_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 */
        { man_OP_pre, NULL }, /* OP */
        { NULL, NULL }, /* EX */
        { NULL, NULL }, /* EE */


@@ -112,7 +112,6 @@ static      const struct htmlman __mans[MAN_MAX - MAN_TH] = {
        { man_UR_pre, NULL }, /* MT */
        { NULL, NULL }, /* ME */
 };
        { man_UR_pre, NULL }, /* MT */
        { NULL, NULL }, /* ME */
 };

-static const struct htmlman *const mans = __mans - MAN_TH;

 
 
 /*
 
 
 /*


@@ -321,8 +320,9 @@ print_man_node(MAN_ARGS)
                }
 
                assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                }
 
                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)
 
                /* Some block macros resume .nf in the body. */
                if (save_fillmode && n->type == ROFFT_BODY)


@@ -368,14 +368,6 @@ fillmode(struct html *h, int want)
        return had;
 }
 
        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)
 {
 static void
 man_root_pre(const struct roff_meta *man, struct html *h)
 {


@@ -428,11 +420,10 @@ man_SH_pre(MAN_ARGS)
        char    *id;
 
        if (n->type == ROFFT_HEAD) {
        char    *id;
 
        if (n->type == ROFFT_HEAD) {

-               id = html_make_id(n);
+               id = html_make_id(n, 1);

                print_otag(h, TAG_H1, "cTi", "Sh", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);
                print_otag(h, TAG_H1, "cTi", "Sh", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);

-               free(id);

        }
        return 1;
 }
        }
        return 1;
 }


@@ -498,11 +489,10 @@ man_SS_pre(MAN_ARGS)
        char    *id;
 
        if (n->type == ROFFT_HEAD) {
        char    *id;
 
        if (n->type == ROFFT_HEAD) {

-               id = html_make_id(n);
+               id = html_make_id(n, 1);

                print_otag(h, TAG_H2, "cTi", "Ss", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);
                print_otag(h, TAG_H2, "cTi", "Ss", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);

-               free(id);

        }
        return 1;
 }
        }
        return 1;
 }


@@ -525,32 +515,32 @@ man_IP_pre(MAN_ARGS)
        const struct roff_node  *nn;
 
        if (n->type == ROFFT_BODY) {
        const struct roff_node  *nn;
 
        if (n->type == ROFFT_BODY) {

-               print_otag(h, TAG_DD, "c", "It-tag");
+               print_otag(h, TAG_DD, "");

                return 1;
        } else if (n->type != ROFFT_HEAD) {
                print_otag(h, TAG_DL, "c", "Bl-tag");
                return 1;
        }
 
                return 1;
        } else if (n->type != ROFFT_HEAD) {
                print_otag(h, TAG_DL, "c", "Bl-tag");
                return 1;
        }
 

-       /* FIXME: width specification. */
-
-       print_otag(h, TAG_DT, "c", "It-tag");
-
-       /* For IP, only print the first header element. */
-
-       if (MAN_IP == n->tok && n->child)
-               print_man_node(man, n->child, h);
+       print_otag(h, TAG_DT, "");

 
 

-       /* 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;
                nn = n->child;

-               while (NULL != nn && 0 == (NODE_LINE & nn->flags))
+               while (nn != NULL && (NODE_LINE & nn->flags) == 0)

                        nn = nn->next;
                        nn = nn->next;

-               while (NULL != nn) {
+               while (nn != NULL) {

                        print_man_node(man, nn, h);
                        nn = nn->next;
                }
                        print_man_node(man, nn, h);
                        nn = nn->next;
                }

+               break;
+       default:
+               abort();

        }
 
        return 0;
        }
 
        return 0;


@@ -559,24 +549,13 @@ man_IP_pre(MAN_ARGS)
 static int
 man_HP_pre(MAN_ARGS)
 {
 static int
 man_HP_pre(MAN_ARGS)
 {

-       struct roffsu    sum, sui;
-       const struct roff_node *np;
-

        if (n->type == ROFFT_HEAD)
                return 0;
        if (n->type == ROFFT_HEAD)
                return 0;

-       else if (n->type != ROFFT_BLOCK)
-               return 1;
-
-       np = n->head->child;
-
-       if (np == NULL || !a2width(np, &sum))
-               SCALE_HS_INIT(&sum, INDENT);

 
 

-       sui.unit = sum.unit;
-       sui.scale = -sum.scale;
-
-       print_bvspace(h, n);
-       print_otag(h, TAG_DIV, "csului", "Pp", &sum, &sui);
+       if (n->type == ROFFT_BLOCK) {
+               print_bvspace(h, n);
+               print_otag(h, TAG_DIV, "c", "HP");
+       }

        return 1;
 }
 
        return 1;
 }
 


@@ -638,18 +617,31 @@ man_ign_pre(MAN_ARGS)
 static int
 man_RS_pre(MAN_ARGS)
 {
 static int
 man_RS_pre(MAN_ARGS)
 {

-       struct roffsu    su;
-

        if (n->type == ROFFT_HEAD)
                return 0;
        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;
 }
 
        return 1;
 }