Clean up output subsystem.

[pspp-builds.git] / src / output / manager.c

diff --git a/src/output/manager.c b/src/output/manager.c
index 3647abb01fc610683512e71fbbe82218e5a3af3b..8fd90a5e26bbcfa774b5534b9a6e7e96ee49c601 100644 (file)
--- a/src/output/manager.c
+++ b/src/output/manager.c
@@ -19,11 +19,11 @@
 
 #include <config.h>
 #include "manager.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "output.h"
-#include "debug-print.h"
+#include <libpspp/debug-print.h>
 
 /* Table. */
 int table_num = 1;
@@ -93,7 +93,7 @@ static void output_entity (struct outp_driver *, struct som_entity *);
 void
 som_submit (struct som_entity *t)
 {
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   static int entry;
   
   assert (entry++ == 0);
@@ -107,7 +107,7 @@ som_submit (struct som_entity *t)
       t->class->headers (&hl, &hr, &ht, &hb);
 
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
       if (hl + hr > nc || ht + hb > nr)
        {
          printf ("headers: (l,r)=(%d,%d), (t,b)=(%d,%d) in table size (%d,%d)\n",
@@ -135,7 +135,7 @@ som_submit (struct som_entity *t)
 
   }
   
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   assert (--entry == 0);
 #endif
 }
@@ -147,13 +147,7 @@ output_entity (struct outp_driver *driver, struct som_entity *entity)
   bool fits_width, fits_length;
   d = driver;
 
-  assert (d->driver_open);
-  if (!d->page_open && !d->class->open_page (d))
-    {
-      d->device = OUTP_DEV_DISABLED;
-      return;
-    }
-  
+  outp_open_page (d);
   if (d->class->special || entity->type == SOM_CHART)
     {
       driver->class->submit (d, entity);