[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.133 and 1.134

version 1.133, 2014/07/02 08:21:39 version 1.134, 2014/07/02 11:43:20
Line 528  make_pending(struct mdoc_node *broken, enum mdoct tok,
Line 528  make_pending(struct mdoc_node *broken, enum mdoct tok,
                         taker->pending = broken->pending;                          taker->pending = broken->pending;
                 }                  }
                 broken->pending = breaker;                  broken->pending = breaker;
                 mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,                  mandoc_vmsg(MANDOCERR_BLOCK_NEST, mdoc->parse, line, ppos,
                     "%s breaks %s", mdoc_macronames[tok],                      "%s breaks %s", mdoc_macronames[tok],
                     mdoc_macronames[broken->tok]);                      mdoc_macronames[broken->tok]);
                 return(1);                  return(1);
Line 1354  blk_part_imp(MACRO_PROT_ARGS)
Line 1354  blk_part_imp(MACRO_PROT_ARGS)
                         return(1);                          return(1);
                 }                  }
         }          }
           assert(n == body);
   
         /*          if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
          * If we can't rewind to our body, then our scope has already  
          * been closed by another macro (like `Oc' closing `Op').  This  
          * is ugly behaviour nodding its head to OpenBSD's overwhelming  
          * crufty use of `Op' breakage.  
          */  
         if (n != body)  
                 mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line,  
                     ppos, "%s broken", mdoc_macronames[tok]);  
   
         if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))  
                 return(0);                  return(0);
   
         /* Standard appending of delimiters. */          /* Standard appending of delimiters. */
Line 1375  blk_part_imp(MACRO_PROT_ARGS)
Line 1366  blk_part_imp(MACRO_PROT_ARGS)
   
         /* Rewind scope, if applicable. */          /* Rewind scope, if applicable. */
   
         if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))          if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
                 return(0);                  return(0);
   
         /* Move trailing .Ns out of scope. */          /* Move trailing .Ns out of scope. */

Legend:
Removed from v.1.133  
changed lines
  Added in v.1.134

CVSweb