Ignore author-specified indentation for .RS; it harms responsive

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 127a46e047a59218cbcfacd7d43169003dbe7e08..96cb91aa0cf7b1ce7e53ac4cc15765ef8ee83bfe 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,7 +1,7 @@
-/*     $Id: man_html.c,v 1.144 2017/06/24 14:38:32 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.152 2018/06/25 13:33:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -48,12 +48,11 @@ struct      htmlman {
 
 static void              print_bvspace(struct html *,
                                const struct roff_node *);
-static void              print_man_head(MAN_ARGS);
+static void              print_man_head(const struct roff_meta *,
+                               struct html *);
 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);
@@ -68,8 +67,10 @@ static       int               man_UR_pre(MAN_ARGS);
 static int               man_alt_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 void              man_root_post(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] = {
        { NULL, NULL }, /* TH */
@@ -106,6 +107,8 @@ static      const struct htmlman __mans[MAN_MAX - MAN_TH] = {
        { NULL, NULL }, /* EE */
        { man_UR_pre, NULL }, /* UR */
        { NULL, NULL }, /* UE */
+       { man_UR_pre, NULL }, /* MT */
+       { NULL, NULL }, /* ME */
 };
 static const struct htmlman *const mans = __mans - MAN_TH;
 
@@ -136,30 +139,34 @@ print_bvspace(struct html *h, const struct roff_node *n)
 void
 html_man(void *arg, const struct roff_man *man)
 {
-       struct html     *h;
-       struct tag      *t;
+       struct html             *h;
+       struct roff_node        *n;
+       struct tag              *t;
 
        h = (struct html *)arg;
+       n = man->first->child;
 
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
+               if (n->type == ROFFT_COMMENT)
+                       print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
-               print_man_head(&man->meta, man->first, h);
+               print_man_head(&man->meta, h);
                print_tagq(h, t);
                print_otag(h, TAG_BODY, "");
        }
 
-       man_root_pre(&man->meta, man->first, h);
+       man_root_pre(&man->meta, h);
        t = print_otag(h, TAG_DIV, "c", "manual-text");
-       print_man_nodelist(&man->meta, man->first->child, h);
+       print_man_nodelist(&man->meta, n, h);
        print_tagq(h, t);
-       man_root_post(&man->meta, man->first, h);
+       man_root_post(&man->meta, h);
        print_tagq(h, NULL);
 }
 
 static void
-print_man_head(MAN_ARGS)
+print_man_head(const struct roff_meta *man, struct html *h)
 {
        char    *cp;
 
@@ -230,6 +237,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:
@@ -259,6 +267,8 @@ print_man_node(MAN_ARGS)
                        break;
                print_paragraph(h);
                return;
+       case ROFFT_COMMENT:
+               return;
        default:
                break;
        }
@@ -356,16 +366,8 @@ 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(MAN_ARGS)
+man_root_pre(const struct roff_meta *man, struct html *h)
 {
        struct tag      *t, *tt;
        char            *title;
@@ -393,7 +395,7 @@ man_root_pre(MAN_ARGS)
 }
 
 static void
-man_root_post(MAN_ARGS)
+man_root_post(const struct roff_meta *man, struct html *h)
 {
        struct tag      *t, *tt;
 
@@ -416,11 +418,10 @@ man_SH_pre(MAN_ARGS)
        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", "selflink", id);
-               free(id);
+                       print_otag(h, TAG_A, "chR", "permalink", id);
        }
        return 1;
 }
@@ -486,11 +487,10 @@ man_SS_pre(MAN_ARGS)
        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", "selflink", id);
-               free(id);
+                       print_otag(h, TAG_A, "chR", "permalink", id);
        }
        return 1;
 }
@@ -513,7 +513,7 @@ man_IP_pre(MAN_ARGS)
        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");
@@ -522,7 +522,7 @@ man_IP_pre(MAN_ARGS)
 
        /* FIXME: width specification. */
 
-       print_otag(h, TAG_DT, "c", "It-tag");
+       print_otag(h, TAG_DT, "");
 
        /* For IP, only print the first header element. */
 
@@ -547,24 +547,13 @@ man_IP_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;
-       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;
 }
 
@@ -626,29 +615,27 @@ 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);
-
-       print_otag(h, TAG_DIV, "sul", &su);
+       if (n->type == ROFFT_BLOCK)
+               print_otag(h, TAG_DIV, "c", "Bd-indent");
        return 1;
 }
 
 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, "cTh", "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);