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

Diff for /mandoc/tbl.c between version 1.1 and 1.5

version 1.1, 2010/12/28 10:51:03 version 1.5, 2010/12/29 01:16:57
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@kth.se>   * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * 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 15 
Line 15 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
 #include <assert.h>  #include <assert.h>
   #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>
 #include <time.h>  #include <time.h>
Line 24 
Line 25 
 #include "libmandoc.h"  #include "libmandoc.h"
 #include "libroff.h"  #include "libroff.h"
   
 enum    tbl_part {  
         TBL_PART_OPTS, /* in options (first line) */  
         TBL_PART_LAYOUT, /* describing layout */  
         TBL_PART_DATA  /* creating data rows */  
 };  
   
   
 struct  tbl {  
         enum tbl_part    part;  
 };  
   
 static  void             tbl_init(struct tbl *);  static  void             tbl_init(struct tbl *);
 static  void             tbl_clear(struct tbl *);  static  void             tbl_clear(struct tbl *);
   
Line 49  tbl_init(struct tbl *tbl)
Line 39  tbl_init(struct tbl *tbl)
 {  {
   
         tbl->part = TBL_PART_OPTS;          tbl->part = TBL_PART_OPTS;
           tbl->tab = '\t';
           tbl->linesize = 12;
           tbl->decimal = '.';
 }  }
   
 enum rofferr  enum rofferr
Line 60  tbl_read(struct tbl *tbl, int ln, const char *p, int o
Line 53  tbl_read(struct tbl *tbl, int ln, const char *p, int o
         cp = &p[offs];          cp = &p[offs];
         len = (int)strlen(cp);          len = (int)strlen(cp);
   
         if (len && TBL_PART_OPTS == tbl->part)          /*
            * If we're in the options section and we don't have a
            * terminating semicolon, assume we've moved directly into the
            * layout section.  No need to report a warning: this is,
            * apparently, standard behaviour.
            */
   
           if (TBL_PART_OPTS == tbl->part && len)
                 if (';' != cp[len - 1])                  if (';' != cp[len - 1])
                         tbl->part = TBL_PART_LAYOUT;                          tbl->part = TBL_PART_LAYOUT;
   
           /* Now process each logical section of the table.  */
   
           switch (tbl->part) {
           case (TBL_PART_OPTS):
                   return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
           default:
                   break;
           }
   
         return(1);          return(ROFF_CONT);
 }  }
   
 struct tbl *  struct tbl *
 tbl_alloc(void)  tbl_alloc(void *data, const mandocmsg msg)
 {  {
         struct tbl      *p;          struct tbl      *p;
   
         p = mandoc_malloc(sizeof(struct tbl));          p = mandoc_malloc(sizeof(struct tbl));
           p->data = data;
           p->msg = msg;
         tbl_init(p);          tbl_init(p);
         return(p);          return(p);
 }  }
Line 92  tbl_reset(struct tbl *tbl)
Line 103  tbl_reset(struct tbl *tbl)
         tbl_clear(tbl);          tbl_clear(tbl);
         tbl_init(tbl);          tbl_init(tbl);
 }  }
   
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.5
CVSweb