Complete the whatis.1 -> apropos.1 merge,

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index d647616c6758f3449cd42ee947f2f05ba6ab4cca..1f759399060c03fbe7da85a58248f515c26d5062 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.277 2014/08/17 08:37:11 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.279 2014/08/17 16:51:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -806,10 +806,10 @@ termp_it_pre(DECL_ARGS)
                 * the "overstep" effect in term_flushln() and treat
                 * this as a `-ohang' list instead.
                 */
-               if (NULL != n->next && 
-                       NULL != n->next->child &&
-                       (MDOC_Bl == n->next->child->tok ||
-                        MDOC_Bd == n->next->child->tok))
+               if (NULL != n->next &&
+                   NULL != n->next->child &&
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))
                        break;
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
@@ -863,11 +863,11 @@ termp_it_pre(DECL_ARGS)
                 * don't want to recalculate rmargin and offsets when
                 * using `Bd' or `Bl' within `-hang' overstep lists.
                 */
-               if (MDOC_HEAD == n->type && 
-                       NULL != n->next && 
-                       NULL != n->next->child &&
-                       (MDOC_Bl == n->next->child->tok ||
-                        MDOC_Bd == n->next->child->tok))
+               if (MDOC_HEAD == n->type &&
+                   NULL != n->next &&
+                   NULL != n->next->child &&
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))
                        break;
                /* FALLTHROUGH */
        case LIST_bullet:
@@ -1030,8 +1030,8 @@ termp_nm_pre(DECL_ARGS)
        if (MDOC_HEAD == n->type)
                synopsis_pre(p, n->parent);
 
-       if (MDOC_HEAD == n->type && 
-               NULL != n->next && NULL != n->next->child) {
+       if (MDOC_HEAD == n->type &&
+           NULL != n->next && NULL != n->next->child) {
                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;
                p->rmargin = p->offset + term_len(p, 1);
@@ -1059,8 +1059,8 @@ termp_nm_post(DECL_ARGS)
 
        if (MDOC_BLOCK == n->type) {
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
-       } else if (MDOC_HEAD == n->type && 
-               NULL != n->next && NULL != n->next->child) {
+       } else if (MDOC_HEAD == n->type &&
+           NULL != n->next && NULL != n->next->child) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
                p->trailspace = 0;