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 d7d03ea962cc89c3fdfe1282b7a55666d6a45677..4bd8203a6b9c73043cf8d2e3eaa1937435a463a4 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.84 2010/11/29 15:45:15 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>
  *


@@ -57,9 +57,7 @@ static        int       post_bl_tagwidth(POST_ARGS);
 static int       post_bl_width(POST_ARGS);
 static int       post_dd(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_bl_width(POST_ARGS);
 static int       post_dd(POST_ARGS);
 static int       post_dt(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_std(POST_ARGS);
 
 static int       post_prol(POST_ARGS);
 static int       post_std(POST_ARGS);
 


@@ -96,10 +94,10 @@ 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, NULL }, /* St */
        { NULL, NULL }, /* Va */
        { NULL, post_std }, /* Rv */
        { NULL, NULL }, /* St */
        { NULL, NULL }, /* Va */


@@ -288,24 +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);
-}
-

 /*
  * 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.


@@ -653,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'.
  */