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

Diff for /mandoc/term.c between version 1.245 and 1.247

version 1.245, 2015/03/06 13:02:43 version 1.247, 2015/04/04 17:47:18
Line 7 
Line 7 
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.   * copyright notice and this permission notice appear in all copies.
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
Line 49  term_free(struct termp *p)
Line 49  term_free(struct termp *p)
   
 void  void
 term_begin(struct termp *p, term_margin head,  term_begin(struct termp *p, term_margin head,
                 term_margin foot, const void *arg)                  term_margin foot, const struct roff_meta *arg)
 {  {
   
         p->headf = head;          p->headf = head;
Line 619  void
Line 619  void
 term_setwidth(struct termp *p, const char *wstr)  term_setwidth(struct termp *p, const char *wstr)
 {  {
         struct roffsu    su;          struct roffsu    su;
         size_t           width;          int              iop, width;
         int              iop;  
   
         iop = 0;          iop = 0;
         width = 0;          width = 0;
Line 831  term_vspan(const struct termp *p, const struct roffsu 
Line 830  term_vspan(const struct termp *p, const struct roffsu 
         return(ri < 66 ? ri : 1);          return(ri < 66 ? ri : 1);
 }  }
   
   /*
    * Convert a scaling width to basic units, rounding down.
    */
 int  int
 term_hspan(const struct termp *p, const struct roffsu *su)  term_hspan(const struct termp *p, const struct roffsu *su)
 {  {
         double           v;  
   
         v = (*p->hspan)(p, su);          return((*p->hspan)(p, su));
         return(v > 0.0 ? v + 0.0005 : v - 0.0005);  
 }  }

Legend:
Removed from v.1.245  
changed lines
  Added in v.1.247

CVSweb