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

Diff for /mandoc/mdoc.c between version 1.96 and 1.97

version 1.96, 2009/07/27 19:43:02 version 1.97, 2009/07/29 08:46:06
Line 29  const char *const __mdoc_merrnames[MERRMAX] = {   
Line 29  const char *const __mdoc_merrnames[MERRMAX] = {   
         "unterminated quoted parameter", /* EQUOTTERM */          "unterminated quoted parameter", /* EQUOTTERM */
         "system: malloc error", /* EMALLOC */          "system: malloc error", /* EMALLOC */
         "argument parameter suggested", /* EARGVAL */          "argument parameter suggested", /* EARGVAL */
         "macro not callable", /* ENOCALL */  
         "macro disallowed in prologue", /* EBODYPROL */          "macro disallowed in prologue", /* EBODYPROL */
         "macro disallowed in body", /* EPROLBODY */          "macro disallowed in body", /* EPROLBODY */
         "text disallowed in prologue", /* ETEXTPROL */          "text disallowed in prologue", /* ETEXTPROL */
Line 70  const char *const __mdoc_merrnames[MERRMAX] = {   
Line 69  const char *const __mdoc_merrnames[MERRMAX] = {   
         "superfluous width argument", /* ENOWIDTH */          "superfluous width argument", /* ENOWIDTH */
         "system: utsname error", /* EUTSNAME */          "system: utsname error", /* EUTSNAME */
         "obsolete macro", /* EOBS */          "obsolete macro", /* EOBS */
         "macro-like parameter", /* EMACPARM */  
         "end-of-line scope violation", /* EIMPBRK */          "end-of-line scope violation", /* EIMPBRK */
         "empty macro ignored", /* EIGNE */          "empty macro ignored", /* EIGNE */
         "unclosed explicit scope", /* EOPEN */          "unclosed explicit scope", /* EOPEN */
Line 353  int
Line 351  int
 mdoc_macro(struct mdoc *m, int tok,  mdoc_macro(struct mdoc *m, int tok,
                 int ln, int pp, int *pos, char *buf)                  int ln, int pp, int *pos, char *buf)
 {  {
           /*
            * If we're in the prologue, deny "body" macros.  Similarly, if
            * we're in the body, deny prologue calls.
            */
         if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&          if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
                         MDOC_PBODY & m->flags)                          MDOC_PBODY & m->flags)
                 return(mdoc_perr(m, ln, pp, EPROLBODY));                  return(mdoc_perr(m, ln, pp, EPROLBODY));
         if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&          if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
                         ! (MDOC_PBODY & m->flags))                          ! (MDOC_PBODY & m->flags))
                 return(mdoc_perr(m, ln, pp, EBODYPROL));                  return(mdoc_perr(m, ln, pp, EBODYPROL));
   
         if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))  
                 return(mdoc_perr(m, ln, pp, ENOCALL));  
   
         return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));          return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }  }
Legend:
Removed from v.1.96  
changed lines
  Added in v.1.97
CVSweb