Migrate `Nm' and `Pa' handling from mdoc_action.c into mdoc_validate.c.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index 566310d2214662e667f532fce29bdbb013ee608f..4bd8203a6b9c73043cf8d2e3eaa1937435a463a4 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.81 2010/11/29 13:51:03 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.85 2010/11/29 16:06:46 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -51,25 +51,16 @@ struct      actions {
 static int       concat(struct mdoc *, char *,
                        const struct mdoc_node *, size_t);
 
 static int       concat(struct mdoc *, char *,
                        const struct mdoc_node *, size_t);
 

-static int       post_at(POST_ARGS);

 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);
 static int       post_bl_tagwidth(POST_ARGS);
 static int       post_bl_width(POST_ARGS);
 static int       post_dd(POST_ARGS);
 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);
 static int       post_bl_tagwidth(POST_ARGS);
 static int       post_bl_width(POST_ARGS);
 static int       post_dd(POST_ARGS);

-static int       post_display(POST_ARGS);

 static int       post_dt(POST_ARGS);
 static int       post_dt(POST_ARGS);

-static int       post_lb(POST_ARGS);
-static int       post_nm(POST_ARGS);

 static int       post_os(POST_ARGS);
 static int       post_os(POST_ARGS);

-static int       post_pa(POST_ARGS);

 static int       post_prol(POST_ARGS);
 static int       post_prol(POST_ARGS);

-static int       post_st(POST_ARGS);

 static int       post_std(POST_ARGS);
 
 static int       post_std(POST_ARGS);
 

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

 static const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ap */
        { NULL, post_dd }, /* Dd */ 
 static const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ap */
        { NULL, post_dd }, /* Dd */ 


@@ -79,8 +70,8 @@ static        const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ss */ 
        { NULL, NULL }, /* Pp */ 
        { NULL, NULL }, /* D1 */
        { NULL, NULL }, /* Ss */ 
        { NULL, NULL }, /* Pp */ 
        { NULL, NULL }, /* D1 */

-       { pre_dl, post_display }, /* Dl */
-       { pre_bd, post_display }, /* Bd */ 
+       { NULL, NULL }, /* Dl */
+       { NULL, NULL }, /* Bd */ 

        { NULL, NULL }, /* Ed */
        { NULL, post_bl }, /* Bl */ 
        { NULL, NULL }, /* El */
        { NULL, NULL }, /* Ed */
        { NULL, post_bl }, /* Bl */ 
        { NULL, NULL }, /* El */


@@ -103,12 +94,12 @@ static     const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* In */ 
        { NULL, NULL }, /* Li */
        { NULL, NULL }, /* Nd */ 
        { NULL, NULL }, /* In */ 
        { NULL, NULL }, /* Li */
        { NULL, NULL }, /* Nd */ 

-       { NULL, post_nm }, /* Nm */ 
+       { NULL, NULL }, /* Nm */ 

        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */

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

        { NULL, post_std }, /* Rv */
        { NULL, post_std }, /* Rv */

-       { NULL, post_st }, /* St */
+       { NULL, NULL }, /* St */

        { NULL, NULL }, /* Va */
        { NULL, NULL }, /* Vt */ 
        { NULL, NULL }, /* Xr */
        { NULL, NULL }, /* Va */
        { NULL, NULL }, /* Vt */ 
        { NULL, NULL }, /* Xr */


@@ -126,7 +117,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, NULL }, /* Aq */
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, NULL }, /* Aq */

-       { NULL, post_at }, /* At */ 
+       { NULL, NULL }, /* At */ 

        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bf */ 
        { NULL, NULL }, /* Bo */
        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bf */ 
        { NULL, NULL }, /* Bo */


@@ -177,7 +168,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */

-       { NULL, post_lb }, /* Lb */
+       { NULL, NULL }, /* Lb */

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


@@ -195,25 +186,6 @@ static     const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ta */
 };
 
        { NULL, NULL }, /* Ta */
 };
 

-#define        RSORD_MAX 14
-
-static const enum mdoct rsord[RSORD_MAX] = {
-       MDOC__A,
-       MDOC__T,
-       MDOC__B,
-       MDOC__I,
-       MDOC__J,
-       MDOC__R,
-       MDOC__N,
-       MDOC__V,
-       MDOC__P,
-       MDOC__Q,
-       MDOC__D,
-       MDOC__O,
-       MDOC__C,
-       MDOC__U
-};
-

 
 int
 mdoc_action_pre(struct mdoc *m, struct mdoc_node *n)
 
 int
 mdoc_action_pre(struct mdoc *m, struct mdoc_node *n)


@@ -314,119 +286,6 @@ post_std(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/*
- * The `Nm' macro's first use sets the name of the document.  See also
- * post_std(), etc.
- */
-static int
-post_nm(POST_ARGS)
-{
-       char             buf[BUFSIZ];
-
-       if (m->meta.name)
-               return(1);
-       if ( ! concat(m, buf, n->child, BUFSIZ))
-               return(0);
-       m->meta.name = mandoc_strdup(buf);
-       return(1);
-}
-
-
-/*
- * Look up the value of `Lb' for matching predefined strings.  If it has
- * one, then substitute the current value for the formatted value.  Note
- * that the lookup may fail (we can provide arbitrary strings).
- */
-/* ARGSUSED */
-static int
-post_lb(POST_ARGS)
-{
-       const char      *p;
-       char            *buf;
-       size_t           sz;
-
-       assert(MDOC_TEXT == n->child->type);
-       p = mdoc_a2lib(n->child->string);
-
-       if (p) {
-               free(n->child->string);
-               n->child->string = mandoc_strdup(p);
-               return(1);
-       }
-
-       sz = strlen(n->child->string) +
-               2 + strlen("\\(lqlibrary\\(rq");
-       buf = mandoc_malloc(sz);
-       snprintf(buf, sz, "library \\(lq%s\\(rq", n->child->string);
-       free(n->child->string);
-       n->child->string = buf;
-       return(1);
-}
-
-
-/*
- * Substitute the value of `St' for the corresponding formatted string.
- * We're guaranteed that this exists (it's been verified during the
- * validation phase).
- */
-/* ARGSUSED */
-static int
-post_st(POST_ARGS)
-{
-       const char      *p;
-
-       assert(MDOC_TEXT == n->child->type);
-       p = mdoc_a2st(n->child->string);
-       if (p != NULL) {
-               free(n->child->string);
-               n->child->string = mandoc_strdup(p);
-       }
-       return(1);
-}
-
-
-/*
- * Look up the standard string in a table.  We know that it exists from
- * the validation phase, so assert on failure.  If a standard key wasn't
- * supplied, supply the default ``AT&T UNIX''.
- */
-static int
-post_at(POST_ARGS)
-{
-       struct mdoc_node *nn;
-       const char       *p, *q;
-       char             *buf;
-       size_t            sz;
-
-       if (n->child) {
-               assert(MDOC_TEXT == n->child->type);
-               p = mdoc_a2att(n->child->string);
-               if (p) {
-                       free(n->child->string);
-                       n->child->string = mandoc_strdup(p);
-               } else {
-                       p = "AT&T UNIX ";
-                       q = n->child->string;
-                       sz = strlen(p) + strlen(q) + 1;
-                       buf = mandoc_malloc(sz);
-                       strlcpy(buf, p, sz);
-                       strlcat(buf, q, sz);
-                       free(n->child->string);
-                       n->child->string = buf;
-               }
-               return(1);
-       }
-
-       nn = n;
-       m->next = MDOC_NEXT_CHILD;
-       if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX"))
-               return(0);
-       m->last = nn;
-       return(1);
-}
-
-

 /*
  * Parse out the contents of `Dt'.  See in-line documentation for how we
  * handle the various fields of this macro.
 /*
  * Parse out the contents of `Dt'.  See in-line documentation for how we
  * handle the various fields of this macro.


@@ -774,28 +633,6 @@ post_bl(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/*
- * The `Pa' macro defaults to a tilde if no value is provided as an
- * argument.
- */
-static int
-post_pa(POST_ARGS)
-{
-       struct mdoc_node *np;
-
-       if (n->child)
-               return(1);
-       
-       np = n;
-       m->next = MDOC_NEXT_CHILD;
-       if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
-               return(0);
-       m->last = np;
-       return(1);
-}
-
-

 /*
  * Parse the date field in `Dd'.
  */
 /*
  * Parse the date field in `Dd'.
  */


@@ -839,43 +676,3 @@ post_prol(POST_ARGS)
                m->flags |= MDOC_PBODY;
        return(1);
 }
                m->flags |= MDOC_PBODY;
        return(1);
 }

-
-
-/*
- * Trigger a literal context.
- */
-static int
-pre_dl(PRE_ARGS)
-{
-
-       if (MDOC_BODY == n->type)
-               m->flags |= MDOC_LITERAL;
-       return(1);
-}
-
-
-static int
-pre_bd(PRE_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-
-       assert(n->data.Bd);
-       if (DISP_literal == n->data.Bd->type)
-               m->flags |= MDOC_LITERAL;
-       if (DISP_unfilled == n->data.Bd->type)
-               m->flags |= MDOC_LITERAL;
-
-       return(1);
-}
-
-
-static int
-post_display(POST_ARGS)
-{
-
-       if (MDOC_BODY == n->type)
-               m->flags &= ~MDOC_LITERAL;
-       return(1);
-}