[BACK]Return to out.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/out.c between version 1.62 and 1.63

version 1.62, 2015/10/12 00:08:16 version 1.63, 2017/05/01 20:54:59
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 197  tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
Line 197  tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
          */           */
   
         if (nxcol && totalwidth) {          if (nxcol && totalwidth) {
                 xwidth = totalwidth - xwidth - 3*maxcol -                  xwidth += 3*maxcol +
                     (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?                      (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
                      2 : !!opts->lvert + !!opts->rvert);                       2 : !!opts->lvert + !!opts->rvert);
                   if (xwidth >= totalwidth)
                           return;
                   xwidth = totalwidth - xwidth;
   
                 /*                  /*
                  * Emulate a bug in GNU tbl width calculation that                   * Emulate a bug in GNU tbl width calculation that
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63
CVSweb