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

Diff for /mandoc/man_macro.c between version 1.21 and 1.24

version 1.21, 2009/08/19 09:14:50 version 1.24, 2009/08/20 13:51:55
Line 38  static int   rew_block(int, enum man_type, 
Line 38  static int   rew_block(int, enum man_type, 
 const   struct man_macro __man_macros[MAN_MAX] = {  const   struct man_macro __man_macros[MAN_MAX] = {
         { in_line_eoln, 0 }, /* br */          { in_line_eoln, 0 }, /* br */
         { in_line_eoln, 0 }, /* TH */          { in_line_eoln, 0 }, /* TH */
         { blk_imp, 0 }, /* SH */          { blk_imp, MAN_SCOPED }, /* SH */
         { blk_imp, 0 }, /* SS */          { blk_imp, MAN_SCOPED }, /* SS */
         { blk_imp, MAN_SCOPED }, /* TP */          { blk_imp, MAN_SCOPED }, /* TP */
         { blk_imp, 0 }, /* LP */          { blk_imp, 0 }, /* LP */
         { blk_imp, 0 }, /* PP */          { blk_imp, 0 }, /* PP */
Line 64  const struct man_macro __man_macros[MAN_MAX] = {
Line 64  const struct man_macro __man_macros[MAN_MAX] = {
         { in_line_eoln, 0 }, /* fi */          { in_line_eoln, 0 }, /* fi */
         { in_line_eoln, 0 }, /* r */          { in_line_eoln, 0 }, /* r */
         { blk_close, 0 }, /* RE */          { blk_close, 0 }, /* RE */
         { blk_imp, 0 }, /* RS */          { blk_imp, MAN_EXPLICIT }, /* RS */
           { in_line_eoln, 0 }, /* DT */
 };  };
   
 const   struct man_macro * const man_macros = __man_macros;  const   struct man_macro * const man_macros = __man_macros;
Line 312  in_line_eoln(MACRO_PROT_ARGS)
Line 313  in_line_eoln(MACRO_PROT_ARGS)
          * make sure that we don't clobber as its sibling.           * make sure that we don't clobber as its sibling.
          */           */
   
         /* FIXME: clean this to use man_unscope(). */  
   
         for ( ; m->last; m->last = m->last->parent) {          for ( ; m->last; m->last = m->last->parent) {
                 if (m->last == n)                  if (m->last == n)
                         break;                          break;
Line 345  in_line_eoln(MACRO_PROT_ARGS)
Line 344  in_line_eoln(MACRO_PROT_ARGS)
 int  int
 man_macroend(struct man *m)  man_macroend(struct man *m)
 {  {
           struct man_node *n;
   
           n = MAN_VALID & m->last->flags ?
                   m->last->parent : m->last;
   
           for ( ; n; n = n->parent) {
                   if (MAN_BLOCK != n->type)
                           continue;
                   if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                           continue;
                   return(man_nerr(m, n, WEXITSCOPE));
           }
   
         return(man_unscope(m, m->first));          return(man_unscope(m, m->first));
 }  }
Legend:
Removed from v.1.21  
changed lines
  Added in v.1.24
CVSweb