Print this page
9718 update mandoc to 1.14.4

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mandoc/tree.c
          +++ new/usr/src/cmd/mandoc/tree.c
   1      -/*      $Id: tree.c,v 1.77 2017/07/08 14:51:05 schwarze Exp $ */
        1 +/*      $Id: tree.c,v 1.78 2018/04/11 17:11:13 schwarze Exp $ */
   2    2  /*
   3    3   * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   4      - * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
        4 + * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   5    5   *
   6    6   * Permission to use, copy, modify, and distribute this software for any
   7    7   * purpose with or without fee is hereby granted, provided that the above
   8    8   * copyright notice and this permission notice appear in all copies.
   9    9   *
  10   10   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  11   11   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  12   12   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  13   13   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  14   14   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
↓ open down ↓ 93 lines elided ↑ open up ↑
 108  108                  break;
 109  109          case ROFFT_TAIL:
 110  110                  t = "tail";
 111  111                  break;
 112  112          case ROFFT_ELEM:
 113  113                  t = "elem";
 114  114                  break;
 115  115          case ROFFT_TEXT:
 116  116                  t = "text";
 117  117                  break;
      118 +        case ROFFT_COMMENT:
      119 +                t = "comment";
      120 +                break;
 118  121          case ROFFT_TBL:
 119  122                  break;
 120  123          case ROFFT_EQN:
 121  124                  t = "eqn";
 122  125                  break;
 123  126          default:
 124  127                  abort();
 125  128          }
 126  129  
 127  130          switch (n->type) {
 128  131          case ROFFT_TEXT:
      132 +        case ROFFT_COMMENT:
 129  133                  p = n->string;
 130  134                  break;
 131  135          case ROFFT_BODY:
 132  136                  p = roff_name[n->tok];
 133  137                  break;
 134  138          case ROFFT_HEAD:
 135  139                  p = roff_name[n->tok];
 136  140                  break;
 137  141          case ROFFT_TAIL:
 138  142                  p = roff_name[n->tok];
↓ open down ↓ 85 lines elided ↑ open up ↑
 224  228          switch (n->type) {
 225  229          case ROFFT_ROOT:
 226  230                  t = "root";
 227  231                  break;
 228  232          case ROFFT_ELEM:
 229  233                  t = "elem";
 230  234                  break;
 231  235          case ROFFT_TEXT:
 232  236                  t = "text";
 233  237                  break;
      238 +        case ROFFT_COMMENT:
      239 +                t = "comment";
      240 +                break;
 234  241          case ROFFT_BLOCK:
 235  242                  t = "block";
 236  243                  break;
 237  244          case ROFFT_HEAD:
 238  245                  t = "head";
 239  246                  break;
 240  247          case ROFFT_BODY:
 241  248                  t = "body";
 242  249                  break;
 243  250          case ROFFT_TBL:
 244  251                  break;
 245  252          case ROFFT_EQN:
 246  253                  t = "eqn";
 247  254                  break;
 248  255          default:
 249  256                  abort();
 250  257          }
 251  258  
 252  259          switch (n->type) {
 253  260          case ROFFT_TEXT:
      261 +        case ROFFT_COMMENT:
 254  262                  p = n->string;
 255  263                  break;
 256  264          case ROFFT_ELEM:
 257  265          case ROFFT_BLOCK:
 258  266          case ROFFT_HEAD:
 259  267          case ROFFT_BODY:
 260  268                  p = roff_name[n->tok];
 261  269                  break;
 262  270          case ROFFT_ROOT:
 263  271                  p = "root";
↓ open down ↓ 140 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX