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

Diff for /mandoc/mdoc_validate.c between version 1.175 and 1.185

version 1.175, 2011/08/19 13:59:23 version 1.185, 2012/07/10 14:38:51
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * 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 545  check_text(struct mdoc *m, int ln, int pos, char *p)
Line 545  check_text(struct mdoc *m, int ln, int pos, char *p)
 {  {
         char            *cp;          char            *cp;
   
         cp = p;          if (MDOC_LITERAL & m->flags)
         for (cp = p; NULL != (p = strchr(p, '\t')); p++) {                  return;
                 if (MDOC_LITERAL & m->flags)  
                         continue;          for (cp = p; NULL != (p = strchr(p, '\t')); p++)
                 mdoc_pmsg(m, ln, (int)(p - cp), MANDOCERR_BADTAB);                  mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);
         }  
 }  }
   
 static int  static int
Line 662  pre_bl(PRE_ARGS)
Line 661  pre_bl(PRE_ARGS)
                         comp = 1;                          comp = 1;
                         break;                          break;
                 case (MDOC_Width):                  case (MDOC_Width):
                         dup = (NULL != n->norm->Bl.width);                          /* NB: this can be empty! */
                         width = n->args->argv[i].value[0];                          if (n->args->argv[i].sz) {
                                   width = n->args->argv[i].value[0];
                                   dup = (NULL != n->norm->Bl.width);
                                   break;
                           }
                           mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                         break;                          break;
                 case (MDOC_Offset):                  case (MDOC_Offset):
                         /* NB: this can be empty! */                          /* NB: this can be empty! */
Line 729  pre_bl(PRE_ARGS)
Line 733  pre_bl(PRE_ARGS)
         /*          /*
          * Validate the width field.  Some list types don't need width           * Validate the width field.  Some list types don't need width
          * types and should be warned about them.  Others should have it           * types and should be warned about them.  Others should have it
          * and must also be warned.           * and must also be warned.  Yet others have a default and need
            * no warning.
          */           */
   
         switch (n->norm->Bl.type) {          switch (n->norm->Bl.type) {
         case (LIST_tag):          case (LIST_tag):
                 if (n->norm->Bl.width)                  if (NULL == n->norm->Bl.width)
                         break;                          mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
                 mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);  
                 break;                  break;
         case (LIST_column):          case (LIST_column):
                 /* FALLTHROUGH */                  /* FALLTHROUGH */
Line 750  pre_bl(PRE_ARGS)
Line 754  pre_bl(PRE_ARGS)
                 if (n->norm->Bl.width)                  if (n->norm->Bl.width)
                         mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);                          mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                 break;                  break;
           case (LIST_bullet):
                   /* FALLTHROUGH */
           case (LIST_dash):
                   /* FALLTHROUGH */
           case (LIST_hyphen):
                   if (NULL == n->norm->Bl.width)
                           n->norm->Bl.width = "2n";
                   break;
           case (LIST_enum):
                   if (NULL == n->norm->Bl.width)
                           n->norm->Bl.width = "3n";
                   break;
         default:          default:
                 break;                  break;
         }          }
Line 1695  post_rs(POST_ARGS)
Line 1711  post_rs(POST_ARGS)
         }          }
   
         /*          /*
            * Nothing to sort if only invalid nodes were found
            * inside the `Rs' body.
            */
   
           if (NULL == mdoc->last->child)
                   return(1);
   
           /*
          * The full `Rs' block needs special handling to order the           * The full `Rs' block needs special handling to order the
          * sub-elements according to `rsord'.  Pick through each element           * sub-elements according to `rsord'.  Pick through each element
          * and correctly order it.  This is a insertion sort.           * and correctly order it.  This is a insertion sort.
Line 1819  static int
Line 1843  static int
 post_sh_head(POST_ARGS)  post_sh_head(POST_ARGS)
 {  {
         char             buf[BUFSIZ];          char             buf[BUFSIZ];
           struct mdoc_node *n;
         enum mdoc_sec    sec;          enum mdoc_sec    sec;
         int              c;          int              c;
   
Line 1853  post_sh_head(POST_ARGS)
Line 1878  post_sh_head(POST_ARGS)
   
         mdoc->lastsec = sec;          mdoc->lastsec = sec;
   
           /*
            * Set the section attribute for the current HEAD, for its
            * parent BLOCK, and for the HEAD children; the latter can
            * only be TEXT nodes, so no recursion is needed.
            * For other blocks and elements, including .Sh BODY, this is
            * done when allocating the node data structures, but for .Sh
            * BLOCK and HEAD, the section is still unknown at that time.
            */
   
           mdoc->last->parent->sec = sec;
           mdoc->last->sec = sec;
           for (n = mdoc->last->child; n; n = n->next)
                   n->sec = sec;
   
         /* We don't care about custom sections after this. */          /* We don't care about custom sections after this. */
   
         if (SEC_CUSTOM == sec)          if (SEC_CUSTOM == sec)
Line 2077  post_dt(POST_ARGS)
Line 2116  post_dt(POST_ARGS)
          *       arch = NULL           *       arch = NULL
          */           */
   
         cp = mdoc_a2msec(nn->string);          cp = mandoc_a2msec(nn->string);
         if (cp) {          if (cp) {
                 mdoc->meta.vol = mandoc_strdup(cp);                  mdoc->meta.vol = mandoc_strdup(cp);
                 mdoc->meta.msec = mandoc_strdup(nn->string);                  mdoc->meta.msec = mandoc_strdup(nn->string);
Line 2165  post_os(POST_ARGS)
Line 2204  post_os(POST_ARGS)
         n = mdoc->last;          n = mdoc->last;
   
         /*          /*
          * Set the operating system by way of the `Os' macro.  Note that           * Set the operating system by way of the `Os' macro.
          * if an argument isn't provided and -DOSNAME="\"foo\"" is           * The order of precedence is:
          * provided during compilation, this value will be used instead           * 1. the argument of the `Os' macro, unless empty
          * of filling in "sysname release" from uname().           * 2. the -Ios=foo command line argument, if provided
            * 3. -DOSNAME="\"foo\"", if provided during compilation
            * 4. "sysname release" from uname(3)
          */           */
   
         if (mdoc->meta.os)          free(mdoc->meta.os);
                 free(mdoc->meta.os);  
   
         buf[0] = '\0';          buf[0] = '\0';
         if (-1 == (c = concat(buf, n->child, BUFSIZ))) {          if (-1 == (c = concat(buf, n->child, BUFSIZ))) {
Line 2182  post_os(POST_ARGS)
Line 2222  post_os(POST_ARGS)
   
         assert(c);          assert(c);
   
         /* XXX: yes, these can all be dynamically-adjusted buffers, but  
          * it's really not worth the extra hackery.  
          */  
   
         if ('\0' == buf[0]) {          if ('\0' == buf[0]) {
                   if (mdoc->defos) {
                           mdoc->meta.os = mandoc_strdup(mdoc->defos);
                           return(1);
                   }
 #ifdef OSNAME  #ifdef OSNAME
                 if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {                  if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
                         mdoc_nmsg(mdoc, n, MANDOCERR_MEM);                          mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
Legend:
Removed from v.1.175  
changed lines
  Added in v.1.185
CVSweb