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

Diff for /mandoc/tbl.c between version 1.22 and 1.23

version 1.22, 2011/01/25 12:24:27 version 1.23, 2011/03/20 16:02:05
Line 67  tbl_read(struct tbl_node *tbl, int ln, const char *p, 
Line 67  tbl_read(struct tbl_node *tbl, int ln, const char *p, 
 }  }
   
 struct tbl_node *  struct tbl_node *
 tbl_alloc(int pos, int line, void *data, const mandocmsg msg)  tbl_alloc(int pos, int line, struct mparse *parse)
 {  {
         struct tbl_node *p;          struct tbl_node *p;
   
         p = mandoc_calloc(1, sizeof(struct tbl_node));          p = mandoc_calloc(1, sizeof(struct tbl_node));
         p->line = line;          p->line = line;
         p->pos = pos;          p->pos = pos;
         p->data = data;          p->parse = parse;
         p->msg = msg;  
         p->part = TBL_PART_OPTS;          p->part = TBL_PART_OPTS;
         p->opts.tab = '\t';          p->opts.tab = '\t';
         p->opts.linesize = 12;          p->opts.linesize = 12;
Line 126  void
Line 125  void
 tbl_restart(int line, int pos, struct tbl_node *tbl)  tbl_restart(int line, int pos, struct tbl_node *tbl)
 {  {
         if (TBL_PART_CDATA == tbl->part)          if (TBL_PART_CDATA == tbl->part)
                 TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);                  mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
                                   tbl->line, tbl->pos, NULL);
   
         tbl->part = TBL_PART_LAYOUT;          tbl->part = TBL_PART_LAYOUT;
         tbl->line = line;          tbl->line = line;
         tbl->pos = pos;          tbl->pos = pos;
   
         if (NULL == tbl->first_span || NULL == tbl->first_span->first)          if (NULL == tbl->first_span || NULL == tbl->first_span->first)
                 TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);                  mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
                                   tbl->line, tbl->pos, NULL);
 }  }
   
 const struct tbl_span *  const struct tbl_span *
Line 154  tbl_end(struct tbl_node *tbl)
Line 155  tbl_end(struct tbl_node *tbl)
 {  {
   
         if (NULL == tbl->first_span || NULL == tbl->first_span->first)          if (NULL == tbl->first_span || NULL == tbl->first_span->first)
                 TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);                  mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
                                   tbl->line, tbl->pos, NULL);
   
         if (tbl->last_span)          if (tbl->last_span)
                 tbl->last_span->flags |= TBL_SPAN_LAST;                  tbl->last_span->flags |= TBL_SPAN_LAST;
   
         if (TBL_PART_CDATA == tbl->part)          if (TBL_PART_CDATA == tbl->part)
                 TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);                  mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
                                   tbl->line, tbl->pos, NULL);
 }  }
   

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

CVSweb