Fill in more version notes.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index d8bad8d0e637b39bb715495ceb254abc910955bf..5bd4c0145ce74aa170a8f2e95cb82d9e1b1611e3 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.93 2010/07/04 21:59:30 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.100 2010/07/27 08:38:04 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,7 +30,6 @@
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"
-#include "regs.h"
 #include "mdoc.h"
 #include "main.h"
 
@@ -73,6 +72,8 @@ static        int               mdoc_aq_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);
+static void              mdoc_bk_post(MDOC_ARGS);
+static int               mdoc_bk_pre(MDOC_ARGS);
 static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bq_post(MDOC_ARGS);
@@ -124,6 +125,7 @@ static      int               mdoc_pq_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_rv_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
+static int               mdoc_sm_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static void              mdoc_sq_post(MDOC_ARGS);
 static int               mdoc_sq_pre(MDOC_ARGS);
@@ -208,7 +210,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */
-       {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
+       {mdoc_ms_pre, NULL}, /* Ms */
        {NULL, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
@@ -226,7 +228,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Sc */
        {mdoc_sq_pre, mdoc_sq_post}, /* So */
        {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
-       {NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+       {mdoc_sm_pre, NULL}, /* Sm */ 
        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */
@@ -237,7 +239,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Fc */ 
        {mdoc_op_pre, mdoc_op_post}, /* Oo */
        {NULL, NULL}, /* Oc */
-       {NULL, NULL}, /* Bk */
+       {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
@@ -442,6 +444,18 @@ print_mdoc_node(MDOC_ARGS)
                break;
        }
 
+       if (HTML_KEEP & h->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       h->flags &= ~HTML_KEEP;
+                       h->flags |= HTML_PREKEEP;
+               } else if (NULL == n->prev) {
+                       if (n->parent && n->parent->line != n->line) {
+                               h->flags &= ~HTML_KEEP;
+                               h->flags |= HTML_PREKEEP;
+                       }
+               }
+       }
+
        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 
@@ -1443,14 +1457,11 @@ mdoc_bd_pre(MDOC_ARGS)
        print_otag(h, TAG_DIV, 2, tag);
 
        for (nn = n->child; nn; nn = nn->next) {
-               h->flags |= HTML_NOSPACE;
-               print_mdoc_node(m, nn, h);
-               if (NULL == nn->next)
-                       continue;
-               if (nn->prev && nn->prev->line < nn->line)
-                       print_text(h, "\n");
-               else if (NULL == nn->prev)
+               if (nn->prev && nn->prev->line < nn->line) {
                        print_text(h, "\n");
+                       h->flags |= HTML_NOSPACE;
+               }
+               print_mdoc_node(m, nn, h);
        }
 
        return(0);
@@ -1707,6 +1718,23 @@ mdoc_fn_pre(MDOC_ARGS)
 }
 
 
+/* ARGSUSED */
+static int
+mdoc_sm_pre(MDOC_ARGS)
+{
+
+       assert(n->child && MDOC_TEXT == n->child->type);
+       if (0 == strcmp("on", n->child->string)) {
+               /* FIXME: no p->col to check... */
+               h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONOSPACE;
+       } else
+               h->flags |= HTML_NONOSPACE;
+
+       return(0);
+}
+
+
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
@@ -1724,6 +1752,11 @@ mdoc_sp_pre(MDOC_ARGS)
                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;
        }
@@ -2227,3 +2260,35 @@ mdoc__x_post(MDOC_ARGS)
        h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }
+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+       switch (n->type) {
+       case (MDOC_BLOCK):
+               break;
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               h->flags |= HTML_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}