Fixed `Fd' to format in the right way. Found when confused by what the

hell `Fd' is supposed to do anyway (answer: it's a historical macro and
we shouldn't be doing anything with it anyway).

diff --git a/mdoc_html.c b/mdoc_html.c
index 76a7fe8c45981ab7673eec2ae3e28886a3247d7b..4506e1277782465c3b54424019debf68a2ab80fc 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.72 2010/06/03 13:44:36 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.73 2010/06/04 21:05:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -84,6 +84,7 @@ static        void              mdoc_dq_post(MDOC_ARGS);
 static int               mdoc_dq_pre(MDOC_ARGS);
 static int               mdoc_dv_pre(MDOC_ARGS);
 static int               mdoc_fa_pre(MDOC_ARGS);
+static void              mdoc_fd_post(MDOC_ARGS);
 static int               mdoc_fd_pre(MDOC_ARGS);
 static int               mdoc_fl_pre(MDOC_ARGS);
 static int               mdoc_fn_pre(MDOC_ARGS);
@@ -158,7 +159,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ev_pre, NULL}, /* Ev */ 
        {mdoc_ex_pre, NULL}, /* Ex */
        {mdoc_fa_pre, NULL}, /* Fa */ 
-       {mdoc_fd_pre, NULL}, /* Fd */ 
+       {mdoc_fd_pre, mdoc_fd_post}, /* Fd */ 
        {mdoc_fl_pre, NULL}, /* Fl */
        {mdoc_fn_pre, NULL}, /* Fn */ 
        {mdoc_ft_pre, NULL}, /* Ft */ 
@@ -1509,22 +1510,20 @@ mdoc_fa_pre(MDOC_ARGS)
 }
 
 
+/* ARGSUSED */
+static void
+mdoc_fd_post(MDOC_ARGS)
+{
+
+       print_otag(h, TAG_BR, 0, NULL);
+}
+
+
 /* ARGSUSED */
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
-       struct roffsu    su;
-
-       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);
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
 
        PAIR_CLASS_INIT(&tag, "macro");
        print_otag(h, TAG_SPAN, 1, &tag);

diff --git a/mdoc_term.c b/mdoc_term.c
index 8ae1f98869cb6416aad26421bf3435b6cac7fbe5..98ce0bbe797f1811f39c2fdf79e25aab32da0ea4 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.136 2010/06/01 14:51:09 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.137 2010/06/04 21:05:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1358,12 +1358,7 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
-       if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags))
-               return;
-
        term_newln(p);
-       if (n->next && MDOC_Fd != n->next->tok)
-               term_vspace(p);
 }
 
 

diff --git a/regress/mdoc/Fd/fd.in b/regress/mdoc/Fd/fd.in
new file mode 100644 (file)
index 0000000..8028501
--- /dev/null
+++ b/regress/mdoc/Fd/fd.in
@@ -0,0 +1,22 @@
+.Dd $Mdocdate: June 4 2010 $
+.Dt FOO
+.Os
+.Sh NAME
+.Nm foo
+.Nd bar
+.Sh SYNOPSIS
+1
+.Fl
+.Fd 2 3 4
+.Fd 3
+4
+.Sh DESCRIPTION
+1
+.Fd 2
+.Fd 3
+4
+.Sh BLAH
+1
+.Fd 2
+.Fd 3
+4