Moved output definitions into main.h.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index bdbd6fb47802b48495fdd1152d25aec4d645ca23..218f3961924b8eaf877933f1f44bac5463b8304c 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.25 2009/10/07 14:50:28 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.29 2009/10/13 10:57:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -29,6 +29,7 @@
 #include "out.h"
 #include "html.h"
 #include "mdoc.h"
+#include "main.h"
 
 #define        INDENT           5
 #define        HALFINDENT       3
@@ -49,16 +50,11 @@ static      void              print_mdoc_nodelist(MDOC_ARGS);
 
 static void              a2width(const char *, struct roffsu *);
 static void              a2offs(const char *, struct roffsu *);
+
 static int               a2list(const struct mdoc_node *);
 
 static void              mdoc_root_post(MDOC_ARGS);
 static int               mdoc_root_pre(MDOC_ARGS);
-static int               mdoc_it_block_pre(MDOC_ARGS, int, 
-                               struct roffsu *, int, 
-                               struct roffsu *);
-static int               mdoc_it_head_pre(MDOC_ARGS, int, 
-                               struct roffsu *);
-static int               mdoc_it_body_pre(MDOC_ARGS, int);
 
 static void              mdoc__x_post(MDOC_ARGS);
 static int               mdoc__x_pre(MDOC_ARGS);
@@ -96,6 +92,11 @@ static       void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ic_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);
+static int               mdoc_it_block_pre(MDOC_ARGS, int, int,
+                               struct roffsu *, struct roffsu *);
+static int               mdoc_it_head_pre(MDOC_ARGS, int, 
+                               struct roffsu *);
+static int               mdoc_it_body_pre(MDOC_ARGS, int);
 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
@@ -855,8 +856,8 @@ mdoc_bx_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
-mdoc_it_block_pre(MDOC_ARGS, int type, struct roffsu *offs, 
-               int comp, struct roffsu *width)
+mdoc_it_block_pre(MDOC_ARGS, int type, int comp,
+               struct roffsu *offs, struct roffsu *width)
 {
        struct htmlpair          tag;
        const struct mdoc_node  *nn;
@@ -1081,8 +1082,8 @@ mdoc_it_pre(MDOC_ARGS)
        if (MDOC_BODY == n->type)
                return(mdoc_it_body_pre(m, n, h, type));
        if (MDOC_BLOCK == n->type)
-               return(mdoc_it_block_pre(m, n, h, type, 
-                                       &offs, comp, &width));
+               return(mdoc_it_block_pre(m, n, h, type, comp,
+                                       &offs, &width));
 
        /* Override column widths. */
 
@@ -1455,6 +1456,7 @@ mdoc_cd_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
+       print_otag(h, TAG_DIV, 0, NULL);
        PAIR_CLASS_INIT(&tag, "config");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
@@ -1624,7 +1626,8 @@ mdoc_fn_pre(MDOC_ARGS)
        assert(n->child->string);
        sp = n->child->string;
 
-       if ((ep = strchr(sp, ' '))) {
+       ep = strchr(sp, ' ');
+       if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");
                t = print_otag(h, TAG_SPAN, 1, tag);