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

Diff for /mandoc/man_term.c between version 1.7 and 1.13

version 1.7, 2009/04/05 16:34:22 version 1.13, 2009/06/15 20:26:47
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * 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   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <assert.h>  #include <assert.h>
 #include <err.h>  #include <err.h>
Line 275  pre_PP(DECL_ARGS)
Line 273  pre_PP(DECL_ARGS)
 static int  static int
 pre_IP(DECL_ARGS)  pre_IP(DECL_ARGS)
 {  {
   #if 0
         const struct man_node *nn;          const struct man_node *nn;
         size_t           offs;          size_t           offs;
   #endif
   
         term_vspace(p);          term_vspace(p);
         p->offset = INDENT;          p->offset = INDENT;
   
   #if 0
         if (NULL == (nn = n->child))          if (NULL == (nn = n->child))
                 return(1);                  return(1);
         if (MAN_TEXT != nn->type)          if (MAN_TEXT != nn->type)
Line 294  pre_IP(DECL_ARGS)
Line 295  pre_IP(DECL_ARGS)
                 offs = strlen(nn->string);                  offs = strlen(nn->string);
   
         p->flags |= TERMP_NOSPACE;          p->flags |= TERMP_NOSPACE;
         p->offset += offs;          /* FIXME */
           if ((p->offset += offs) > p->rmargin)
                   errx(1, "line too long");
   #endif
   
         return(0);          return(0);
 }  }
   
Line 444  print_foot(struct termp *p, const struct man_meta *met
Line 449  print_foot(struct termp *p, const struct man_meta *met
   
         tm = localtime(&meta->date);          tm = localtime(&meta->date);
   
 #ifdef __OpenBSD__  
         if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))  
 #else  
         if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))          if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
 #endif  
                 err(1, "strftime");                  err(1, "strftime");
   
         term_vspace(p);          term_vspace(p);
Line 497  print_head(struct termp *p, const struct man_meta *met
Line 498  print_head(struct termp *p, const struct man_meta *met
                         meta->title, meta->msec);                          meta->title, meta->msec);
   
         p->offset = 0;          p->offset = 0;
         p->rmargin = (p->maxrmargin - strlen(buf)) / 2;          p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
         p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;          p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
   
         term_word(p, title);          term_word(p, title);

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.13

CVSweb