X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fspv-driver.c;h=f0c00e5fa84ad615bcd3828cc20817d528b56684;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=fed7db75759c0affe80321f90ffcc74494eb9250;hpb=018a99b1d53ec1ab60e84dfe82c02ffb14232820;p=pspp

diff --git a/src/output/spv-driver.c b/src/output/spv-driver.c
index fed7db7575..f0c00e5fa8 100644
--- a/src/output/spv-driver.c
+++ b/src/output/spv-driver.c
@@ -22,11 +22,8 @@
 
 #include "data/file-handle-def.h"
 #include "libpspp/cast.h"
-#include "output/group-item.h"
-#include "output/page-eject-item.h"
-#include "output/page-setup-item.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
+#include "output/cairo-chart.h"
+#include "output/output-item.h"
 #include "output/spv/spv-writer.h"
 
 #include "gl/xalloc.h"
@@ -95,26 +92,7 @@ spv_submit (struct output_driver *driver,
 {
   struct spv_driver *spv = spv_driver_cast (driver);
 
-  if (is_group_open_item (output_item))
-    spv_writer_open_heading (spv->writer,
-                             to_group_open_item (output_item)->command_name,
-                             to_group_open_item (output_item)->command_name);
-  else if (is_group_close_item (output_item))
-    spv_writer_close_heading (spv->writer);
-  else if (is_table_item (output_item))
-    {
-      const struct table_item *table_item = to_table_item (output_item);
-      if (table_item->pt)
-        spv_writer_put_table (spv->writer, table_item->pt);
-    }
-  else if (is_text_item (output_item))
-    spv_writer_put_text (spv->writer, to_text_item (output_item),
-                         output_get_command_name ());
-  else if (is_page_eject_item (output_item))
-    spv_writer_eject_page (spv->writer);
-  else if (is_page_setup_item (output_item))
-    spv_writer_set_page_setup (spv->writer,
-                               to_page_setup_item (output_item)->page_setup);
+  spv_writer_write (spv->writer, output_item);
 }
 
 struct output_driver_factory spv_driver_factory =