mdoc_action.c is no more. Attic it and remove it from the Makefile.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index bee01503f341021bd6e8b3825ecb91ba237c1358..930d20719c324afa50d3cd1be9fcbf0f46559c67 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.164 2010/08/29 11:29:51 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.166 2010/11/30 13:04:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -328,8 +328,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);
 
        switch (p->type) {
        case (MDOC_HEAD):
@@ -356,8 +354,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
                break;
        default:
                break;
@@ -691,11 +687,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
                        return(0);
 
                /*
-                * Insert a `Pp' in the case of a blank line.  Technically,
+                * Insert a `sp' in the case of a blank line.  Technically,
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
-               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))
+               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))
                        return(0);
 
                m->next = MDOC_NEXT_SIBLING;
@@ -758,14 +754,11 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        /* 
         * Copy the first word into a nil-terminated buffer.
-        * Stop copying when a tab, space, backslash, or eoln is encountered.
+        * Stop copying when a tab, space, or eoln is encountered.
         */
 
        j = 0;
-       while (j < 4 && '\0' != buf[i] && 
-                       ' ' != buf[i] && 
-                       '\t' != buf[i] && 
-                       '\\' != buf[i])
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
                mac[j++] = buf[i++];
        mac[j] = '\0';