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

Diff for /mandoc/Attic/mdoc_action.c between version 1.5 and 1.18

version 1.5, 2009/04/03 11:08:39 version 1.18, 2009/06/22 12:04:05
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the   * purpose with or without fee is hereby granted, provided that the above
  * above copyright notice and this permission notice appear in all   * copyright notice and this permission notice appear in all copies.
  * copies.  
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * PERFORMANCE OF THIS SOFTWARE.  
  */   */
 #include <sys/utsname.h>  #include <sys/utsname.h>
   
Line 53  static int   concat(struct mdoc *, const struct mdoc_n
Line 51  static int   concat(struct mdoc *, const struct mdoc_n
   
 static  int       post_ar(POST_ARGS);  static  int       post_ar(POST_ARGS);
 static  int       post_bl(POST_ARGS);  static  int       post_bl(POST_ARGS);
   static  int       post_bl_head(POST_ARGS);
 static  int       post_bl_width(POST_ARGS);  static  int       post_bl_width(POST_ARGS);
 static  int       post_bl_tagwidth(POST_ARGS);  static  int       post_bl_tagwidth(POST_ARGS);
 static  int       post_dd(POST_ARGS);  static  int       post_dd(POST_ARGS);
 static  int       post_display(POST_ARGS);  static  int       post_display(POST_ARGS);
 static  int       post_dt(POST_ARGS);  static  int       post_dt(POST_ARGS);
   static  int       post_lk(POST_ARGS);
 static  int       post_nm(POST_ARGS);  static  int       post_nm(POST_ARGS);
 static  int       post_os(POST_ARGS);  static  int       post_os(POST_ARGS);
 static  int       post_prol(POST_ARGS);  static  int       post_prol(POST_ARGS);
Line 72  static int   pre_dl(PRE_ARGS);
Line 72  static int   pre_dl(PRE_ARGS);
 #define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))  #define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
   
 const   struct actions mdoc_actions[MDOC_MAX] = {  const   struct actions mdoc_actions[MDOC_MAX] = {
         { NULL, NULL }, /* \" */          { NULL, NULL }, /* Ap */
         { NULL, post_dd }, /* Dd */          { NULL, post_dd }, /* Dd */
         { NULL, post_dt }, /* Dt */          { NULL, post_dt }, /* Dt */
         { NULL, post_os }, /* Os */          { NULL, post_os }, /* Os */
Line 179  const struct actions mdoc_actions[MDOC_MAX] = {
Line 179  const struct actions mdoc_actions[MDOC_MAX] = {
         { NULL, NULL }, /* Fr */          { NULL, NULL }, /* Fr */
         { NULL, NULL }, /* Ud */          { NULL, NULL }, /* Ud */
         { NULL, NULL }, /* Lb */          { NULL, NULL }, /* Lb */
         { NULL, NULL }, /* Ap */  
         { NULL, NULL }, /* Lp */          { NULL, NULL }, /* Lp */
         { NULL, NULL }, /* Lk */          { NULL, post_lk }, /* Lk */
         { NULL, NULL }, /* Mt */          { NULL, NULL }, /* Mt */
         { NULL, NULL }, /* Brq */          { NULL, NULL }, /* Brq */
         { NULL, NULL }, /* Bro */          { NULL, NULL }, /* Bro */
Line 212  mdoc_action_pre(struct mdoc *m, const struct mdoc_node
Line 211  mdoc_action_pre(struct mdoc *m, const struct mdoc_node
                 break;                  break;
         }          }
   
         if (NULL == mdoc_actions[m->last->tok].pre)          if (NULL == mdoc_actions[n->tok].pre)
                 return(1);                  return(1);
         return((*mdoc_actions[m->last->tok].pre)(m, n));          return((*mdoc_actions[n->tok].pre)(m, n));
 }  }
   
   
Line 347  post_nm(POST_ARGS)
Line 346  post_nm(POST_ARGS)
         buf[0] = 0;          buf[0] = 0;
         if ( ! concat(m, m->last->child, buf, sizeof(buf)))          if ( ! concat(m, m->last->child, buf, sizeof(buf)))
                 return(0);                  return(0);
   
         if (NULL == (m->meta.name = strdup(buf)))          if (NULL == (m->meta.name = strdup(buf)))
                 return(verr(m, EMALLOC));                  return(verr(m, EMALLOC));
   
Line 516  post_os(POST_ARGS)
Line 516  post_os(POST_ARGS)
   
         if (NULL == (m->meta.os = strdup(buf)))          if (NULL == (m->meta.os = strdup(buf)))
                 return(verr(m, EMALLOC));                  return(verr(m, EMALLOC));
         m->lastnamed = m->lastsec = SEC_BODY;  
   
           m->flags |= MDOC_PBODY;
         return(post_prol(m));          return(post_prol(m));
 }  }
   
Line 538  post_bl_tagwidth(struct mdoc *m)
Line 538  post_bl_tagwidth(struct mdoc *m)
          * width if a macro.           * width if a macro.
          */           */
   
         if ((n = m->last->body->child)) {          n = m->last->body->child;
           if (n) {
                 assert(MDOC_BLOCK == n->type);                  assert(MDOC_BLOCK == n->type);
                 assert(MDOC_It == n->tok);                  assert(MDOC_It == n->tok);
                 n = n->head->child;                  n = n->head->child;
Line 613  post_bl_width(struct mdoc *m)
Line 614  post_bl_width(struct mdoc *m)
          */           */
   
         if (0 == strcmp(p, "Ds"))          if (0 == strcmp(p, "Ds"))
                 width = 8;                  width = 6;
         else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))          else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
                 return(1);                  return(1);
         else if (0 == (width = mdoc_macro2len(tok)))          else if (0 == (width = mdoc_macro2len(tok)))
Line 634  post_bl_width(struct mdoc *m)
Line 635  post_bl_width(struct mdoc *m)
   
   
 static int  static int
   post_bl_head(POST_ARGS)
   {
           int                      i, c;
           struct mdoc_node        *n, *nn, *nnp;
   
           if (NULL == m->last->child)
                   return(1);
   
           n = m->last->parent;
           assert(n->args);
   
           for (c = 0; c < (int)n->args->argc; c++)
                   if (MDOC_Column == n->args->argv[c].arg)
                           break;
   
           /* Only process -column. */
   
           if (c == (int)n->args->argc)
                   return(1);
   
           assert(0 == n->args->argv[c].sz);
   
           /*
            * Accomodate for new-style groff column syntax.  Shuffle the
            * child nodes, all of which must be TEXT, as arguments for the
            * column field.  Then, delete the head children.
            */
   
           n->args->argv[c].sz = (size_t)m->last->nchild;
           n->args->argv[c].value = malloc
                   ((size_t)m->last->nchild * sizeof(char *));
   
           for (i = 0, nn = m->last->child; nn; i++) {
                   n->args->argv[c].value[i] = nn->string;
                   nn->string = NULL;
                   nnp = nn;
                   nn = nn->next;
                   mdoc_node_free(nnp);
           }
   
           m->last->nchild = 0;
           m->last->child = NULL;
   
           return(1);
   }
   
   
   static int
 post_bl(POST_ARGS)  post_bl(POST_ARGS)
 {  {
         int               i, r, len;          int               i, r, len;
   
           if (MDOC_HEAD == m->last->type)
                   return(post_bl_head(m));
         if (MDOC_BLOCK != m->last->type)          if (MDOC_BLOCK != m->last->type)
                 return(1);                  return(1);
   
Line 670  post_bl(POST_ARGS)
Line 721  post_bl(POST_ARGS)
   
   
 static int  static int
   post_lk(POST_ARGS)
   {
           struct mdoc_node *n;
   
           if (m->last->child)
                   return(1);
   
           n = m->last;
           m->next = MDOC_NEXT_CHILD;
           /* FIXME: this isn't documented anywhere! */
           if ( ! mdoc_word_alloc(m, m->last->line,
                                   m->last->pos, "~"))
                   return(0);
   
           m->last = n;
           m->next = MDOC_NEXT_SIBLING;
           return(1);
   }
   
   
   static int
 post_ar(POST_ARGS)  post_ar(POST_ARGS)
 {  {
         struct mdoc_node *n;          struct mdoc_node *n;
Line 747  static int
Line 819  static int
 pre_dl(PRE_ARGS)  pre_dl(PRE_ARGS)
 {  {
   
         if (MDOC_BODY != n->type)          if (MDOC_BODY == n->type)
                 return(1);                  m->flags |= MDOC_LITERAL;
         m->flags |= MDOC_LITERAL;  
         return(1);          return(1);
 }  }
   
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.18
CVSweb