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

Diff for /mandoc/tbl.c between version 1.27 and 1.31

version 1.27, 2013/05/31 22:08:09 version 1.31, 2015/01/14 22:44:55
Line 15 
Line 15 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
 #ifdef HAVE_CONFIG_H  
 #include "config.h"  #include "config.h"
 #endif  
   
   #include <sys/types.h>
   
 #include <assert.h>  #include <assert.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 26 
Line 26 
 #include <time.h>  #include <time.h>
   
 #include "mandoc.h"  #include "mandoc.h"
   #include "mandoc_aux.h"
 #include "libmandoc.h"  #include "libmandoc.h"
 #include "libroff.h"  #include "libroff.h"
   
   
 enum rofferr  enum rofferr
 tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)  tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 {  {
Line 52  tbl_read(struct tbl_node *tbl, int ln, const char *p, 
Line 54  tbl_read(struct tbl_node *tbl, int ln, const char *p, 
         /* Now process each logical section of the table.  */          /* Now process each logical section of the table.  */
   
         switch (tbl->part) {          switch (tbl->part) {
         case (TBL_PART_OPTS):          case TBL_PART_OPTS:
                 return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);                  tbl_option(tbl, ln, p);
         case (TBL_PART_LAYOUT):                  return(ROFF_IGN);
                 return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);          case TBL_PART_LAYOUT:
         case (TBL_PART_CDATA):                  tbl_layout(tbl, ln, p);
                   return(ROFF_IGN);
           case TBL_PART_CDATA:
                 return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);                  return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
         default:          default:
                 break;                  break;
Line 128  void
Line 132  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)
                 mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,                  mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
                                 tbl->line, tbl->pos, NULL);                      tbl->line, tbl->pos, NULL);
   
         tbl->part = TBL_PART_LAYOUT;          tbl->part = TBL_PART_LAYOUT;
         tbl->line = line;          tbl->line = line;
Line 137  tbl_restart(int line, int pos, struct tbl_node *tbl)
Line 141  tbl_restart(int line, int pos, struct tbl_node *tbl)
   
         if (NULL == tbl->first_span || NULL == tbl->first_span->first)          if (NULL == tbl->first_span || NULL == tbl->first_span->first)
                 mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,                  mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
                                 tbl->line, tbl->pos, NULL);                      tbl->line, tbl->pos, NULL);
 }  }
   
 const struct tbl_span *  const struct tbl_span *
Line 162  tbl_end(struct tbl_node **tblp)
Line 166  tbl_end(struct tbl_node **tblp)
         *tblp = NULL;          *tblp = NULL;
   
         if (NULL == tbl->first_span || NULL == tbl->first_span->first)          if (NULL == tbl->first_span || NULL == tbl->first_span->first)
                 mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,                  mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
                                 tbl->line, tbl->pos, NULL);                      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)
                 mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,                  mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
                                 tbl->line, tbl->pos, NULL);                      tbl->line, tbl->pos, NULL);
 }  }
   
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.31
CVSweb