X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=4a87815548d43b2473e58f977e233870470e2663;hb=d55fbbb4fda554d02c93dd46c6fa66128060e6f0;hp=6511aa3f10022bf23e675b32564c9fe1a4fec32b;hpb=f01552a8e61627dda53097f2b6698abdd97e9f08;p=pspp diff --git a/src/output/odt.c b/src/output/odt.c index 6511aa3f10..4a87815548 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,262 +16,605 @@ #include +/* A driver for creating OpenDocument Format text files from PSPP's output */ -#include -#include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#ifdef HAVE_PWD_H +#include +#endif #include #include +#include +#include + +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "libpspp/temp-file.h" +#include "libpspp/version.h" +#include "libpspp/zip-writer.h" +#include "data/file-handle-def.h" +#include "output/driver-provider.h" +#include "output/message-item.h" +#include "output/options.h" +#include "output/pivot-table.h" +#include "output/pivot-output.h" +#include "output/table-item.h" +#include "output/table-provider.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) + +#define _xml(X) (CHAR_CAST (const xmlChar *, X)) + +/* This file uses TABLE_HORZ and TABLE_VERT enough to warrant abbreviating. */ +#define H TABLE_HORZ +#define V TABLE_VERT + +struct odt_driver +{ + struct output_driver driver; -#include + struct zip_writer *zip; /* ZIP file writer. */ + struct file_handle *handle; /* Handle for 'file_name'. */ + char *file_name; /* Output file name. */ -#include + /* content.xml */ + xmlTextWriterPtr content_wtr; /* XML writer. */ + FILE *content_file; /* Temporary file. */ -#include + /* manifest.xml */ + xmlTextWriterPtr manifest_wtr; /* XML writer. */ + FILE *manifest_file; /* Temporary file. */ -#include "error.h" -#include "intprops.h" -#include "minmax.h" -#include "xalloc.h" + /* Number of tables so far. */ + int table_num; +}; -#define _xml(X) (const xmlChar *)(X) +static const struct output_driver_class odt_driver_class; -struct odt_driver_ext +static struct odt_driver * +odt_driver_cast (struct output_driver *driver) { - /* The name of the temporary directory used to construct the ODF */ - char *dirname; - - /* Writer for the content.xml file */ - xmlTextWriterPtr content_wtr; + assert (driver->class == &odt_driver_class); + return UP_CAST (driver, struct odt_driver, driver); +} - /* Writer fot the manifest.xml file */ - xmlTextWriterPtr manifest_wtr; -}; +/* Creates a new temporary file and stores it in *FILE, then creates an XML + writer for it and stores it in *W. */ +static void +create_writer (FILE **file, xmlTextWriterPtr *w) +{ + /* XXX this can fail */ + *file = create_temp_file (); + *w = xmlNewTextWriter (xmlOutputBufferCreateFile (*file, NULL)); + xmlTextWriterStartDocument (*w, NULL, "UTF-8", NULL); +} -/* Create the "mimetype" file needed by ODF */ static void -create_mimetype (const char *dirname) +register_file (struct odt_driver *odt, const char *filename) { - FILE *fp; - struct string filename; - ds_init_cstr (&filename, dirname); - ds_put_cstr (&filename, "/mimetype"); - fp = fopen (ds_cstr (&filename), "w"); - ds_destroy (&filename); - - fprintf (fp, "application/vnd.oasis.opendocument.text"); - fclose (fp); + assert (odt->manifest_wtr); + xmlTextWriterStartElement (odt->manifest_wtr, _xml("manifest:file-entry")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("manifest:media-type"), _xml("text/xml")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("manifest:full-path"), _xml (filename)); + xmlTextWriterEndElement (odt->manifest_wtr); } -static xmlTextWriterPtr -create_writer (const struct odt_driver_ext *driver, const char *filename) +static void +write_style_data (struct odt_driver *odt) { - char *copy = NULL; xmlTextWriterPtr w; - struct string str; - ds_init_cstr (&str, driver->dirname); - ds_put_cstr (&str, "/"); - ds_put_cstr (&str, filename); + FILE *file; + + create_writer (&file, &w); + register_file (odt, "styles.xml"); + + xmlTextWriterStartElement (w, _xml ("office:document-styles")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:office"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); + + xmlTextWriterWriteAttribute (w, _xml ("xmlns:style"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:style:1.0")); + + xmlTextWriterWriteAttribute (w, _xml ("xmlns:fo"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0")); + + xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml ("1.1")); + + + + xmlTextWriterStartElement (w, _xml ("office:styles")); + + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Standard")); - /* dirname modifies its argument, so we must copy it */ - copy = xstrdup (ds_cstr (&str)); - mkdir (dirname (copy), 0700); - free (copy); + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); - w = xmlNewTextWriterFilename (ds_cstr (&str), 0); + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("text")); - ds_destroy (&str); + xmlTextWriterEndElement (w); /* style:style */ + } - xmlTextWriterStartDocument (w, NULL, "UTF-8", NULL); + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Table_20_Contents")); - return w; + xmlTextWriterWriteAttribute (w, _xml ("style:display-name"), + _xml ("Table Contents")); + + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); + + xmlTextWriterWriteAttribute (w, _xml ("style:parent-style-name"), + _xml ("Standard")); + + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("extra")); + + xmlTextWriterEndElement (w); /* style:style */ + } + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Table_20_Heading")); + + xmlTextWriterWriteAttribute (w, _xml ("style:display-name"), + _xml ("Table Heading")); + + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); + + xmlTextWriterWriteAttribute (w, _xml ("style:parent-style-name"), + _xml ("Table_20_Contents")); + + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("extra")); + + + xmlTextWriterStartElement (w, _xml ("style:text-properties")); + xmlTextWriterWriteAttribute (w, _xml ("fo:font-weight"), _xml ("bold")); + xmlTextWriterWriteAttribute (w, _xml ("style:font-weight-asian"), _xml ("bold")); + xmlTextWriterWriteAttribute (w, _xml ("style:font-weight-complex"), _xml ("bold")); + xmlTextWriterEndElement (w); /* style:text-properties */ + + xmlTextWriterEndElement (w); /* style:style */ + } + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), _xml ("superscript")); + xmlTextWriterWriteAttribute (w, _xml ("style:family"), _xml ("text")); + + xmlTextWriterStartElement (w, _xml ("style:text-properties")); + xmlTextWriterWriteAttribute (w, _xml ("style:text-position"), + _xml ("super 58%")); + xmlTextWriterEndElement (w); /* style:text-properties */ + + xmlTextWriterEndElement (w); /* style:style */ + } + + xmlTextWriterEndElement (w); /* office:styles */ + xmlTextWriterEndElement (w); /* office:document-styles */ + + xmlTextWriterEndDocument (w); + xmlFreeTextWriter (w); + zip_writer_add (odt->zip, file, "styles.xml"); + close_temp_file (file); } -static bool -odt_open_driver (const char *name, int types, struct substring option_string) +static void +write_meta_data (struct odt_driver *odt) { - struct odt_driver_ext *x; - struct outp_driver *this = outp_allocate_driver (&odt_class, name, types); + xmlTextWriterPtr w; + FILE *file; + + create_writer (&file, &w); + register_file (odt, "meta.xml"); + + xmlTextWriterStartElement (w, _xml ("office:document-meta")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:office"), _xml ("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:dc"), _xml ("http://purl.org/dc/elements/1.1/")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:meta"), _xml ("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:ooo"), _xml("http://openoffice.org/2004/office")); + xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml("1.1")); + + xmlTextWriterStartElement (w, _xml ("office:meta")); + { + xmlTextWriterStartElement (w, _xml ("meta:generator")); + xmlTextWriterWriteString (w, _xml (version)); + xmlTextWriterEndElement (w); + } + + + { + char buf[30]; + time_t t = time (NULL); + struct tm *tm = localtime (&t); + + strftime (buf, 30, "%Y-%m-%dT%H:%M:%S", tm); + + xmlTextWriterStartElement (w, _xml ("meta:creation-date")); + xmlTextWriterWriteString (w, _xml (buf)); + xmlTextWriterEndElement (w); + + xmlTextWriterStartElement (w, _xml ("dc:date")); + xmlTextWriterWriteString (w, _xml (buf)); + xmlTextWriterEndElement (w); + } + +#ifdef HAVE_PWD_H + { + struct passwd *pw = getpwuid (getuid ()); + if (pw != NULL) + { + xmlTextWriterStartElement (w, _xml ("meta:initial-creator")); + xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); + xmlTextWriterEndElement (w); + + xmlTextWriterStartElement (w, _xml ("dc:creator")); + xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); + xmlTextWriterEndElement (w); + } + } +#endif + + xmlTextWriterEndElement (w); + xmlTextWriterEndElement (w); + xmlTextWriterEndDocument (w); + xmlFreeTextWriter (w); + zip_writer_add (odt->zip, file, "meta.xml"); + close_temp_file (file); +} - this->ext = x = xmalloc (sizeof *x); +static struct output_driver * +odt_create (struct file_handle *fh, enum settings_output_devices device_type, + struct string_map *o UNUSED) +{ + struct output_driver *d; + struct odt_driver *odt; + struct zip_writer *zip; + const char *file_name = fh_get_file_name (fh); - outp_register_driver (this); + zip = zip_writer_create (file_name); + if (zip == NULL) + return NULL; - x->dirname = xstrdup ("odt-XXXXXX"); - mkdtemp (x->dirname); + odt = xzalloc (sizeof *odt); + d = &odt->driver; - printf ("Dir name is \"%s\"\n", x->dirname); + output_driver_init (d, &odt_driver_class, file_name, device_type); - create_mimetype (x->dirname); + odt->zip = zip; + odt->handle = fh; + odt->file_name = xstrdup (file_name); - x->manifest_wtr = create_writer (x, "META-INF/manifest.xml"); + zip_writer_add_string (zip, "mimetype", + "application/vnd.oasis.opendocument.text"); - xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:manifest")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("xmlns:manifest"), + /* Create the manifest */ + create_writer (&odt->manifest_file, &odt->manifest_wtr); + + xmlTextWriterStartElement (odt->manifest_wtr, _xml("manifest:manifest")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("xmlns:manifest"), _xml("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")); - xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:file-entry")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:media-type"), _xml("application/vnd.oasis.opendocument.text")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:full-path"), _xml("/")); - xmlTextWriterEndElement (x->manifest_wtr); + /* Add a manifest entry for the document as a whole */ + xmlTextWriterStartElement (odt->manifest_wtr, _xml("manifest:file-entry")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("manifest:media-type"), _xml("application/vnd.oasis.opendocument.text")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("manifest:full-path"), _xml("/")); + xmlTextWriterEndElement (odt->manifest_wtr); - x->content_wtr = create_writer (x, "content.xml"); + write_meta_data (odt); + write_style_data (odt); - xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:file-entry")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:media-type"), _xml("text/xml")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:full-path"), _xml("content.xml")); - xmlTextWriterEndElement (x->manifest_wtr); + create_writer (&odt->content_file, &odt->content_wtr); + register_file (odt, "content.xml"); - xmlTextWriterStartElement (x->content_wtr, _xml("office:document-content")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("xmlns:office"), + /* Some necessary junk at the start */ + xmlTextWriterStartElement (odt->content_wtr, _xml("office:document-content")); + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("xmlns:office"), _xml("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("xmlns:text"), + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("xmlns:text"), _xml("urn:oasis:names:tc:opendocument:xmlns:text:1.0")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("xmlns:table"), + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("xmlns:table"), _xml("urn:oasis:names:tc:opendocument:xmlns:table:1.0")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:version"), _xml("1.1")); + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("office:version"), _xml("1.1")); + + xmlTextWriterStartElement (odt->content_wtr, _xml("office:body")); + xmlTextWriterStartElement (odt->content_wtr, _xml("office:text")); - xmlTextWriterStartElement (x->content_wtr, _xml("office:body")); - xmlTextWriterStartElement (x->content_wtr, _xml("office:text")); - xmlTextWriterEndElement (x->manifest_wtr); - xmlTextWriterEndDocument (x->manifest_wtr); - xmlFreeTextWriter (x->manifest_wtr); + /* Close the manifest */ + xmlTextWriterEndElement (odt->manifest_wtr); + xmlTextWriterEndDocument (odt->manifest_wtr); + xmlFreeTextWriter (odt->manifest_wtr); + zip_writer_add (odt->zip, odt->manifest_file, "META-INF/manifest.xml"); + close_temp_file (odt->manifest_file); - return true; + return d; } -static bool -odt_close_driver (struct outp_driver *this) +static void +odt_destroy (struct output_driver *driver) { - struct odt_driver_ext *x = this->ext; + struct odt_driver *odt = odt_driver_cast (driver); + + if (odt->content_wtr != NULL) + { + xmlTextWriterEndElement (odt->content_wtr); /* office:text */ + xmlTextWriterEndElement (odt->content_wtr); /* office:body */ + xmlTextWriterEndElement (odt->content_wtr); /* office:document-content */ - xmlTextWriterEndElement (x->content_wtr); /* office:text */ - xmlTextWriterEndElement (x->content_wtr); /* office:body */ - xmlTextWriterEndElement (x->content_wtr); /* office:document-content */ + xmlTextWriterEndDocument (odt->content_wtr); + xmlFreeTextWriter (odt->content_wtr); + zip_writer_add (odt->zip, odt->content_file, "content.xml"); + close_temp_file (odt->content_file); - xmlTextWriterEndDocument (x->content_wtr); - xmlFreeTextWriter (x->content_wtr); + zip_writer_close (odt->zip); + } - return true; + fh_unref (odt->handle); + free (odt->file_name); + free (odt); } static void -odt_open_page (struct outp_driver *this) +write_xml_with_line_breaks (struct odt_driver *odt, const char *line_) { - printf ("%s\n", __FUNCTION__); + xmlTextWriterPtr writer = odt->content_wtr; + + if (!strchr (line_, '\n')) + xmlTextWriterWriteString (writer, _xml(line_)); + else + { + char *line = xstrdup (line_); + char *newline; + char *p; + + for (p = line; *p; p = newline + 1) + { + newline = strchr (p, '\n'); + + if (!newline) + { + xmlTextWriterWriteString (writer, _xml(p)); + free (line); + return; + } + + if (newline > p && newline[-1] == '\r') + newline[-1] = '\0'; + else + *newline = '\0'; + xmlTextWriterWriteString (writer, _xml(p)); + xmlTextWriterWriteElement (writer, _xml("text:line-break"), _xml("")); + } + } } static void -odt_close_page (struct outp_driver *this) +write_footnotes (struct odt_driver *odt, + const struct pivot_table *pt, + const size_t *footnote_indexes, + size_t n_footnotes) { - printf ("%s\n", __FUNCTION__); + for (size_t i = 0; i < n_footnotes; i++) + { + const struct pivot_footnote *f = pt->footnotes[footnote_indexes[i]]; + if (f->show) + { + xmlTextWriterStartElement (odt->content_wtr, _xml("text:span")); + xmlTextWriterWriteAttribute (odt->content_wtr, + _xml("text:style-name"), + _xml("superscript")); + char *s = pivot_footnote_marker_string (f, pt); + write_xml_with_line_breaks (odt, s); + free (s); + xmlTextWriterEndElement (odt->content_wtr); + } + } } static void -odt_output_chart (struct outp_driver *this, const struct chart *chart) +write_table_item_cell (struct odt_driver *odt, + const struct pivot_table *pt, + const struct table_cell *cell) { - printf ("%s\n", __FUNCTION__); + struct string body = DS_EMPTY_INITIALIZER; + pivot_value_format_body (cell->value, pt, &body); + xmlTextWriterWriteString (odt->content_wtr, _xml (ds_cstr (&body))); + ds_destroy (&body); + + write_footnotes (odt, pt, cell->value->footnote_indexes, + cell->value->n_footnotes); } static void -odt_submit (struct outp_driver *this, struct som_entity *e) +write_table__ (struct odt_driver *odt, const struct pivot_table *pt, + const struct table *t) { - int r, c; - - struct odt_driver_ext *x = this->ext; - struct tab_table *tab = e->ext; + if (t) + { + for (size_t y = 0; y < t->n[V]; y++) + { + xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, + _xml("text:outline-level"), "%d", 2); + + struct table_cell cell; + table_get_cell (t, 0, y, &cell); + write_table_item_cell (odt, pt, &cell); + + xmlTextWriterEndElement (odt->content_wtr); + } + } +} + +static void +write_table_layer (struct odt_driver *odt, const struct pivot_table *pt, + const size_t *layer_indexes) +{ + struct table *title, *layers, *body, *caption, *footnotes; + pivot_output (pt, layer_indexes, true, &title, &layers, &body, + &caption, &footnotes, NULL, NULL); - xmlTextWriterStartElement (x->content_wtr, _xml("text:h")); - xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("text:level"), "%d", e->subtable_num == 1 ? 2 : 3); - xmlTextWriterWriteString (x->content_wtr, _xml (tab->title) ); - xmlTextWriterEndElement (x->content_wtr); + /* Write a heading for the table */ + write_table__ (odt, pt, title); + write_table__ (odt, pt, layers); - xmlTextWriterStartElement (x->content_wtr, _xml("table:table")); - xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:name"), - "TABLE-%d.%d", e->table_num, e->subtable_num); + /* Start table */ + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table")); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:name"), + "TABLE-%d", odt->table_num++); /* Start column definitions */ - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-column")); - xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:number-columns-repeated"), "%d", tab->nc); - xmlTextWriterEndElement (x->content_wtr); + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-column")); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:number-columns-repeated"), "%d", body->n[H]); + xmlTextWriterEndElement (odt->content_wtr); /* Deal with row headers */ - if ( tab->t > 0) - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-header-rows")); - - for (r = 0 ; r < tab->nr; ++r) + if (body->h[V][0] > 0) + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows")); + + + /* Write all the rows */ + for (int r = 0 ; r < body->n[V]; ++r) { /* Start row definition */ - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-row")); + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-row")); - for (c = 0 ; c < tab->nc ; ++c) + /* Write all the columns */ + for (int c = 0 ; c < body->n[H] ; ++c) { - int opts = tab->ct[tab->nc * r + c]; - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:value-type"), _xml("string")); + struct table_cell cell; + + table_get_cell (body, c, r, &cell); + + if (c == cell.d[H][0] && r == cell.d[V][0]) + { + int colspan = table_cell_colspan (&cell); + int rowspan = table_cell_rowspan (&cell); + + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-cell")); + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("office:value-type"), _xml("string")); + + if (colspan > 1) + xmlTextWriterWriteFormatAttribute ( + odt->content_wtr, _xml("table:number-columns-spanned"), + "%d", colspan); + + if (rowspan > 1) + xmlTextWriterWriteFormatAttribute ( + odt->content_wtr, _xml("table:number-rows-spanned"), + "%d", rowspan); - if (! (opts & TAB_EMPTY) ) + xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + + if (r < body->h[V][0] || c < body->h[H][0]) + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); + else + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); + + write_table_item_cell (odt, pt, &cell); + + xmlTextWriterEndElement (odt->content_wtr); /* text:p */ + xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */ + } + else { - char *s = ss_xstrdup (tab->cc[tab->nc * r + c]); - xmlTextWriterStartElement (x->content_wtr, _xml("text:p")); - if ( r < tab->t || c < tab->l ) - xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); - else - xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); - - xmlTextWriterWriteString (x->content_wtr, _xml (s)); - - xmlTextWriterEndElement (x->content_wtr); - free (s); + xmlTextWriterStartElement (odt->content_wtr, _xml("table:covered-table-cell")); + xmlTextWriterEndElement (odt->content_wtr); } - xmlTextWriterEndElement (x->content_wtr); } - - xmlTextWriterEndElement (x->content_wtr); /* row */ - if ( tab->t > 0 && r == tab->t - 1) - xmlTextWriterEndElement (x->content_wtr); + xmlTextWriterEndElement (odt->content_wtr); /* row */ + + int ht = body->h[V][0]; + if (ht > 0 && r == ht - 1) + xmlTextWriterEndElement (odt->content_wtr); /* table-header-rows */ } - xmlTextWriterEndElement (x->content_wtr); /* table */ + xmlTextWriterEndElement (odt->content_wtr); /* table */ + + /* Write a caption for the table */ + write_table__ (odt, pt, caption); + write_table__ (odt, pt, footnotes); + + table_unref (title); + table_unref (layers); + table_unref (body); + table_unref (caption); + table_unref (footnotes); } +static void +write_table (struct odt_driver *odt, const struct table_item *item) +{ + size_t *layer_indexes; + PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->pt, true) + write_table_layer (odt, item->pt, layer_indexes); +} -/* ODT driver class. */ -const struct outp_class odt_class = +static void +odt_output_text (struct odt_driver *odt, const char *text) { - "odt", - 1, + xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + xmlTextWriterWriteString (odt->content_wtr, _xml(text)); + xmlTextWriterEndElement (odt->content_wtr); +} - odt_open_driver, - odt_close_driver, +/* Submit a table to the ODT driver */ +static void +odt_submit (struct output_driver *driver, + const struct output_item *output_item) +{ + struct odt_driver *odt = odt_driver_cast (driver); - odt_open_page, - odt_close_page, - NULL, + if (is_table_item (output_item)) + write_table (odt, to_table_item (output_item)); + else if (is_text_item (output_item)) + odt_output_text (odt, text_item_get_text (to_text_item (output_item))); + else if (is_message_item (output_item)) + { + const struct message_item *message_item = to_message_item (output_item); + char *s = msg_to_string (message_item_get_msg (message_item)); + odt_output_text (odt, s); + free (s); + } +} - odt_output_chart, - odt_submit, +struct output_driver_factory odt_driver_factory = + { "odt", "pspp.odf", odt_create }; - NULL, - NULL, +static const struct output_driver_class odt_driver_class = +{ + "odf", + odt_destroy, + odt_submit, NULL, };