[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.5 and 1.17

version 1.5, 2009/03/27 14:56:15 version 1.17, 2009/07/24 20:22:24
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 42  struct termact {
Line 40  struct termact {
 static  int               pre_B(DECL_ARGS);  static  int               pre_B(DECL_ARGS);
 static  int               pre_BI(DECL_ARGS);  static  int               pre_BI(DECL_ARGS);
 static  int               pre_BR(DECL_ARGS);  static  int               pre_BR(DECL_ARGS);
   static  int               pre_br(DECL_ARGS);
 static  int               pre_I(DECL_ARGS);  static  int               pre_I(DECL_ARGS);
 static  int               pre_IB(DECL_ARGS);  static  int               pre_IB(DECL_ARGS);
 static  int               pre_IP(DECL_ARGS);  static  int               pre_IP(DECL_ARGS);
Line 59  static void    post_SH(DECL_ARGS);
Line 58  static void    post_SH(DECL_ARGS);
 static  void              post_SS(DECL_ARGS);  static  void              post_SS(DECL_ARGS);
   
 static const struct termact termacts[MAN_MAX] = {  static const struct termact termacts[MAN_MAX] = {
         { NULL, NULL }, /* __ */          { pre_br, NULL }, /* br */
         { NULL, NULL }, /* TH */          { NULL, NULL }, /* TH */
         { pre_SH, post_SH }, /* SH */          { pre_SH, post_SH }, /* SH */
         { pre_SS, post_SS }, /* SS */          { pre_SS, post_SS }, /* SS */
Line 80  static const struct termact termacts[MAN_MAX] = {
Line 79  static const struct termact termacts[MAN_MAX] = {
         { pre_I, post_I }, /* I */          { pre_I, post_I }, /* I */
         { pre_IR, NULL }, /* IR */          { pre_IR, NULL }, /* IR */
         { pre_RI, NULL }, /* RI */          { pre_RI, NULL }, /* RI */
         { pre_PP, NULL }, /* br */          { NULL, NULL }, /* na */
           { pre_I, post_I }, /* i */
           { NULL, NULL }, /* sp */
 };  };
   
 static  void              print_head(struct termp *,  static  void              print_head(struct termp *,
Line 97  man_run(struct termp *p, const struct man *m)
Line 98  man_run(struct termp *p, const struct man *m)
   
         print_head(p, man_meta(m));          print_head(p, man_meta(m));
         p->flags |= TERMP_NOSPACE;          p->flags |= TERMP_NOSPACE;
         print_body(p, man_node(m), man_meta(m));          assert(man_node(m));
           assert(MAN_ROOT == man_node(m)->type);
           if (man_node(m)->child)
                   print_body(p, man_node(m)->child, man_meta(m));
         print_foot(p, man_meta(m));          print_foot(p, man_meta(m));
   
         return(1);          return(1);
Line 260  post_B(DECL_ARGS)
Line 264  post_B(DECL_ARGS)
   
 /* ARGSUSED */  /* ARGSUSED */
 static int  static int
   pre_br(DECL_ARGS)
   {
   
           term_newln(p);
           return(0);
   }
   
   
   /* ARGSUSED */
   static int
 pre_PP(DECL_ARGS)  pre_PP(DECL_ARGS)
 {  {
   
Line 273  pre_PP(DECL_ARGS)
Line 287  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);
   
         /* FIXME - ignore the designator. */  
         nn = nn->next;  
   
         if (MAN_TEXT != nn->type)          if (MAN_TEXT != nn->type)
                 errx(1, "expected text line argument");                  errx(1, "expected text line argument");
   
         offs = (size_t)atoi(nn->string);          if (nn->next) {
         nn = nn->next;                  if (MAN_TEXT != nn->next->type)
                           errx(1, "expected text line argument");
                   offs = (size_t)atoi(nn->next->string);
           } else
                   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 305  pre_TP(DECL_ARGS)
Line 326  pre_TP(DECL_ARGS)
         size_t           offs;          size_t           offs;
   
         term_vspace(p);          term_vspace(p);
   
         p->offset = INDENT;          p->offset = INDENT;
   
         if (NULL == (nn = n->child))          if (NULL == (nn = n->child))
Line 442  print_foot(struct termp *p, const struct man_meta *met
Line 464  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 495  print_head(struct termp *p, const struct man_meta *met
Line 513  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.5  
changed lines
  Added in v.1.17
CVSweb