Lint fixes.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index c15771450e2a52c7394a62ca2e7451f50cf7453a..da66e73920c0038869276c475326f1083f265e53 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,20 +1,18 @@
-/* $Id: mdoc_action.c,v 1.5 2009/04/03 11:08:39 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.15 2009/06/17 14:10:09 kristaps Exp $ */
 /*
- * 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
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/utsname.h>
 
@@ -53,11 +51,13 @@ static      int       concat(struct mdoc *, const struct mdoc_node *,
 
 static int       post_ar(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_tagwidth(POST_ARGS);
 static int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
+static int       post_lk(POST_ARGS);
 static int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_prol(POST_ARGS);
@@ -72,7 +72,7 @@ static        int       pre_dl(PRE_ARGS);
 #define        nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
 
 const  struct actions mdoc_actions[MDOC_MAX] = {
-       { NULL, NULL }, /* \" */
+       { NULL, NULL }, /* Ap */
        { NULL, post_dd }, /* Dd */ 
        { NULL, post_dt }, /* Dt */ 
        { NULL, post_os }, /* Os */ 
@@ -179,9 +179,8 @@ const       struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, NULL }, /* Lb */
-       { NULL, NULL }, /* Ap */
        { NULL, NULL }, /* Lp */
-       { NULL, NULL }, /* Lk */
+       { NULL, post_lk }, /* Lk */
        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Brq */
        { NULL, NULL }, /* Bro */
@@ -212,9 +211,9 @@ mdoc_action_pre(struct mdoc *m, const struct mdoc_node *n)
                break;
        }
 
-       if (NULL == mdoc_actions[m->last->tok].pre)
+       if (NULL == mdoc_actions[n->tok].pre)
                return(1);
-       return((*mdoc_actions[m->last->tok].pre)(m, n));
+       return((*mdoc_actions[n->tok].pre)(m, n));
 }
 
 
@@ -347,6 +346,7 @@ post_nm(POST_ARGS)
        buf[0] = 0;
        if ( ! concat(m, m->last->child, buf, sizeof(buf)))
                return(0);
+
        if (NULL == (m->meta.name = strdup(buf)))
                return(verr(m, EMALLOC));
 
@@ -516,8 +516,8 @@ post_os(POST_ARGS)
 
        if (NULL == (m->meta.os = strdup(buf)))
                return(verr(m, EMALLOC));
-       m->lastnamed = m->lastsec = SEC_BODY;
 
+       m->flags |= MDOC_PBODY;
        return(post_prol(m));
 }
 
@@ -538,7 +538,8 @@ post_bl_tagwidth(struct mdoc *m)
         * width if a macro.
         */
 
-       if ((n = m->last->body->child)) {
+       n = m->last->body->child;
+       if (n) {
                assert(MDOC_BLOCK == n->type);
                assert(MDOC_It == n->tok);
                n = n->head->child;
@@ -633,11 +634,61 @@ post_bl_width(struct mdoc *m)
 }
 
 
+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.
+        */
+
+       for (i = 0, nn = m->last->child; nn; nn = nn->next, i++)
+               /* Count children. */;
+
+       n->args->argv[c].sz = (size_t)i;
+       n->args->argv[c].value = malloc((size_t)i * 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->child = NULL;
+       return(1);
+}
+
+
 static int
 post_bl(POST_ARGS)
 {
        int               i, r, len;
 
+       if (MDOC_HEAD == m->last->type)
+               return(post_bl_head(m));
        if (MDOC_BLOCK != m->last->type)
                return(1);
 
@@ -669,6 +720,27 @@ post_bl(POST_ARGS)
 }
 
 
+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)
 {