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

Diff for /mandoc/man_macro.c between version 1.8 and 1.18

version 1.8, 2009/03/26 11:16:21 version 1.18, 2009/07/24 20:22:24
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * 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   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <assert.h>  #include <assert.h>
 #include <ctype.h>  #include <ctype.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <stdio.h>  
 #include <string.h>  #include <string.h>
   
 #include "libman.h"  #include "libman.h"
   
   #define FL_NLINE        (1 << 0)
   #define FL_TLINE        (1 << 1)
   
 static  int              man_args(struct man *, int,  static  int              man_args(struct man *, int,
                                 int *, char *, char **);                                  int *, char *, char **);
   
   static  int man_flags[MAN_MAX] = {
           0, /* br */
           0, /* TH */
           0, /* SH */
           0, /* SS */
           FL_TLINE, /* TP */
           0, /* LP */
           0, /* PP */
           0, /* P */
           0, /* IP */
           0, /* HP */
           FL_NLINE, /* SM */
           FL_NLINE, /* SB */
           FL_NLINE, /* BI */
           FL_NLINE, /* IB */
           FL_NLINE, /* BR */
           FL_NLINE, /* RB */
           FL_NLINE, /* R */
           FL_NLINE, /* B */
           FL_NLINE, /* I */
           FL_NLINE, /* IR */
           FL_NLINE, /* RI */
           0, /* na */
           FL_NLINE, /* i */
           0, /* sp */
   };
   
 int  int
 man_macro(struct man *man, int tok, int line,  man_macro(struct man *man, int tok, int line,
Line 55  man_macro(struct man *man, int tok, int line, 
Line 81  man_macro(struct man *man, int tok, int line, 
                 man->next = MAN_NEXT_SIBLING;                  man->next = MAN_NEXT_SIBLING;
         }          }
   
           if (n == man->last && (FL_NLINE & man_flags[tok])) {
                   if (MAN_NLINE & man->flags)
                           return(man_perr(man, line, ppos, WLNSCOPE));
                   man->flags |= MAN_NLINE;
                   return(1);
           }
   
           if (FL_TLINE & man_flags[tok]) {
                   if (MAN_NLINE & man->flags)
                           return(man_perr(man, line, ppos, WLNSCOPE));
                   man->flags |= MAN_NLINE;
                   return(1);
           }
   
         /*          /*
          * Note that when TH is pruned, we'll be back at the root, so           * Note that when TH is pruned, we'll be back at the root, so
          * make sure that we don't clobber as its sibling.           * make sure that we don't clobber as its sibling.
Line 145  man_args(struct man *m, int line, 
Line 185  man_args(struct man *m, int line, 
                 if (buf[*pos])                  if (buf[*pos])
                         return(1);                          return(1);
   
                 if ( ! man_vwarn(m, line, *pos, "trailing spaces"))                  if ( ! man_pwarn(m, line, *pos, WTSPACE))
                         return(-1);                          return(-1);
   
                 return(1);                  return(1);
Line 163  man_args(struct man *m, int line, 
Line 203  man_args(struct man *m, int line, 
                 (*pos)++;                  (*pos)++;
   
         if (0 == buf[*pos]) {          if (0 == buf[*pos]) {
                 if ( ! man_vwarn(m, line, *pos, "unterminated quote"))                  if ( ! man_pwarn(m, line, *pos, WTQUOTE))
                         return(-1);                          return(-1);
                 return(1);                  return(1);
         }          }
Line 178  man_args(struct man *m, int line, 
Line 218  man_args(struct man *m, int line, 
         if (buf[*pos])          if (buf[*pos])
                 return(1);                  return(1);
   
         if ( ! man_vwarn(m, line, *pos, "trailing spaces"))          if ( ! man_pwarn(m, line, *pos, WTSPACE))
                 return(-1);                  return(-1);
         return(1);          return(1);
 }  }
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.18
CVSweb