Version.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index bfc93da7b0e47e96772ac1b5389f622ae7eb8723..ca6a76d31b1686bf86a5a7042f7ff662eec34dcc 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.11 2009/06/12 12:52:51 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.20 2009/06/25 08:42:06 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -33,6 +33,7 @@ enum  mwarn {
 enum   merr {
        ETOOLONG,
        EMALLOC,
 enum   merr {
        ETOOLONG,
        EMALLOC,

+       EUTSNAME,

        ENUMFMT
 };
 
        ENUMFMT
 };
 


@@ -51,6 +52,7 @@ static        int       concat(struct mdoc *, const struct mdoc_node *,
 
 static int       post_ar(POST_ARGS);
 static int       post_bl(POST_ARGS);
 
 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_bl_width(POST_ARGS);
 static int       post_bl_tagwidth(POST_ARGS);
 static int       post_dd(POST_ARGS);


@@ -71,7 +73,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] = {
 #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 */ 
        { NULL, post_dd }, /* Dd */ 
        { NULL, post_dt }, /* Dt */ 
        { NULL, post_os }, /* Os */ 


@@ -88,7 +90,7 @@ const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */
        { NULL, post_ar }, /* Ar */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */
        { NULL, post_ar }, /* Ar */

-       { NULL, NULL }, /* Cd */
+       { NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */

        { NULL, NULL }, /* Cm */
        { NULL, NULL }, /* Dv */ 
        { NULL, NULL }, /* Er */ 
        { NULL, NULL }, /* Cm */
        { NULL, NULL }, /* Dv */ 
        { NULL, NULL }, /* Er */ 


@@ -178,7 +180,6 @@ const       struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, NULL }, /* Lb */
        { NULL, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, NULL }, /* Lb */

-       { NULL, NULL }, /* Ap */

        { NULL, NULL }, /* Lp */
        { NULL, post_lk }, /* Lk */
        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Lp */
        { NULL, post_lk }, /* Lk */
        { NULL, NULL }, /* Mt */


@@ -272,6 +273,9 @@ perr(struct mdoc *m, int line, int pos, enum merr type)
        case (ETOOLONG):
                p = "argument text too long";
                break;
        case (ETOOLONG):
                p = "argument text too long";
                break;

+       case (EUTSNAME):
+               p = "utsname";
+               break;

        case (EMALLOC):
                p = "memory exhausted";
                break;
        case (EMALLOC):
                p = "memory exhausted";
                break;


@@ -505,7 +509,7 @@ post_os(POST_ARGS)
 
        if (0 == buf[0]) {
                if (-1 == uname(&utsname))
 
        if (0 == buf[0]) {
                if (-1 == uname(&utsname))

-                       return(mdoc_err(m, "utsname"));
+                       return(verr(m, EUTSNAME));

                if (strlcat(buf, utsname.sysname, 64) >= 64)
                        return(verr(m, ETOOLONG));
                if (strlcat(buf, " ", 64) >= 64)
                if (strlcat(buf, utsname.sysname, 64) >= 64)
                        return(verr(m, ETOOLONG));
                if (strlcat(buf, " ", 64) >= 64)


@@ -516,8 +520,8 @@ post_os(POST_ARGS)
 
        if (NULL == (m->meta.os = strdup(buf)))
                return(verr(m, EMALLOC));
 
        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));
 }
 
        return(post_prol(m));
 }
 


@@ -614,7 +618,7 @@ 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)))
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
        else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 


@@ -634,11 +638,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.
+        */
+
+       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)
 {
        int               i, r, len;
 
 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);
 
        if (MDOC_BLOCK != m->last->type)
                return(1);
 


@@ -769,9 +823,8 @@ static int
 pre_dl(PRE_ARGS)
 {
 
 pre_dl(PRE_ARGS)
 {
 

-       if (MDOC_BODY != n->type)
-               return(1);
-       m->flags |= MDOC_LITERAL;
+       if (MDOC_BODY == n->type)
+               m->flags |= MDOC_LITERAL;

        return(1);
 }
 
        return(1);
 }