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

Diff for /mandoc/man.c between version 1.58 and 1.59

version 1.58, 2010/03/29 04:52:14 version 1.59, 2010/03/29 10:10:35
Line 485  man_pmacro(struct man *m, int ln, char *buf)
Line 485  man_pmacro(struct man *m, int ln, char *buf)
   
         /* Comments and empties are quickly ignored. */          /* Comments and empties are quickly ignored. */
   
         if (MAN_BLINE & m->flags)  
                 m->flags |= MAN_BPLINE;  
   
         if ('\0' == buf[1])          if ('\0' == buf[1])
                 return(1);                  return(1);
   
Line 555  man_pmacro(struct man *m, int ln, char *buf)
Line 552  man_pmacro(struct man *m, int ln, char *buf)
          * Remove prior ELINE macro, as it's being clobbering by a new           * Remove prior ELINE macro, as it's being clobbering by a new
          * macro.  Note that NSCOPED macros do not close out ELINE           * macro.  Note that NSCOPED macros do not close out ELINE
          * macros---they don't print text---so we let those slip by.           * macros---they don't print text---so we let those slip by.
            * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
            * here because that would stipulate blocks as children of
            * elements!
          */           */
   
         if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&          if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
Line 586  man_pmacro(struct man *m, int ln, char *buf)
Line 586  man_pmacro(struct man *m, int ln, char *buf)
                 m->flags &= ~MAN_ELINE;                  m->flags &= ~MAN_ELINE;
         }          }
   
         /* Begin recursive parse sequence. */          /*
            * Save the fact that we're in the next-line for a block.  In
            * this way, embedded roff instructions can "remember" state
            * when they exit.
            */
   
         assert(man_macros[tok].fp);          if (MAN_BLINE & m->flags)
                   m->flags |= MAN_BPLINE;
   
           /* Call to handler... */
   
           assert(man_macros[tok].fp);
         if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))          if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
                 goto err;                  goto err;
   
Line 597  out:
Line 605  out:
         /*          /*
          * We weren't in a block-line scope when entering the           * We weren't in a block-line scope when entering the
          * above-parsed macro, so return.           * above-parsed macro, so return.
          *  
          * FIXME: this prohibits the nesting of blocks (e.g., `de' and  
          * family) within BLINE or ELINE systems.  This is annoying.  
          */           */
   
         if ( ! (MAN_BPLINE & m->flags)) {          if ( ! (MAN_BPLINE & m->flags)) {

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59

CVSweb