Fill mode changes don't break next-line scope in all cases,

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index 10daa6976520e83d07c83ce2389b514ceb7fd5f9..4ea0fa246ee8c029645a6fdbbf8b1b48cba3503f 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.92 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.93 2015/04/18 17:53:21 schwarze Exp $ */

 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *


@@ -547,16 +547,12 @@ man_man(void *arg, const struct roff_man *man)
 void
 man_mdoc(void *arg, const struct roff_man *mdoc)
 {
 void
 man_mdoc(void *arg, const struct roff_man *mdoc)
 {

-       const struct roff_meta *meta;

        struct roff_node *n;
 
        struct roff_node *n;
 

-       meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc)->child;
-

        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",

-           meta->title,
-           (meta->msec == NULL ? "" : meta->msec),
-           meta->date, meta->os, meta->vol);
+           mdoc->meta.title,
+           (mdoc->meta.msec == NULL ? "" : mdoc->meta.msec),
+           mdoc->meta.date, mdoc->meta.os, mdoc->meta.vol);

 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");
 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");


@@ -567,10 +563,8 @@ man_mdoc(void *arg, const struct roff_man *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }

-       while (n != NULL) {
-               print_node(meta, n);
-               n = n->next;
-       }
+       for (n = mdoc->first->child; n != NULL; n = n->next)
+               print_node(&mdoc->meta, n);

        putchar('\n');
 }
 
        putchar('\n');
 }