Use a single P tag for paragraph breaks (which can be configured for

paragraph breaking in CSS).

Use -man's handling of `sp' and `br', which accomodates for scaling
widths (-mdoc wasn't).

diff --git a/html.c b/html.c
index 5a63ea5db78bd21369b64258255f44034252eedb..6083996079be8b272e3273ef401dbabfc35d3f4a 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.115 2010/12/15 15:59:23 kristaps Exp $ */
+/*     $Id: html.c,v 1.116 2010/12/15 17:19:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -68,6 +68,7 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"dt",          HTML_CLRLINE}, /* TAG_DT */
        {"dd",          HTML_CLRLINE}, /* TAG_DD */
        {"blockquote",  HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
+       {"p",           HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */
 };
 
 static const char      *const htmlfonts[HTMLFONT_MAX] = {

diff --git a/html.h b/html.h
index ac0d19b2fd9f62a3874c39e7a7e5cbe5de0ac056..2f35b24ac0f3ea8242b7cc5ded951af1c618f11d 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.29 2010/12/15 15:59:23 kristaps Exp $ */
+/*     $Id: html.h,v 1.30 2010/12/15 17:19:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -44,6 +44,7 @@ enum  htmltag {
        TAG_DT,
        TAG_DD,
        TAG_BLOCKQUOTE,
+       TAG_P,
        TAG_MAX
 };
 

diff --git a/man_html.c b/man_html.c
index f6e8360ec4df4ac2bea87a892e43745ca34aff5e..e314bc935a7e99e61578d5be26502dd4f8c7cb3a 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.52 2010/12/08 10:58:22 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.53 2010/12/15 17:19:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -141,20 +141,13 @@ static void
 print_man(MAN_ARGS) 
 {
        struct tag      *t;
-       struct htmlpair  tag;
 
        t = print_otag(h, TAG_HEAD, 0, NULL);
-
        print_man_head(m, n, mh, h);
        print_tagq(h, t);
-       t = print_otag(h, TAG_BODY, 0, NULL);
-
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
-       print_otag(h, TAG_DIV, 1, &tag);
 
+       t = print_otag(h, TAG_BODY, 0, NULL);
        print_man_nodelist(m, n, mh, h);
-
        print_tagq(h, t);
 }
 

diff --git a/mdoc_html.c b/mdoc_html.c
index 7aa6b47e652c742e92a6af7e0bd3c1907669ae35..60b13ad1d58cdd95603eb69e5300d5b2cf4d7049 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.119 2010/12/15 16:35:21 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.120 2010/12/15 17:19:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -103,6 +103,7 @@ static      int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);
+static int               mdoc_pp_pre(MDOC_ARGS);
 static void              mdoc_quote_post(MDOC_ARGS);
 static int               mdoc_quote_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
@@ -126,7 +127,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
        {mdoc_ss_pre, NULL }, /* Ss */ 
-       {mdoc_sp_pre, NULL}, /* Pp */ 
+       {mdoc_pp_pre, NULL}, /* Pp */ 
        {mdoc_d1_pre, NULL}, /* D1 */
        {mdoc_d1_pre, NULL}, /* Dl */
        {mdoc_bd_pre, NULL}, /* Bd */
@@ -227,7 +228,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Fr */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
-       {mdoc_sp_pre, NULL}, /* Lp */ 
+       {mdoc_pp_pre, NULL}, /* Lp */ 
        {mdoc_lk_pre, NULL}, /* Lk */ 
        {mdoc_mt_pre, NULL}, /* Mt */ 
        {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ 
@@ -1132,12 +1133,15 @@ mdoc_d1_pre(MDOC_ARGS)
        bufcat_su(h, "margin-top", &su);
        bufcat_su(h, "margin-bottom", &su);
        PAIR_STYLE_INIT(&tag[0], h);
+       print_otag(h, TAG_BLOCKQUOTE, 1, tag);
+
+       /* BLOCKQUOTE needs a block body. */
 
        if (MDOC_Dl == n->tok) {
                PAIR_CLASS_INIT(&tag[1], "lit");
-               print_otag(h, TAG_BLOCKQUOTE, 2, tag);
+               print_otag(h, TAG_DIV, 1, tag);
        } else
-               print_otag(h, TAG_BLOCKQUOTE, 1, tag);
+               print_otag(h, TAG_DIV, 0, tag);
 
        return(1);
 }
@@ -1533,37 +1537,40 @@ mdoc_sm_pre(MDOC_ARGS)
        return(0);
 }
 
+/* ARGSUSED */
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
+
+       if ((NULL == n->next || NULL == n->prev) &&
+                       (MDOC_Ss == n->parent->tok ||
+                        MDOC_Sh == n->parent->tok))
+               return(0);
+
+       print_otag(h, TAG_P, 0, NULL);
+       return(0);
+
+}
 
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
-       int              len;
-       struct htmlpair  tag;
        struct roffsu    su;
+       struct htmlpair  tag;
 
-       switch (n->tok) {
-       case (MDOC_sp):
-               /* FIXME: can this have a scaling indicator? */
-               len = n->child ? atoi(n->child->string) : 1;
-               break;
-       case (MDOC_br):
-               len = 0;
-               break;
-       default:
-               assert(n->parent);
-               if ((NULL == n->next || NULL == n->prev) &&
-                               (MDOC_Ss == n->parent->tok ||
-                                MDOC_Sh == n->parent->tok))
-                       return(0);
-               len = 1;
-               break;
-       }
+       SCALE_VS_INIT(&su, 1);
+
+       if (MDOC_sp == n->tok) {
+               if (n->child)
+                       a2roffsu(n->child->string, &su, SCALE_VS);
+       } else
+               su.scale = 0;
 
-       SCALE_VS_INIT(&su, len);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
+
        /* So the div isn't empty: */
        print_text(h, "\\~");
 
@@ -1571,7 +1578,6 @@ mdoc_sp_pre(MDOC_ARGS)
 
 }
 
-
 /* ARGSUSED */
 static int
 mdoc_lk_pre(MDOC_ARGS)
@@ -1858,10 +1864,8 @@ mdoc_rs_pre(MDOC_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
-       if (n->prev && SEC_SEE_ALSO == n->sec) {
-               print_otag(h, TAG_BR, 0, NULL);
-               print_otag(h, TAG_BR, 0, NULL);
-       } 
+       if (n->prev && SEC_SEE_ALSO == n->sec)
+               print_otag(h, TAG_P, 0, NULL);
 
        PAIR_CLASS_INIT(&tag, "ref");
        print_otag(h, TAG_SPAN, 1, &tag);