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

Diff for /mandoc/mandoc.h between version 1.40 and 1.46

version 1.40, 2011/01/01 17:10:20 version 1.46, 2011/01/03 23:53:51
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011 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 75  enum mandocerr {
Line 75  enum mandocerr {
   
         /* related to missing macro arguments */          /* related to missing macro arguments */
         MANDOCERR_MACROEMPTY, /* skipping empty macro */          MANDOCERR_MACROEMPTY, /* skipping empty macro */
           MANDOCERR_ARGCWARN, /* argument count wrong */
         MANDOCERR_DISPTYPE, /* missing display type */          MANDOCERR_DISPTYPE, /* missing display type */
         MANDOCERR_LISTFIRST, /* list type must come first */          MANDOCERR_LISTFIRST, /* list type must come first */
         MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */          MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */
Line 99  enum mandocerr {
Line 100  enum mandocerr {
         MANDOCERR_BADESCAPE, /* unknown escape sequence */          MANDOCERR_BADESCAPE, /* unknown escape sequence */
         MANDOCERR_BADQUOTE, /* unterminated quoted string */          MANDOCERR_BADQUOTE, /* unterminated quoted string */
   
           /* related to tables */
           MANDOCERR_TBLEXTRADAT, /* extra data cells */
   
         MANDOCERR_ERROR, /* ===== start of errors ===== */          MANDOCERR_ERROR, /* ===== start of errors ===== */
   
           /* related to tables */
         MANDOCERR_TBL, /* bad table syntax */          MANDOCERR_TBL, /* bad table syntax */
         MANDOCERR_TBLOPT, /* bad table option */          MANDOCERR_TBLOPT, /* bad table option */
         MANDOCERR_TBLLAYOUT, /* bad table layout */          MANDOCERR_TBLLAYOUT, /* bad table layout */
         MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */          MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */
         MANDOCERR_TBLNODATA, /* no table data cells specified */          MANDOCERR_TBLNODATA, /* no table data cells specified */
   
         MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */          MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
         MANDOCERR_BADCHAR, /* skipping bad character */          MANDOCERR_BADCHAR, /* skipping bad character */
         MANDOCERR_NOTEXT, /* skipping text before the first section header */          MANDOCERR_NOTEXT, /* skipping text before the first section header */
Line 140  enum mandocerr {
Line 146  enum mandocerr {
         MANDOCERR_MAX          MANDOCERR_MAX
 };  };
   
   struct  tbl {
           char              tab; /* cell-separator */
           char              decimal; /* decimal point */
           int               linesize;
           char              delims[2]; /* FIXME: deprecate */
           int               opts;
   #define TBL_OPT_CENTRE   (1 << 0)
   #define TBL_OPT_EXPAND   (1 << 1)
   #define TBL_OPT_BOX      (1 << 2)
   #define TBL_OPT_DBOX     (1 << 3)
   #define TBL_OPT_ALLBOX   (1 << 4)
   #define TBL_OPT_NOKEEP   (1 << 5)
   #define TBL_OPT_NOSPACE  (1 << 6)
           int               cols; /* number of columns */
   };
   
   enum    tbl_headt {
           TBL_HEAD_DATA, /* plug in data from tbl_dat */
           TBL_HEAD_VERT, /* vertical spacer */
           TBL_HEAD_DVERT  /* double-vertical spacer */
   };
   
   /*
    * The head of a table specifies all of its columns.  When formatting a
    * tbl_span, iterate over these and plug in data from the tbl_span when
    * appropriate, using tbl_cell as a guide to placement.
    */
   struct  tbl_head {
           enum tbl_headt    pos;
           int               ident; /* 0 <= unique id < cols */
           struct tbl_head  *next;
           struct tbl_head  *prev;
   };
   
 enum    tbl_cellt {  enum    tbl_cellt {
         TBL_CELL_CENTRE, /* c, C */          TBL_CELL_CENTRE, /* c, C */
         TBL_CELL_RIGHT, /* r, R */          TBL_CELL_RIGHT, /* r, R */
Line 170  struct tbl_cell {
Line 210  struct tbl_cell {
 #define TBL_CELL_EQUAL   (1 << 4) /* e, E */  #define TBL_CELL_EQUAL   (1 << 4) /* e, E */
 #define TBL_CELL_UP      (1 << 5) /* u, U */  #define TBL_CELL_UP      (1 << 5) /* u, U */
 #define TBL_CELL_WIGN    (1 << 6) /* z, Z */  #define TBL_CELL_WIGN    (1 << 6) /* z, Z */
           struct tbl_head  *head;
 };  };
   
 /*  /*
Line 210  enum tbl_spant {
Line 251  enum tbl_spant {
  * A row of data in a table.   * A row of data in a table.
  */   */
 struct  tbl_span {  struct  tbl_span {
           struct tbl       *tbl;
           struct tbl_head  *head;
         struct tbl_row   *layout; /* layout row: CAN BE NULL */          struct tbl_row   *layout; /* layout row: CAN BE NULL */
         struct tbl_dat   *first;          struct tbl_dat   *first;
         struct tbl_dat   *last;          struct tbl_dat   *last;
           int               flags;
   #define TBL_SPAN_FIRST   (1 << 0)
   #define TBL_SPAN_LAST    (1 << 1)
         enum tbl_spant    pos;          enum tbl_spant    pos;
         struct tbl_span  *next;          struct tbl_span  *next;
 };  };
Legend:
Removed from v.1.40  
changed lines
  Added in v.1.46
CVSweb