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

Diff for /mandoc/mdoc_macro.c between version 1.79 and 1.82

version 1.79, 2010/05/31 23:49:16 version 1.82, 2010/06/27 15:52:41
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * 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 607  rew_sub(enum mdoc_type t, struct mdoc *m, 
Line 607  rew_sub(enum mdoc_type t, struct mdoc *m, 
         if ( ! rew_last(m, n))          if ( ! rew_last(m, n))
                 return(0);                  return(0);
   
 #ifdef  UGLY  
         /*          /*
          * The current block extends an enclosing block beyond a line           * The current block extends an enclosing block beyond a line
          * break.  Now that the current block ends, close the enclosing           * break.  Now that the current block ends, close the enclosing
Line 620  rew_sub(enum mdoc_type t, struct mdoc *m, 
Line 619  rew_sub(enum mdoc_type t, struct mdoc *m, 
                 if ( ! mdoc_body_alloc(m, n->line, n->pos, n->tok))                  if ( ! mdoc_body_alloc(m, n->line, n->pos, n->tok))
                         return(0);                          return(0);
         }          }
 #endif  
   
         return(1);          return(1);
 }  }
Line 936  blk_full(MACRO_PROT_ARGS)
Line 934  blk_full(MACRO_PROT_ARGS)
         struct mdoc_arg  *arg;          struct mdoc_arg  *arg;
         struct mdoc_node *head; /* save of head macro */          struct mdoc_node *head; /* save of head macro */
         struct mdoc_node *body; /* save of body macro */          struct mdoc_node *body; /* save of body macro */
 #ifdef  UGLY  
         struct mdoc_node *n;          struct mdoc_node *n;
 #endif  
         enum mdoc_type    mtt;          enum mdoc_type    mtt;
         enum mdoct        ntok;          enum mdoct        ntok;
         enum margserr     ac, lac;          enum margserr     ac, lac;
Line 1120  blk_full(MACRO_PROT_ARGS)
Line 1116  blk_full(MACRO_PROT_ARGS)
         if (NULL != body)          if (NULL != body)
                 goto out;                  goto out;
   
 #ifdef  UGLY  
         /*          /*
          * If there is an open (i.e., unvalidated) sub-block requiring           * If there is an open (i.e., unvalidated) sub-block requiring
          * explicit close-out, postpone switching the current block from           * explicit close-out, postpone switching the current block from
Line 1136  blk_full(MACRO_PROT_ARGS)
Line 1131  blk_full(MACRO_PROT_ARGS)
                         return(1);                          return(1);
                 }                  }
         }          }
 #endif  
   
         /* Close out scopes to remain in a consistent state. */          /* Close out scopes to remain in a consistent state. */
   
Legend:
Removed from v.1.79  
changed lines
  Added in v.1.82
CVSweb