Initial attempt at an ODF driver

diff --git a/config/devices b/config/devices
index d42500cf4a04c687007dbe90d273ce228d435b64..2c080e768a2ff46037e640a69b120428b7757ff9 100644 (file)
--- a/config/devices
+++ b/config/devices
@@ -85,6 +85,8 @@ pdf:cairo:listing:
 svg:cairo:listing:output-type=svg output-file="pspp.svg"
 ps-cairo:cairo:listing:output-type=ps output-file="pspp-cairo.ps"
 
+odt:odt:listing:
+
 # Devices that support the IBM PC line-drawing characters.
 define ibmpc-graphics \
   box[0000]='\x20' box[0001]='\xb3' box[0002]='\xba' \

diff --git a/configure.ac b/configure.ac
index 77519330b8d54fc926b058395197dff644ff31a6..d52b4ffb22c7e933baedddf8f90a27d6d7c0bf93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_WITH([cairo],
   [], [with_cairo=yes])
 AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
 if test "$with_cairo" != no; then
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], 
+  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], 
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
      AC_DEFINE([HAVE_CAIRO], 1, 
        [Define to 1 if Cairo and Pango are available.])],

diff --git a/src/output/automake.mk b/src/output/automake.mk
index 1edc5bf75b121179bcbc6ed5eb7eb01d9aaead37..34aac525b8f47288317f56c666f91670dd4f37a8 100644 (file)
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -2,6 +2,8 @@
 
 noinst_LTLIBRARIES += src/output/liboutput.la 
 
+src_output_liboutput_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(AM_CPPFLAGS) 
+
 src_output_liboutput_la_SOURCES = \
        src/output/afm.c \
        src/output/afm.h \
@@ -26,6 +28,7 @@ src_output_liboutput_la_SOURCES = \
        src/output/journal.h \
        src/output/manager.c \
        src/output/manager.h \
+       src/output/odt.c \
        src/output/output.c \
        src/output/output.h \
        src/output/postscript.c \

diff --git a/src/output/output.c b/src/output/output.c
index 1b8fe97bf7b9259f150bee1bd9c8a2561a9a8d8d..a556ad81e8e7b1f49584261829459988b83b732b 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -230,6 +230,7 @@ outp_init (void)
 #ifdef HAVE_CAIRO
   add_class (&cairo_class);
 #endif
+  add_class (&odt_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
 }

diff --git a/src/output/output.h b/src/output/output.h
index ec9ae87d968391947dcc4f788998e209a73dd99b..8ae5c04be32e48c16ba2674fb5bf628b3e9e23b8 100644 (file)
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -175,5 +175,6 @@ extern const struct outp_class postscript_class;
 #ifdef HAVE_CAIRO
 extern const struct outp_class cairo_class;
 #endif
+extern const struct outp_class odt_class;
 
 #endif /* output/output.h */