In -Tman .Bl -compact, skip the blank line only before the first item

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 9b01d651c5cd5be7caf69bc6b38f17ec32c781cd..49bd6d82512e90368ae0f9ec42c727f2657a7219 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.237 2011/11/03 20:36:59 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.243 2012/07/11 16:57:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -34,9 +34,6 @@
 #include "mdoc.h"
 #include "main.h"
 
-#define        INDENT            5
-#define        HALFINDENT        3
-
 struct termpair {
        struct termpair  *ppair;
        int               count;
@@ -72,7 +69,7 @@ static        void      termp_an_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
-static void      termp_d1_post(DECL_ARGS);
+static void      termp_fd_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
@@ -132,8 +129,8 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */ 
        { termp_sp_pre, NULL }, /* Pp */ 
-       { termp_d1_pre, termp_d1_post }, /* D1 */
-       { termp_d1_pre, termp_d1_post }, /* Dl */
+       { termp_d1_pre, termp_bl_post }, /* D1 */
+       { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_bl_pre, termp_bl_post }, /* Bl */
@@ -149,7 +146,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */ 
-       { termp_fd_pre, NULL }, /* Fd */ 
+       { termp_fd_pre, termp_fd_post }, /* Fd */ 
        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, NULL }, /* Fn */ 
        { termp_ft_pre, NULL }, /* Ft */ 
@@ -245,7 +242,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
-       { termp_under_pre, termp____post }, /* %U */ 
+       { NULL, termp____post }, /* %U */ 
        { NULL, NULL }, /* Ta */ 
 };
 
@@ -259,6 +256,9 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
        p = (struct termp *)arg;
 
+       if (0 == p->defindent)
+               p->defindent = 5;
+
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
@@ -562,9 +562,9 @@ a2offs(const struct termp *p, const char *v)
        else if (0 == strcmp(v, "left"))
                return(0);
        else if (0 == strcmp(v, "indent"))
-               return(term_len(p, INDENT + 1));
+               return(term_len(p, p->defindent + 1));
        else if (0 == strcmp(v, "indent-two"))
-               return(term_len(p, (INDENT + 1) * 2));
+               return(term_len(p, (p->defindent + 1) * 2));
        else if ( ! a2roffsu(v, &su, SCALE_MAX))
                SCALE_HS_INIT(&su, term_strlen(p, v));
 
@@ -727,12 +727,10 @@ termp_it_pre(DECL_ARGS)
        case (LIST_dash):
                /* FALLTHROUGH */
        case (LIST_hyphen):
-               if (width < term_len(p, 4))
-                       width = term_len(p, 4);
-               break;
+               /* FALLTHROUGH */
        case (LIST_enum):
-               if (width < term_len(p, 5))
-                       width = term_len(p, 5);
+               if (width < term_len(p, 2))
+                       width = term_len(p, 2);
                break;
        case (LIST_hang):
                if (0 == width)
@@ -787,12 +785,18 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
+       case (LIST_enum):
+               /*
+                * Weird special case.
+                * Very narrow enum lists actually hang.
+                */
+               if (width == term_len(p, 2))
+                       p->flags |= TERMP_HANG;
+               /* FALLTHROUGH */
        case (LIST_bullet):
                /* FALLTHROUGH */
        case (LIST_dash):
                /* FALLTHROUGH */
-       case (LIST_enum):
-               /* FALLTHROUGH */
        case (LIST_hyphen):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
@@ -1406,6 +1410,15 @@ termp_fd_pre(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static void
+termp_fd_post(DECL_ARGS)
+{
+
+       term_newln(p);
+}
+
+
 /* ARGSUSED */
 static int
 termp_sh_pre(DECL_ARGS)
@@ -1424,7 +1437,9 @@ termp_sh_pre(DECL_ARGS)
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case (MDOC_BODY):
-               p->offset = term_len(p, INDENT);
+               p->offset = term_len(p, p->defindent);
+               if (SEC_AUTHORS == n->sec)
+                       p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
                break;
        default:
                break;
@@ -1492,22 +1507,11 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);
-       p->offset += term_len(p, (INDENT + 1));
+       p->offset += term_len(p, p->defindent + 1);
        return(1);
 }
 
 
-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
-{
-
-       if (MDOC_BLOCK != n->type) 
-               return;
-       term_newln(p);
-}
-
-
 /* ARGSUSED */
 static int
 termp_ft_pre(DECL_ARGS)
@@ -1797,7 +1801,7 @@ termp_ss_pre(DECL_ARGS)
                break;
        case (MDOC_HEAD):
                term_fontpush(p, TERMFONT_BOLD);
-               p->offset = term_len(p, HALFINDENT);
+               p->offset = term_len(p, (p->defindent+1)/2);
                break;
        default:
                break;
@@ -2157,25 +2161,24 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
-       const struct mdoc_node *nn, *sv;
-
-       term_fontpush(p, TERMFONT_UNDER);
-
-       nn = sv = n->child;
-
-       if (NULL == nn || NULL == nn->next)
-               return(1);
-
-       for (nn = nn->next; nn; nn = nn->next) 
-               term_word(p, nn->string);
+       const struct mdoc_node *link, *descr;
 
-       term_fontpop(p);
+       if (NULL == (link = n->child))
+               return(0);
 
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ":");
+       if (NULL != (descr = link->next)) {
+               term_fontpush(p, TERMFONT_UNDER);
+               while (NULL != descr) {
+                       term_word(p, descr->string);
+                       descr = descr->next;
+               }
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ":");
+               term_fontpop(p);
+       }
 
        term_fontpush(p, TERMFONT_BOLD);
-       term_word(p, sv->string);
+       term_word(p, link->string);
        term_fontpop(p);
 
        return(0);