Updated libman AST documentation.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index dcb938e5f04ce08f1d0410961579b88d7343fefc..87882138ee00bef4f6d1f9e23a949a6bfdbd074b 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.27 2009/07/12 20:50:08 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.34 2009/07/26 10:29:39 kristaps Exp $ */

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


@@ -42,13 +42,13 @@ static      int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_lb(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_lb(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);
 static int       post_sh(POST_ARGS);
 static int       post_st(POST_ARGS);
 static int       post_std(POST_ARGS);
 static int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_prol(POST_ARGS);
 static int       post_sh(POST_ARGS);
 static int       post_st(POST_ARGS);
 static int       post_std(POST_ARGS);

+static int       post_tilde(POST_ARGS);

 
 static int       pre_bd(PRE_ARGS);
 static int       pre_dl(PRE_ARGS);
 
 static int       pre_bd(PRE_ARGS);
 static int       pre_dl(PRE_ARGS);


@@ -89,7 +89,7 @@ const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, post_nm }, /* Nm */ 
        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */
        { NULL, post_nm }, /* Nm */ 
        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */

-       { NULL, NULL }, /* Pa */
+       { NULL, post_tilde }, /* Pa */

        { NULL, post_std }, /* Rv */
        { NULL, post_st }, /* St */
        { NULL, NULL }, /* Va */
        { NULL, post_std }, /* Rv */
        { NULL, post_st }, /* St */
        { NULL, NULL }, /* Va */


@@ -162,7 +162,7 @@ const       struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ud */
        { NULL, post_lb }, /* Lb */
        { NULL, NULL }, /* Lp */
        { NULL, NULL }, /* Ud */
        { NULL, post_lb }, /* Lb */
        { NULL, NULL }, /* Lp */

-       { NULL, post_lk }, /* Lk */
+       { NULL, post_tilde }, /* Lk */

        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Brq */
        { NULL, NULL }, /* Bro */
        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Brq */
        { NULL, NULL }, /* Bro */


@@ -172,6 +172,8 @@ const       struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* En */
        { NULL, NULL }, /* Dx */
        { NULL, NULL }, /* %Q */
        { NULL, NULL }, /* En */
        { NULL, NULL }, /* Dx */
        { NULL, NULL }, /* %Q */

+       { NULL, NULL }, /* br */
+       { NULL, NULL }, /* sp */

 };
 
 static int       concat(struct mdoc *, const struct mdoc_node *, 
 };
 
 static int       concat(struct mdoc *, const struct mdoc_node *, 


@@ -485,7 +487,6 @@ post_dt(POST_ARGS)
                free(m->meta.vol);
                if (NULL == (m->meta.vol = strdup(cp)))
                        return(mdoc_nerr(m, m->last, EMALLOC));
                free(m->meta.vol);
                if (NULL == (m->meta.vol = strdup(cp)))
                        return(mdoc_nerr(m, m->last, EMALLOC));

-               n = n->next;

        } else {
                cp = mdoc_a2arch(n->string);
                if (NULL == cp) {
        } else {
                cp = mdoc_a2arch(n->string);
                if (NULL == cp) {


@@ -529,7 +530,6 @@ post_os(POST_ARGS)
        if (NULL == (m->meta.os = strdup(buf)))
                return(mdoc_nerr(m, m->last, EMALLOC));
 
        if (NULL == (m->meta.os = strdup(buf)))
                return(mdoc_nerr(m, m->last, EMALLOC));
 

-       m->flags |= MDOC_PBODY;

        return(post_prol(m));
 }
 
        return(post_prol(m));
 }
 


@@ -733,7 +733,7 @@ post_bl(POST_ARGS)
 
 
 static int
 
 
 static int

-post_lk(POST_ARGS)
+post_tilde(POST_ARGS)

 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 


@@ -743,7 +743,7 @@ post_lk(POST_ARGS)
        n = m->last;
        m->next = MDOC_NEXT_CHILD;
 
        n = m->last;
        m->next = MDOC_NEXT_CHILD;
 

-       /* XXX: this isn't documented anywhere! */
+       /* XXX: not documented for `Lk'. */

        if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "~"))
                return(0);
 
        if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "~"))
                return(0);
 


@@ -821,6 +821,9 @@ post_prol(POST_ARGS)
        }
 
        mdoc_node_freelist(n);
        }
 
        mdoc_node_freelist(n);

+
+       if (m->meta.title && m->meta.date && m->meta.os)
+               m->flags |= MDOC_PBODY;

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


@@ -831,6 +834,7 @@ pre_dl(PRE_ARGS)
 
        if (MDOC_BODY == n->type)
                m->flags |= MDOC_LITERAL;
 
        if (MDOC_BODY == n->type)
                m->flags |= MDOC_LITERAL;

+

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


@@ -843,7 +847,12 @@ pre_bd(PRE_ARGS)
        if (MDOC_BODY != n->type)
                return(1);
 
        if (MDOC_BODY != n->type)
                return(1);
 

-       /* Enter literal context if `Bd -literal' or * -unfilled'. */
+       /* Enter literal context if `Bd -literal' or `-unfilled'. */
+
+       /* 
+        * TODO: `-offset' without an argument should be the width of
+        * the literal "<string>".
+        */

 
        for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
                if (MDOC_Literal == n->args->argv[i].arg)
 
        for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
                if (MDOC_Literal == n->args->argv[i].arg)