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

Diff for /mandoc/Attic/macro.c between version 1.68 and 1.71

version 1.68, 2009/03/12 06:32:17 version 1.71, 2009/03/12 23:05:21
Line 89  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
Line 89  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
         { macro_text, MDOC_PARSED }, /* An */          { macro_text, MDOC_PARSED }, /* An */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
         { macro_constant, 0 }, /* Cd */          { macro_constant, MDOC_CALLABLE }, /* Cd */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */
Line 128  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
Line 128  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
         { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */          { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
         { macro_constant_delimited, 0 }, /* At */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* At */
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
         { macro_scoped, MDOC_EXPLICIT }, /* Bf */          { macro_scoped, MDOC_EXPLICIT }, /* Bf */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
         { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */          { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
         { macro_constant_delimited, MDOC_PARSED }, /* Bsx */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */
         { macro_constant_delimited, MDOC_PARSED }, /* Bx */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */
         { macro_constant, 0 }, /* Db */          { macro_constant, 0 }, /* Db */
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
Line 143  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
Line 143  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
         { macro_scoped_close, MDOC_EXPLICIT }, /* Ef */          { macro_scoped_close, MDOC_EXPLICIT }, /* Ef */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
         { macro_constant_delimited, MDOC_PARSED }, /* Fx */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
         { macro_text, MDOC_PARSED }, /* Ms */          { macro_text, MDOC_PARSED }, /* Ms */
         { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */
         { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
         { macro_constant_delimited, MDOC_PARSED }, /* Nx */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
         { macro_constant_delimited, MDOC_PARSED }, /* Ox */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
         { macro_constant_delimited, MDOC_PARSED }, /* Pf */          { macro_constant_delimited, MDOC_PARSED }, /* Pf */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
Line 166  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
Line 166  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
         { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */          { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
         { macro_constant_delimited, MDOC_PARSED }, /* Ux */          { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
         /* XXX - .Fo supposed to be (but isn't) callable. */          /* XXX - .Fo supposed to be (but isn't) callable. */
Line 188  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
Line 188  const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
         { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */          { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
         { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */          { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */
         { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */          { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */
           { macro_constant, 0 }, /* %C */
 };  };
   
 const   struct mdoc_macro * const mdoc_macros = __mdoc_macros;  const   struct mdoc_macro * const mdoc_macros = __mdoc_macros;
Line 1393  macro_constant(MACRO_PROT_ARGS)
Line 1394  macro_constant(MACRO_PROT_ARGS)
         struct mdoc_arg  *arg;          struct mdoc_arg  *arg;
         char             *p;          char             *p;
   
         assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));  
   
         arg = NULL;          arg = NULL;
   
         for (;;) {          for (;;) {
Line 1482  macro_phrase(struct mdoc *mdoc, int line, int ppos, ch
Line 1481  macro_phrase(struct mdoc *mdoc, int line, int ppos, ch
                 if (MDOC_MAX != (c = mdoc_tokhash_find(mdoc->htab, &buf[la]))) {                  if (MDOC_MAX != (c = mdoc_tokhash_find(mdoc->htab, &buf[la]))) {
                         if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))                          if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))
                                 return(0);                                  return(0);
                           return(append_delims(mdoc, line, &i, buf));
                         return(1);  
                 }                  }
   
                 if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la]))                  if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la]))
Legend:
Removed from v.1.68  
changed lines
  Added in v.1.71
CVSweb