Fix following the first: `Ft' is given special treatment if specified before

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index d35930933717b246518df3b857283d8f97c1339f..fec3bf483642edf869fb8525450ade1e42ffe1d5 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.129 2010/05/24 21:34:16 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.140 2010/06/04 22:26:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -260,6 +260,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { termp_under_pre, termp____post }, /* %U */ 
+       { NULL, NULL }, /* Ta */ 
 };
 
 
@@ -700,7 +701,7 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case (LIST_column):
-               if (MDOC_BODY == n->type)
+               if (MDOC_HEAD == n->type)
                        break;
                /*
                 * Imitate groff's column handling:
@@ -715,8 +716,13 @@ termp_it_pre(DECL_ARGS)
                /* LINTED */
                dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
 
+               /*
+                * Calculate the offset by applying all prior MDOC_BODY,
+                * so we stop at the MDOC_HEAD (NULL == nn->prev).
+                */
+
                for (i = 0, nn = n->prev; 
-                               nn && i < (int)ncols; 
+                               nn->prev && i < (int)ncols; 
                                nn = nn->prev, i++)
                        offset += dcol + a2width
                                (&bl->args->argv[vals[2]], i);
@@ -869,15 +875,18 @@ termp_it_pre(DECL_ARGS)
                        p->flags |= TERMP_DANGLE;
                break;
        case (LIST_column):
-               if (MDOC_HEAD == n->type) {
-                       assert(n->next);
-                       if (MDOC_BODY == n->next->type)
-                               p->flags &= ~TERMP_NOBREAK;
-                       else
-                               p->flags |= TERMP_NOBREAK;
-                       if (n->prev) 
-                               p->flags |= TERMP_NOLPAD;
-               }
+               if (MDOC_HEAD == n->type)
+                       break;
+
+               if (NULL == n->next)
+                       p->flags &= ~TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOBREAK;
+
+               assert(n->prev);
+               if (MDOC_BODY == n->prev->type) 
+                       p->flags |= TERMP_NOLPAD;
+
                break;
        case (LIST_diag):
                if (MDOC_HEAD == n->type)
@@ -929,9 +938,9 @@ termp_it_pre(DECL_ARGS)
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
-               if (MDOC_HEAD == n->type &&
-                               MDOC_BODY == n->next->type &&
-                               p->rmargin < p->maxrmargin)
+               if (MDOC_HEAD == n->type)
+                       break;
+               if (NULL == n->next && p->rmargin < p->maxrmargin)
                        p->rmargin = p->maxrmargin;
                break;
        default:
@@ -985,7 +994,7 @@ termp_it_pre(DECL_ARGS)
                        return(0);
                break;
        case (LIST_column):
-               if (MDOC_BODY == n->type)
+               if (MDOC_HEAD == n->type)
                        return(0);
                break;
        default:
@@ -1014,14 +1023,14 @@ termp_it_post(DECL_ARGS)
                /* FALLTHROUGH */
        case (LIST_inset):
                if (MDOC_BODY == n->type)
-                       term_flushln(p);
+                       term_newln(p);
                break;
        case (LIST_column):
-               if (MDOC_HEAD == n->type)
+               if (MDOC_BODY == n->type)
                        term_flushln(p);
                break;
        default:
-               term_flushln(p);
+               term_newln(p);
                break;
        }
 
@@ -1192,6 +1201,7 @@ termp_rv_pre(DECL_ARGS)
        term_fontpop(p);
 
                term_word(p, "is set to indicate the error.");
+       p->flags |= TERMP_SENTENCE;
 
        return(0);
 }
@@ -1224,6 +1234,7 @@ termp_ex_pre(DECL_ARGS)
                term_word(p, "utility exits");
 
                term_word(p, "0 on success, and >0 if an error occurs.");
+       p->flags |= TERMP_SENTENCE;
 
        return(0);
 }
@@ -1347,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);
 }
 
 
@@ -1425,6 +1431,7 @@ termp_bt_pre(DECL_ARGS)
 {
 
        term_word(p, "is currently in beta test.");
+       p->flags |= TERMP_SENTENCE;
        return(0);
 }
 
@@ -1445,6 +1452,7 @@ termp_ud_pre(DECL_ARGS)
 {
 
        term_word(p, "currently under development.");
+       p->flags |= TERMP_SENTENCE;
        return(0);
 }
 
@@ -1528,6 +1536,14 @@ termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node  *nn;
 
+       /* NB: MDOC_LINE has no effect on this macro! */
+       if (SEC_SYNOPSIS == n->sec) {
+               if (n->prev && MDOC_Ft == n->prev->tok)
+                       term_newln(p);
+               else if (n->prev)
+                       term_vspace(p);
+       }
+
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);
        term_fontpop(p);
@@ -1558,8 +1574,9 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
-       if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags)
-               term_vspace(p);
+       /* NB: MDOC_LINE has no effect on this macro! */
+       if (SEC_SYNOPSIS == n->sec)
+               term_newln(p);
 }
 
 
@@ -1633,11 +1650,9 @@ termp_bd_pre(DECL_ARGS)
        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;
                print_mdoc_node(p, pair, m, nn);
-               if (NULL == nn->next)
-                       continue;
-               if (nn->prev && nn->prev->line < nn->line)
-                       term_flushln(p);
-               else if (NULL == nn->prev)
+               if (NULL == nn->prev ||
+                   nn->prev->line < nn->line ||
+                   NULL == nn->next)
                        term_flushln(p);
        }
        p->tabwidth = tabwidth;
@@ -1668,7 +1683,7 @@ termp_bd_post(DECL_ARGS)
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;
-       term_flushln(p);
+       term_newln(p);
 
        p->rmargin = rm;
        p->maxrmargin = rmax;
@@ -1841,11 +1856,15 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
-       term_fontpush(p, TERMFONT_BOLD);
-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+               term_fontpush(p, TERMFONT_BOLD);
                term_word(p, "#include");
+               term_word(p, "<");
+       } else {
+               term_word(p, "<");
+               term_fontpush(p, TERMFONT_UNDER);
+       }
 
-       term_word(p, "<");
        p->flags |= TERMP_NOSPACE;
        return(1);
 }
@@ -1856,23 +1875,16 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
-       term_fontpush(p, TERMFONT_BOLD);
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
+               term_fontpush(p, TERMFONT_BOLD);
+
        p->flags |= TERMP_NOSPACE;
        term_word(p, ">");
-       term_fontpop(p);
-
-       if (SEC_SYNOPSIS != n->sec && ! (MDOC_LINE & n->flags))
-               return;
 
-       term_newln(p);
-       /* 
-        * XXX Not entirely correct.  If `.In foo bar' is specified in
-        * the SYNOPSIS section, then it produces a single break after
-        * the <foo>; mandoc asserts a vertical space.  Since this
-        * construction is rarely used, I think it's fine.
-        */
-       if (n->next && MDOC_In != n->next->tok)
-               term_vspace(p);
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+               term_fontpop(p);
+               term_newln(p);
+       }
 }