duplicate word, found by igor(1)

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 777ffa631cf6dd77b93f9842709bca40c92d68a7..a304b3e4d240bf67a2902f3cab892e73f7d0c000 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.132 2017/01/30 20:24:02 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.145 2017/06/25 11:42:02 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
+#include "mandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "out.h"
@@ -65,14 +66,12 @@ static      int               man_SM_pre(MAN_ARGS);
 static int               man_SS_pre(MAN_ARGS);
 static int               man_UR_pre(MAN_ARGS);
 static int               man_alt_pre(MAN_ARGS);
-static int               man_br_pre(MAN_ARGS);
 static int               man_ign_pre(MAN_ARGS);
 static int               man_in_pre(MAN_ARGS);
 static void              man_root_post(MAN_ARGS);
 static void              man_root_pre(MAN_ARGS);
 
-static const struct htmlman mans[MAN_MAX] = {
-       { man_br_pre, NULL }, /* br */
+static const struct htmlman __mans[MAN_MAX - MAN_TH] = {
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { man_SS_pre, NULL }, /* SS */
@@ -93,7 +92,6 @@ static        const struct htmlman mans[MAN_MAX] = {
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
-       { man_br_pre, NULL }, /* sp */
        { NULL, NULL }, /* nf */
        { NULL, NULL }, /* fi */
        { NULL, NULL }, /* RE */
@@ -103,14 +101,15 @@ static    const struct htmlman mans[MAN_MAX] = {
        { man_ign_pre, NULL }, /* PD */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
-       { man_ign_pre, NULL }, /* ft */
        { man_OP_pre, NULL }, /* OP */
        { NULL, NULL }, /* EX */
        { NULL, NULL }, /* EE */
        { man_UR_pre, NULL }, /* UR */
        { NULL, NULL }, /* UE */
-       { man_ign_pre, NULL }, /* ll */
+       { man_UR_pre, NULL }, /* MT */
+       { NULL, NULL }, /* ME */
 };
+static const struct htmlman *const mans = __mans - MAN_TH;
 
 
 /*
@@ -233,6 +232,7 @@ print_man_node(MAN_ARGS)
                case MAN_P:   /* reopen .nf in the body.        */
                case MAN_RS:
                case MAN_UR:
+               case MAN_MT:
                        fillmode(h, MAN_fi);
                        break;
                default:
@@ -255,7 +255,8 @@ print_man_node(MAN_ARGS)
        case ROFFT_TEXT:
                if (fillmode(h, want_fillmode) == MAN_fi &&
                    want_fillmode == MAN_fi &&
-                   n->flags & NODE_LINE && *n->string == ' ')
+                   n->flags & NODE_LINE && *n->string == ' ' &&
+                   (h->flags & HTML_NONEWLINE) == 0)
                        print_otag(h, TAG_BR, "");
                if (*n->string != '\0')
                        break;
@@ -304,6 +305,13 @@ print_man_node(MAN_ARGS)
                        print_tblclose(h);
 
                t = h->tag;
+               if (n->tok < ROFF_MAX) {
+                       roff_html_pre(h, n);
+                       child = 0;
+                       break;
+               }
+
+               assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                if (mans[n->tok].pre)
                        child = (*mans[n->tok].pre)(man, n, h);
 
@@ -354,13 +362,9 @@ fillmode(struct html *h, int want)
 static int
 a2width(const struct roff_node *n, struct roffsu *su)
 {
-
        if (n->type != ROFFT_TEXT)
                return 0;
-       if (a2roffsu(n->string, su, SCALE_EN))
-               return 1;
-
-       return 0;
+       return a2roffsu(n->string, su, SCALE_EN) != NULL;
 }
 
 static void
@@ -374,7 +378,6 @@ man_root_pre(MAN_ARGS)
        mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
        t = print_otag(h, TAG_TABLE, "c", "head");
-       print_otag(h, TAG_TBODY, "");
        tt = print_otag(h, TAG_TR, "");
 
        print_otag(h, TAG_TD, "c", "head-ltitle");
@@ -410,34 +413,18 @@ man_root_post(MAN_ARGS)
        print_tagq(h, t);
 }
 
-
-static int
-man_br_pre(MAN_ARGS)
-{
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-
-       if (MAN_sp == n->tok) {
-               if (NULL != (n = n->child))
-                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-       } else
-               su.scale = 0.0;
-
-       print_otag(h, TAG_DIV, "suh", &su);
-
-       /* So the div isn't empty: */
-       print_text(h, "\\~");
-
-       return 0;
-}
-
 static int
 man_SH_pre(MAN_ARGS)
 {
-       if (n->type == ROFFT_HEAD)
-               print_otag(h, TAG_H1, "c", "Sh");
+       char    *id;
+
+       if (n->type == ROFFT_HEAD) {
+               id = html_make_id(n);
+               print_otag(h, TAG_H1, "cTi", "Sh", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);
+               free(id);
+       }
        return 1;
 }
 
@@ -499,8 +486,15 @@ man_SM_pre(MAN_ARGS)
 static int
 man_SS_pre(MAN_ARGS)
 {
-       if (n->type == ROFFT_HEAD)
-               print_otag(h, TAG_H2, "c", "Ss");
+       char    *id;
+
+       if (n->type == ROFFT_HEAD) {
+               id = html_make_id(n);
+               print_otag(h, TAG_H2, "cTi", "Ss", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "selflink", id);
+               free(id);
+       }
        return 1;
 }
 
@@ -653,11 +647,17 @@ man_RS_pre(MAN_ARGS)
 static int
 man_UR_pre(MAN_ARGS)
 {
+       char *cp;
        n = n->child;
        assert(n->type == ROFFT_HEAD);
        if (n->child != NULL) {
                assert(n->child->type == ROFFT_TEXT);
-               print_otag(h, TAG_A, "ch", "Lk", n->child->string);
+               if (n->tok == MAN_MT) {
+                       mandoc_asprintf(&cp, "mailto:%s", n->child->string);
+                       print_otag(h, TAG_A, "cTh", "Mt", cp);
+                       free(cp);
+               } else
+                       print_otag(h, TAG_A, "cTh", "Lk", n->child->string);
        }
 
        assert(n->next->type == ROFFT_BODY);