Support for maxrmargin-breaking with TERMP_NOBREAK.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 2f10c0a53dcc6b5bfd21fdc810dc683e7e137d02..e1fa44da23f3308da1146805af1fab906b44ec40 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.33 2009/03/01 23:27:14 kristaps Exp $ */
+/* $Id: term.c,v 1.34 2009/03/02 12:09:32 kristaps Exp $ */

 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -25,8 +25,6 @@
 
 #include "term.h"
 
 
 #include "term.h"
 

-#define        INDENT            6
-

 /*
  * Performs actions on nodes of the abstract syntax tree.  Both pre- and
  * post-fix operations are defined here.
 /*
  * Performs actions on nodes of the abstract syntax tree.  Both pre- and
  * post-fix operations are defined here.


@@ -934,6 +932,9 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

+       if (SEC_SYNOPSIS == node->sec)
+               if (node->prev && MDOC_Fo == node->prev->tok)
+                       vspace(p);

        TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
        return(1);
 }
        TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
        return(1);
 }


@@ -944,7 +945,7 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
 termp_ft_post(DECL_ARGS)
 {
 

-       if (node->sec == SEC_SYNOPSIS)
+       if (SEC_SYNOPSIS == node->sec)

                newln(p);
 }
 
                newln(p);
 }
 


@@ -1141,7 +1142,8 @@ static void
 termp_bx_post(DECL_ARGS)
 {
 
 termp_bx_post(DECL_ARGS)
 {
 

-       p->flags |= TERMP_NOSPACE;
+       if (node->child)
+               p->flags |= TERMP_NOSPACE;

        word(p, "BSD");
 }
 
        word(p, "BSD");
 }