Add -Owidth=width option to mandoc -Tascii. Asked for by joerg@ about a

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 98ce0bbe797f1811f39c2fdf79e25aab32da0ea4..e6be6214a9a6e713e5c4f6dd0464493202774e75 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.137 2010/06/04 21:05:39 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.142 2010/06/06 22:08:15 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -82,7 +82,6 @@ static        void      termp_dq_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fn_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
-static void      termp_ft_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_lb_post(DECL_ARGS);
@@ -166,7 +165,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_bold_pre, termp_fd_post }, /* Fd */ 
        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, termp_fn_post }, /* Fn */ 
-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
+       { termp_ft_pre, NULL }, /* Ft */ 
        { termp_bold_pre, NULL }, /* Ic */ 
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_li_pre, NULL }, /* Li */
@@ -1511,31 +1510,29 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
-       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
-               if (n->prev && MDOC_Fo == n->prev->tok)
-                       term_vspace(p);
+       /* NB: MDOC_LINE does not effect this! */
+       if (SEC_SYNOPSIS == n->sec && n->prev)
+               term_vspace(p);
 
        term_fontpush(p, TERMFONT_UNDER);
        return(1);
 }
 
 
-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
-               term_newln(p);
-}
-
-
 /* ARGSUSED */
 static int
 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);
@@ -1566,8 +1563,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);
 }
 
 
@@ -1847,11 +1845,18 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
-       term_fontpush(p, TERMFONT_BOLD);
-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && n->prev && MDOC_In != n->prev->tok)
+               term_vspace(p);
+
+       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);
 }
@@ -1862,23 +1867,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);
+       }
 }
 
 
@@ -1987,23 +1985,29 @@ termp_pq_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
-       const struct mdoc_node *nn;
 
-       if (MDOC_BODY == n->type) {
+       if (MDOC_BLOCK == n->type) {
+               /* NB: MDOC_LINE has no effect on this macro! */
+               if (SEC_SYNOPSIS != n->sec)
+                       return(1);
+               if (n->prev && MDOC_Ft == n->prev->tok)
+                       term_newln(p);
+               else if (n->prev)
+                       term_vspace(p);
+               return(1);
+       } else if (MDOC_BODY == n->type) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
-       } else if (MDOC_HEAD != n->type) 
-               return(1);
+       } 
 
-       term_fontpush(p, TERMFONT_BOLD);
-       for (nn = n->child; nn; nn = nn->next) {
-               assert(MDOC_TEXT == nn->type);
-               term_word(p, nn->string);
-       }
-       term_fontpop(p);
+       /* XXX: we drop non-initial arguments as per groff. */
 
+       assert(n->child);
+       assert(n->child->string);
+       term_fontpush(p, TERMFONT_BOLD);
+       term_word(p, n->child->string);
        return(0);
 }
 
@@ -2013,13 +2017,18 @@ static void
 termp_fo_post(DECL_ARGS)
 {
 
-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ")");
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ";");
-       term_newln(p);
+       if (MDOC_BLOCK == n->type) {
+               /* NB: MDOC_LINE has no effect on this macro! */
+               if (SEC_SYNOPSIS == n->sec)
+                       term_newln(p);
+       } else if (MDOC_BODY == n->type) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ")");
+               if (SEC_SYNOPSIS == n->sec) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, ";");
+               }
+       }
 }