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

Diff for /mandoc/tbl_layout.c between version 1.17 and 1.20

version 1.17, 2011/03/20 16:02:05 version 1.20, 2011/05/17 13:11:40
Line 14 
Line 14 
  * 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"
   #endif
   
 #include <assert.h>  #include <assert.h>
 #include <ctype.h>  #include <ctype.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 68  mods(struct tbl_node *tbl, struct tbl_cell *cp, 
Line 72  mods(struct tbl_node *tbl, struct tbl_cell *cp, 
         char             buf[5];          char             buf[5];
         int              i;          int              i;
   
           /* Not all types accept modifiers. */
   
           switch (cp->pos) {
           case (TBL_CELL_DOWN):
                   /* FALLTHROUGH */
           case (TBL_CELL_HORIZ):
                   /* FALLTHROUGH */
           case (TBL_CELL_DHORIZ):
                   /* FALLTHROUGH */
           case (TBL_CELL_VERT):
                   /* FALLTHROUGH */
           case (TBL_CELL_DVERT):
                   return(1);
           default:
                   break;
           }
   
 mod:  mod:
         /*          /*
          * XXX: since, at least for now, modifiers are non-conflicting           * XXX: since, at least for now, modifiers are non-conflicting
Line 423  cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
Line 444  cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 }  }
   
 static void  static void
 head_adjust(const struct tbl_cell *cell, struct tbl_head *head)  head_adjust(const struct tbl_cell *cellp, struct tbl_head *head)
 {  {
         if (TBL_CELL_VERT != cell->pos &&          if (TBL_CELL_VERT != cellp->pos &&
                         TBL_CELL_DVERT != cell->pos) {                          TBL_CELL_DVERT != cellp->pos) {
                 head->pos = TBL_HEAD_DATA;                  head->pos = TBL_HEAD_DATA;
                 return;                  return;
         }          }
   
         if (TBL_CELL_VERT == cell->pos)          if (TBL_CELL_VERT == cellp->pos)
                 if (TBL_HEAD_DVERT != head->pos)                  if (TBL_HEAD_DVERT != head->pos)
                         head->pos = TBL_HEAD_VERT;                          head->pos = TBL_HEAD_VERT;
   
         if (TBL_CELL_DVERT == cell->pos)          if (TBL_CELL_DVERT == cellp->pos)
                 head->pos = TBL_HEAD_DVERT;                  head->pos = TBL_HEAD_DVERT;
 }  }
   
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.20
CVSweb