[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.139 and 1.140

version 1.139, 2018/12/31 04:55:46 version 1.140, 2018/12/31 07:08:12
Line 63  static const struct man_macro man_macros[MAN_MAX - MAN
Line 63  static const struct man_macro man_macros[MAN_MAX - MAN
         { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* I */          { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* I */
         { in_line_eoln, 0 }, /* IR */          { in_line_eoln, 0 }, /* IR */
         { in_line_eoln, 0 }, /* RI */          { in_line_eoln, 0 }, /* RI */
         { in_line_eoln, MAN_NSCOPED }, /* nf */  
         { in_line_eoln, MAN_NSCOPED }, /* fi */  
         { blk_close, MAN_XSCOPE }, /* RE */          { blk_close, MAN_XSCOPE }, /* RE */
         { blk_exp, MAN_XSCOPE }, /* RS */          { blk_exp, MAN_XSCOPE }, /* RS */
         { in_line_eoln, 0 }, /* DT */          { in_line_eoln, 0 }, /* DT */
Line 340  blk_imp(MACRO_PROT_ARGS)
Line 338  blk_imp(MACRO_PROT_ARGS)
         struct roff_node *n;          struct roff_node *n;
   
         rew_scope(man, tok);          rew_scope(man, tok);
         n = roff_block_alloc(man, line, ppos, tok);          if (tok == MAN_SH || tok == MAN_SS)
         if (n->tok == MAN_SH || n->tok == MAN_SS)                  man->flags &= ~ROFF_NOFILL;
                 man->flags &= ~MAN_LITERAL;          roff_block_alloc(man, line, ppos, tok);
         n = roff_head_alloc(man, line, ppos, tok);          n = roff_head_alloc(man, line, ppos, tok);
   
         /* Add line arguments. */          /* Add line arguments. */
Line 384  in_line_eoln(MACRO_PROT_ARGS)
Line 382  in_line_eoln(MACRO_PROT_ARGS)
         n = man->last;          n = man->last;
   
         for (;;) {          for (;;) {
                 if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) {  
                         mandoc_msg(MANDOCERR_ARG_SKIP, line, *pos,  
                             "%s %s", roff_name[tok], buf + *pos);  
                         break;  
                 }  
                 if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {                  if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
                         mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,                          mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
                             "%s ... %s", roff_name[tok], buf + *pos);                              "%s ... %s", roff_name[tok], buf + *pos);

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.140

CVSweb