Print this page
5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mandoc/tbl_html.c
          +++ new/usr/src/cmd/mandoc/tbl_html.c
   1      -/*      $Id: tbl_html.c,v 1.9 2011/09/18 14:14:15 schwarze Exp $ */
        1 +/*      $Id: tbl_html.c,v 1.10 2012/05/27 17:54:54 schwarze Exp $ */
   2    2  /*
   3    3   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   4    4   *
   5    5   * Permission to use, copy, modify, and distribute this software for any
   6    6   * purpose with or without fee is hereby granted, provided that the above
   7    7   * copyright notice and this permission notice appear in all copies.
   8    8   *
   9    9   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  10   10   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  11   11   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
↓ open down ↓ 100 lines elided ↑ open up ↑
 112  112          case (TBL_SPAN_DHORIZ):
 113  113                  PAIR_INIT(&tag, ATTR_COLSPAN, "0");
 114  114                  print_otag(h, TAG_TD, 1, &tag);
 115  115                  break;
 116  116          default:
 117  117                  dp = sp->first;
 118  118                  for (hp = sp->head; hp; hp = hp->next) {
 119  119                          print_stagq(h, tt);
 120  120                          print_otag(h, TAG_TD, 0, NULL);
 121  121  
 122      -                        switch (hp->pos) {
 123      -                        case (TBL_HEAD_VERT):
 124      -                                /* FALLTHROUGH */
 125      -                        case (TBL_HEAD_DVERT):
 126      -                                continue;
 127      -                        case (TBL_HEAD_DATA):
 128      -                                if (NULL == dp)
 129      -                                        break;
 130      -                                if (TBL_CELL_DOWN != dp->layout->pos)
 131      -                                        if (dp->string)
 132      -                                                print_text(h, dp->string);
 133      -                                dp = dp->next;
      122 +                        if (NULL == dp)
 134  123                                  break;
 135      -                        }
      124 +                        if (TBL_CELL_DOWN != dp->layout->pos)
      125 +                                if (dp->string)
      126 +                                        print_text(h, dp->string);
      127 +                        dp = dp->next;
 136  128                  }
 137  129                  break;
 138  130          }
 139  131  
 140  132          print_tagq(h, tt);
 141  133  
 142  134          h->flags &= ~HTML_NONOSPACE;
 143  135  
 144  136          if (TBL_SPAN_LAST & sp->flags) {
 145  137                  assert(h->tbl.cols);
 146  138                  free(h->tbl.cols);
 147  139                  h->tbl.cols = NULL;
 148  140                  print_tblclose(h);
 149  141          }
 150  142  
 151  143  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX