Flip apropos to use mansearch instead of apropos_db.

[mandoc.git] / tbl_term.c

diff --git a/tbl_term.c b/tbl_term.c
index 644f6cecbd1bf3ed3092c4c011002b715de9f744..9f399d0cf96ba4aee0b3d65d6444cc4fa2f12586 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_term.c,v 1.22 2012/05/27 17:54:54 schwarze Exp $ */
+/*     $Id: tbl_term.c,v 1.24 2012/05/27 18:02:49 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -171,10 +171,14 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
        if (TBL_SPAN_LAST & sp->flags) {
                if (TBL_OPT_DBOX & sp->tbl->opts ||
-                   TBL_OPT_BOX  & sp->tbl->opts)
+                   TBL_OPT_BOX  & sp->tbl->opts) {
                        tbl_hframe(tp, sp, 0);
-               if (TBL_OPT_DBOX & sp->tbl->opts)
+                       tp->skipvsp = 1;
+               }
+               if (TBL_OPT_DBOX & sp->tbl->opts) {
                        tbl_hframe(tp, sp, 1);
+                       tp->skipvsp = 2;
+               }
                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;
@@ -337,11 +341,19 @@ static void
 tbl_literal(struct termp *tp, const struct tbl_dat *dp, 
                const struct roffcol *col)
 {
-       size_t           len, padl, padr;
+       struct tbl_head         *hp;
+       size_t                   width, len, padl, padr;
+       int                      spans;
 
        assert(dp->string);
        len = term_strlen(tp, dp->string);
-       padr = col->width > len ? col->width - len : 0;
+
+       hp = dp->layout->head->next;
+       width = col->width;
+       for (spans = dp->spans; spans--; hp = hp->next)
+               width += tp->tbl.cols[hp->ident].width + 3;
+
+       padr = width > len ? width - len : 0;
        padl = 0;
 
        switch (dp->layout->pos) {