Cleanup indentation after moving the read buffering out of the loop.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 05cafa8d526fe28b0aa763f0714cab3f61533621..3f5d4ab6c34597bc5ca9d90dececaaa1e442eaba 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.57 2010/04/05 08:51:56 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.62 2010/05/13 06:22:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -666,10 +666,10 @@ mdoc_fl_pre(MDOC_ARGS)
 
        print_text(h, "\\-");
 
-       /* A blank `Fl' should incur a subsequent space. */
-
        if (n->child)
                h->flags |= HTML_NOSPACE;
+       else if (n->next && n->next->line == n->line)
+               h->flags |= HTML_NOSPACE;
 
        return(1);
 }
@@ -729,7 +729,8 @@ mdoc_nm_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
-       if (SEC_SYNOPSIS == n->sec && n->prev) {
+       if (SEC_SYNOPSIS == n->sec && 
+                       n->prev && MDOC_LINE & n->flags) {
                bufcat_style(h, "clear", "both");
                PAIR_STYLE_INIT(&tag, h);
                print_otag(h, TAG_BR, 1, &tag);
@@ -1116,6 +1117,8 @@ mdoc_bl_pre(MDOC_ARGS)
 {
        struct ord      *ord;
 
+       if (MDOC_HEAD == n->type)
+               return(0);
        if (MDOC_BLOCK != n->type)
                return(1);
        if (MDOC_Enum != a2list(n))
@@ -1386,6 +1389,7 @@ mdoc_bd_pre(MDOC_ARGS)
                }
 
        /* FIXME: -centered, etc. formatting. */
+       /* FIXME: does not respect -offset ??? */
 
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);
@@ -1554,7 +1558,7 @@ mdoc_fd_pre(MDOC_ARGS)
        struct htmlpair  tag;
        struct roffsu    su;
 
-       if (SEC_SYNOPSIS == n->sec) {
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
                if (n->next && MDOC_Fd != n->next->tok) {
                        SCALE_VS_INIT(&su, 1);
                        bufcat_su(h, "margin-bottom", &su);
@@ -1602,7 +1606,7 @@ mdoc_ft_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
                print_otag(h, TAG_DIV, 0, NULL);
 
        PAIR_CLASS_INIT(&tag, "ftype");
@@ -1623,7 +1627,7 @@ mdoc_fn_pre(MDOC_ARGS)
        int                      sz, i;
        struct roffsu            su;
 
-       if (SEC_SYNOPSIS == n->sec) {
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
                SCALE_HS_INIT(&su, INDENT);
                bufcat_su(h, "margin-left", &su);
                su.scale = -su.scale;
@@ -1864,7 +1868,7 @@ mdoc_in_pre(MDOC_ARGS)
        int                      i;
        struct roffsu            su;
 
-       if (SEC_SYNOPSIS == n->sec) {
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
                if (n->next && MDOC_In != n->next->tok) {
                        SCALE_VS_INIT(&su, 1);
                        bufcat_su(h, "margin-bottom", &su);
@@ -2169,7 +2173,7 @@ mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
                print_otag(h, TAG_DIV, 0, NULL);
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
@@ -2219,8 +2223,6 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__T):
                PAIR_CLASS_INIT(&tag[0], "ref-title");
-               print_text(h, "\\(lq");
-               h->flags |= HTML_NOSPACE;
                break;
        case(MDOC__U):
                PAIR_CLASS_INIT(&tag[0], "link-ref");
@@ -2249,14 +2251,8 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
+       /* TODO: %U */
+
        h->flags |= HTML_NOSPACE;
-       switch (n->tok) {
-       case (MDOC__T):
-               print_text(h, "\\(rq");
-               h->flags |= HTML_NOSPACE;
-               break;
-       default:
-               break;
-       }
        print_text(h, n->next ? "," : ".");
 }