On a new RS nesting level, the saved width starts from the default

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 0967b3bb3df5536027cbba26902d1467d6e29ace..51de28fd7e5259d46d454a2aaaabc2752b6aeea3 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.113 2015/04/02 21:36:49 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.115 2015/04/02 23:48:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -37,8 +37,8 @@
 
 #define        INDENT            5
 
-#define        MAN_ARGS          const struct man_meta *man, \
-                         const struct man_node *n, \
+#define        MAN_ARGS          const struct roff_meta *man, \
+                         const struct roff_node *n, \
                          struct mhtml *mh, \
                          struct html *h
 
@@ -53,12 +53,12 @@ struct      htmlman {
 };
 
 static void              print_bvspace(struct html *,
-                               const struct man_node *);
+                               const struct roff_node *);
 static void              print_man(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
-static int               a2width(const struct man_node *,
+static int               a2width(const struct roff_node *,
                                struct roffsu *);
 static int               man_B_pre(MAN_ARGS);
 static int               man_HP_pre(MAN_ARGS);
@@ -130,7 +130,7 @@ static      const struct htmlman mans[MAN_MAX] = {
  * first, print it.
  */
 static void
-print_bvspace(struct html *h, const struct man_node *n)
+print_bvspace(struct html *h, const struct roff_node *n)
 {
 
        if (n->body && n->body->child)
@@ -280,7 +280,7 @@ print_man_node(MAN_ARGS)
 }
 
 static int
-a2width(const struct man_node *n, struct roffsu *su)
+a2width(const struct roff_node *n, struct roffsu *su)
 {
 
        if (n->type != ROFFT_TEXT)
@@ -348,8 +348,8 @@ man_root_post(MAN_ARGS)
        PAIR_CLASS_INIT(&tag, "foot-os");
        print_otag(h, TAG_TD, 1, &tag);
 
-       if (man->source)
-               print_text(h, man->source);
+       if (man->os)
+               print_text(h, man->os);
        print_tagq(h, t);
 }
 
@@ -400,7 +400,7 @@ man_SH_pre(MAN_ARGS)
 static int
 man_alt_pre(MAN_ARGS)
 {
-       const struct man_node   *nn;
+       const struct roff_node  *nn;
        int              i, savelit;
        enum htmltag     fp;
        struct tag      *t;
@@ -496,7 +496,7 @@ man_PP_pre(MAN_ARGS)
 static int
 man_IP_pre(MAN_ARGS)
 {
-       const struct man_node   *nn;
+       const struct roff_node  *nn;
 
        if (n->type == ROFFT_BODY) {
                print_otag(h, TAG_DD, 0, NULL);
@@ -535,7 +535,7 @@ man_HP_pre(MAN_ARGS)
 {
        struct htmlpair  tag[2];
        struct roffsu    su;
-       const struct man_node *np;
+       const struct roff_node *np;
 
        if (n->type == ROFFT_HEAD)
                return(0);