Let .it accept numerical expressions, not just numerical constants.

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index eee1e3a7186aa66a6f4eeee34fe53bc999616faa..08d1a4272d31c92002c746aae1825995388dc2fa 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.85 2015/02/06 03:38:45 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.87 2015/02/12 12:24:33 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -29,8 +29,7 @@
 #include "mdoc.h"
 #include "main.h"
 
-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct mdoc_meta *meta, struct mdoc_node *n
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
@@ -548,10 +547,10 @@ void
 man_mdoc(void *arg, const struct mdoc *mdoc)
 {
        const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
+       struct mdoc_node *n;
 
        meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       n = mdoc_node(mdoc)->child;
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
            meta->title,
@@ -567,15 +566,18 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
-       print_node(meta, n);
+       while (n != NULL) {
+               print_node(meta, n);
+               n = n->next;
+       }
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
-       const struct mdoc_node  *sub;
        const struct manact     *act;
+       struct mdoc_node        *sub;
        int                      cond, do_sub;
 
        /*
@@ -588,6 +590,7 @@ print_node(DECL_ARGS)
        act = NULL;
        cond = 0;
        do_sub = 1;
+       n->flags &= ~MDOC_ENDED;
 
        if (MDOC_TEXT == n->type) {
                /*
@@ -635,7 +638,7 @@ print_node(DECL_ARGS)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
-               n->pending->flags |= MDOC_ENDED;
+               n->body->flags |= MDOC_ENDED;
 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);
@@ -1140,9 +1143,8 @@ pre_eo(DECL_ARGS)
            n->child->end != ENDBODY_NOT)
                print_word("\\&");
        else if (n->end != ENDBODY_NOT ? n->child != NULL :
-           n->parent->head->child != NULL &&
-           (n->parent->body->child != NULL ||
-            n->parent->tail->child != NULL))
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                outflags &= ~(MMAN_spc | MMAN_nl);
        return(1);
 }