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

Diff for /mandoc/roff.c between version 1.99 and 1.100

version 1.99, 2010/08/24 12:48:43 version 1.100, 2010/08/29 11:29:51
Line 59  enum rofft {
Line 59  enum rofft {
         ROFF_rm,          ROFF_rm,
         ROFF_tr,          ROFF_tr,
         ROFF_cblock,          ROFF_cblock,
         ROFF_ccond,          ROFF_ccond, /* FIXME: remove this. */
         ROFF_nr,          ROFF_nr,
         ROFF_MAX          ROFF_MAX
 };  };
Line 764  roff_cond_sub(ROFF_ARGS)
Line 764  roff_cond_sub(ROFF_ARGS)
         if (l != r->last)          if (l != r->last)
                 return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);                  return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
   
         if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))          if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) {
                   if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1])
                           return(roff_ccond
                                   (r, ROFF_ccond, bufp, szp,
                                    ln, pos, pos + 2, offs));
                 return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);                  return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
           }
   
         /*          /*
          * A denied conditional must evaluate its children if and only           * A denied conditional must evaluate its children if and only
Line 796  roff_cond_text(ROFF_ARGS)
Line 801  roff_cond_text(ROFF_ARGS)
          * We display the value of the text if out current evaluation           * We display the value of the text if out current evaluation
          * scope permits us to do so.           * scope permits us to do so.
          */           */
   
           /* FIXME: use roff_ccond? */
   
         st = &(*bufp)[pos];          st = &(*bufp)[pos];
         if (NULL == (ep = strstr(st, "\\}"))) {          if (NULL == (ep = strstr(st, "\\}"))) {

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.100

CVSweb