Decide whether to use_pager as early as possible,

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 12c4d8f8caa665ee4f236eddb58f165fa1724be5..6effb29b66ddbddc39aacd654be1667c10a59961 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.58 2015/01/28 02:23:49 schwarze Exp $ */
+/*     $Id: out.c,v 1.61 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -51,7 +51,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        dst->unit = def == SCALE_MAX ? SCALE_BU : def;
        dst->scale = strtod(src, &endptr);
        if (endptr == src)
-               return(0);
+               return 0;
 
        switch (*endptr++) {
        case 'c':
@@ -89,12 +89,12 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                /* FALLTHROUGH */
        default:
                if (SCALE_MAX == def)
-                       return(0);
+                       return 0;
                dst->unit = def;
                break;
        }
 
-       return(*endptr == '\0' ? 2 : 1);
+       return *endptr == '\0' ? 2 : 1;
 }
 
 /*
@@ -140,7 +140,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
                        spans = dp->spans;
                        if (1 < spans)
                                continue;
-                       icol = dp->layout->head->ident;
+                       icol = dp->layout->col;
                        if (maxcol < icol)
                                maxcol = icol;
                        col = tbl->cols + icol;
@@ -262,7 +262,6 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 }