Change column display in -Ttree to be 1-based instead of 0-based

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 973ae789c93fdf96dc7e0d040f0685c5cbb470f3..5df9e4697d80ea78a54cca69bc31720413637ae8 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.93 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.95 2014/04/23 16:08:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "html.h"
 #include "man.h"
@@ -302,15 +303,11 @@ man_root_pre(MAN_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;
-       char             b[BUFSIZ], title[BUFSIZ];
-
-       b[0] = 0;
-       if (man->vol)
-               (void)strlcat(b, man->vol, BUFSIZ);
+       char            *title;
 
        assert(man->title);
        assert(man->msec);
-       snprintf(title, BUFSIZ - 1, "%s(%s)", man->title, man->msec);
+       mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Header");
        PAIR_CLASS_INIT(&tag[1], "head");
@@ -333,7 +330,8 @@ man_root_pre(MAN_ARGS)
        PAIR_CLASS_INIT(&tag[0], "head-vol");
        PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
        print_otag(h, TAG_TD, 2, tag);
-       print_text(h, b);
+       if (NULL != man->vol)
+               print_text(h, man->vol);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");
@@ -341,6 +339,7 @@ man_root_pre(MAN_ARGS)
        print_otag(h, TAG_TD, 2, tag);
        print_text(h, title);
        print_tagq(h, t);
+       free(title);
 }
 
 static void