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

Diff for /mandoc/term.c between version 1.155 and 1.159

version 1.155, 2010/06/30 12:27:55 version 1.159, 2010/07/04 22:04:04
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
    * Copyright (c) 2010 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 30 
Line 31 
 #include "mandoc.h"  #include "mandoc.h"
 #include "chars.h"  #include "chars.h"
 #include "out.h"  #include "out.h"
   #include "regs.h"
 #include "term.h"  #include "term.h"
 #include "main.h"  #include "main.h"
   
Line 377  res(struct termp *p, const char *word, size_t len)
Line 379  res(struct termp *p, const char *word, size_t len)
         size_t           sz;          size_t           sz;
   
         rhs = chars_a2res(p->symtab, word, len, &sz);          rhs = chars_a2res(p->symtab, word, len, &sz);
           if (NULL == rhs) {
                   rhs = roff_getstrn(word, len);
                   if (rhs)
                           sz = strlen(rhs);
           }
         if (rhs)          if (rhs)
                 encode(p, rhs, sz);                  encode(p, rhs, sz);
 }  }
Line 653  term_strlen(const struct termp *p, const char *cp)
Line 660  term_strlen(const struct termp *p, const char *cp)
 }  }
   
   
   /* ARGSUSED */
 size_t  size_t
 term_vspan(const struct termp *p, const struct roffsu *su)  term_vspan(const struct termp *p, const struct roffsu *su)
 {  {
Line 692  term_vspan(const struct termp *p, const struct roffsu 
Line 700  term_vspan(const struct termp *p, const struct roffsu 
 size_t  size_t
 term_hspan(const struct termp *p, const struct roffsu *su)  term_hspan(const struct termp *p, const struct roffsu *su)
 {  {
           double           v;
   
         return((*p->hspan)(p, su));          v = ((*p->hspan)(p, su));
           if (v < 0.0)
                   v = 0.0;
           return((size_t) /* LINTED */
                           v);
 }  }

Legend:
Removed from v.1.155  
changed lines
  Added in v.1.159

CVSweb