[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.85 and 1.86

version 1.85, 2010/06/29 19:45:06 version 1.86, 2010/06/30 04:05:02
Line 335  rew_dohalt(enum mdoct tok, enum mdoc_type type, 
Line 335  rew_dohalt(enum mdoct tok, enum mdoc_type type, 
                 const struct mdoc_node *p)                  const struct mdoc_node *p)
 {  {
   
           /*
            * No matching token, no delimiting block, no broken block.
            * This can happen when full implicit macros are called for
            * the first time but try to rewind their previous
            * instance anyway.
            */
         if (MDOC_ROOT == p->type)          if (MDOC_ROOT == p->type)
                 return(MDOC_BLOCK == type &&                  return(MDOC_BLOCK == type &&
                     MDOC_EXPLICIT & mdoc_macros[tok].flags ?                      MDOC_EXPLICIT & mdoc_macros[tok].flags ?
                     REWIND_ERROR : REWIND_NONE);                      REWIND_ERROR : REWIND_NONE);
   
           /*
            * When starting to rewind, skip plain text
            * and nodes that have already been rewound.
            */
         if (MDOC_TEXT == p->type || MDOC_VALID & p->flags)          if (MDOC_TEXT == p->type || MDOC_VALID & p->flags)
                 return(REWIND_MORE);                  return(REWIND_MORE);
   
           /*
            * The easiest case:  Found a matching token.
            * This applies to both blocks and elements.
            */
         tok = rew_alt(tok);          tok = rew_alt(tok);
         if (tok == p->tok)          if (tok == p->tok)
                 return(p->end ? REWIND_NONE :                  return(p->end ? REWIND_NONE :
                     type == p->type ? REWIND_THIS : REWIND_MORE);                      type == p->type ? REWIND_THIS : REWIND_MORE);
   
           /*
            * While elements do require rewinding for themselves,
            * they never affect rewinding of other nodes.
            */
         if (MDOC_ELEM == p->type)          if (MDOC_ELEM == p->type)
                 return(REWIND_MORE);                  return(REWIND_MORE);
   
           /*
            * Blocks delimited by our target token get REWIND_MORE.
            * Blocks delimiting our target token get REWIND_NONE.
            */
         switch (tok) {          switch (tok) {
         case (MDOC_Bl):          case (MDOC_Bl):
                 if (MDOC_It == p->tok)                  if (MDOC_It == p->tok)
Line 384  rew_dohalt(enum mdoct tok, enum mdoc_type type, 
Line 407  rew_dohalt(enum mdoct tok, enum mdoc_type type, 
                 break;                  break;
         }          }
   
         return(p->end || (MDOC_BLOCK == p->type &&          /*
             ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) ?           * Default block rewinding rules.
             REWIND_MORE : REWIND_LATER);           * In particular, always skip block end markers.
            */
           if (p->end || (MDOC_BLOCK == p->type &&
               ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)))
                   return(REWIND_MORE);
   
           /*
            * Partial blocks allow delayed rewinding by default.
            */
           if (&blk_full != mdoc_macros[tok].fp)
                   return (REWIND_LATER);
   
           /*
            * Full blocks can only be rewound when matching
            * or when there is an explicit rule.
            */
           return(REWIND_ERROR);
 }  }
   
   
Legend:
Removed from v.1.85  
changed lines
  Added in v.1.86
CVSweb