X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=683d19bcf59b31cb48206ead9a1eeb9705e8fe97;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=8cc3da9ae72324fc6a38be4cf4e47bedf6d4af1c;hpb=3c1d80a71e11e8678dc96bc49e69a13fd0f499fa;p=pspp diff --git a/src/output/odt.c b/src/output/odt.c index 8cc3da9ae7..683d19bcf5 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,100 +16,105 @@ #include - /* A driver for creating OpenDocument Format text files from PSPP's output */ -#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/options.h" +#include "output/output-item.h" +#include "output/pivot-table.h" +#include "output/pivot-output.h" +#include "output/table-provider.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 - -#include - -#include "xalloc.h" + struct zip_writer *zip; /* ZIP file writer. */ + struct file_handle *handle; /* Handle for 'file_name'. */ + char *file_name; /* Output file name. */ -#define _xml(X) (const xmlChar *)(X) + /* content.xml */ + xmlTextWriterPtr content_wtr; /* XML writer. */ + FILE *content_file; /* Temporary file. */ -struct odt_driver_ext -{ - /* The name of the temporary directory used to construct the ODF */ - char *dirname; + /* manifest.xml */ + xmlTextWriterPtr manifest_wtr; /* XML writer. */ + FILE *manifest_file; /* Temporary file. */ - /* Writer for the content.xml file */ - xmlTextWriterPtr content_wtr; - - /* Writer fot the manifest.xml file */ - xmlTextWriterPtr manifest_wtr; + /* Number of tables so far. */ + int table_num; }; +static const struct output_driver_class odt_driver_class; - -/* Create the "mimetype" file needed by ODF */ -static void -create_mimetype (const char *dirname) +static struct odt_driver * +odt_driver_cast (struct output_driver *driver) { - FILE *fp; - struct string filename; - ds_init_cstr (&filename, dirname); - ds_put_cstr (&filename, "/mimetype"); - fp = fopen (ds_cstr (&filename), "w"); - ds_destroy (&filename); - - assert (fp); - fprintf (fp, "application/vnd.oasis.opendocument.text"); - fclose (fp); + assert (driver->class == &odt_driver_class); + return UP_CAST (driver, struct odt_driver, driver); } -/* Create a new XML file called FILENAME in the temp directory, and return a writer for it */ -static xmlTextWriterPtr -create_writer (const struct odt_driver_ext *driver, const char *filename) +/* 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) { - char *copy = NULL; - xmlTextWriterPtr w; - struct string str; - ds_init_cstr (&str, driver->dirname); - ds_put_cstr (&str, "/"); - ds_put_cstr (&str, filename); - - /* dirname modifies its argument, so we must copy it */ - copy = xstrdup (ds_cstr (&str)); - mkdir (dirname (copy), 0700); - free (copy); + /* XXX this can fail */ + *file = create_temp_file (); + *w = xmlNewTextWriter (xmlOutputBufferCreateFile (*file, NULL)); - w = xmlNewTextWriterFilename (ds_cstr (&str), 0); - - ds_destroy (&str); - - xmlTextWriterStartDocument (w, NULL, "UTF-8", NULL); - - return w; + xmlTextWriterStartDocument (*w, NULL, "UTF-8", NULL); } static void -register_file (struct odt_driver_ext *x, const char *filename) +register_file (struct odt_driver *odt, const char *filename) { - assert (x->manifest_wtr); - 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 (filename)); - xmlTextWriterEndElement (x->manifest_wtr); + 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 void -write_style_data (struct odt_driver_ext *x) +write_style_data (struct odt_driver *odt) { - xmlTextWriterPtr w = create_writer (x, "styles.xml"); - register_file (x, "styles.xml"); + xmlTextWriterPtr w; + FILE *file; + + create_writer (&file, &w); + register_file (odt, "styles.xml"); xmlTextWriterStartElement (w, _xml ("office:document-styles")); xmlTextWriterWriteAttribute (w, _xml ("xmlns:office"), @@ -119,10 +124,10 @@ write_style_data (struct odt_driver_ext *x) _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") ); + _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")); @@ -189,19 +194,36 @@ write_style_data (struct odt_driver_ext *x) 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 void -write_meta_data (struct odt_driver_ext *x) +write_meta_data (struct odt_driver *odt) { - xmlTextWriterPtr w = create_writer (x, "meta.xml"); - register_file (x, "meta.xml"); + 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")); @@ -213,286 +235,412 @@ write_meta_data (struct odt_driver_ext *x) xmlTextWriterStartElement (w, _xml ("office:meta")); { xmlTextWriterStartElement (w, _xml ("meta:generator")); - xmlTextWriterWriteString (w, _xml (stat_version)); + xmlTextWriterWriteString (w, _xml (version)); xmlTextWriterEndElement (w); } { char buf[30]; - struct passwd *pw = getpwuid (getuid ()); time_t t = time (NULL); struct tm *tm = localtime (&t); strftime (buf, 30, "%Y-%m-%dT%H:%M:%S", tm); - xmlTextWriterStartElement (w, _xml ("meta:initial-creator")); - xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); - xmlTextWriterEndElement (w); - xmlTextWriterStartElement (w, _xml ("meta:creation-date")); xmlTextWriterWriteString (w, _xml (buf)); xmlTextWriterEndElement (w); - xmlTextWriterStartElement (w, _xml ("dc:creator")); - xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); - - 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); } -static bool -odt_open_driver (const char *name, int types, struct substring option_string) +static struct output_driver * +odt_create (struct file_handle *fh, enum settings_output_devices device_type, + struct string_map *o UNUSED) { - struct odt_driver_ext *x; - struct outp_driver *this = outp_allocate_driver (&odt_class, name, types); + struct output_driver *d; + struct odt_driver *odt; + struct zip_writer *zip; + const char *file_name = fh_get_file_name (fh); + + zip = zip_writer_create (file_name); + if (zip == NULL) + return NULL; - this->ext = x = xmalloc (sizeof *x); + odt = xzalloc (sizeof *odt); + d = &odt->driver; - outp_register_driver (this); + output_driver_init (d, &odt_driver_class, file_name, device_type); - x->dirname = xstrdup ("odt-XXXXXX"); - mkdtemp (x->dirname); + odt->zip = zip; + odt->handle = fh; + odt->file_name = xstrdup (file_name); - create_mimetype (x->dirname); + zip_writer_add_string (zip, "mimetype", + "application/vnd.oasis.opendocument.text"); /* Create the manifest */ - x->manifest_wtr = create_writer (x, "META-INF/manifest.xml"); + create_writer (&odt->manifest_file, &odt->manifest_wtr); - xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:manifest")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("xmlns:manifest"), + xmlTextWriterStartElement (odt->manifest_wtr, _xml("manifest:manifest")); + xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("xmlns:manifest"), _xml("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")); /* Add a manifest entry for the document as a whole */ - 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); + 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); - write_meta_data (x); - write_style_data (x); + write_meta_data (odt); + write_style_data (odt); - x->content_wtr = create_writer (x, "content.xml"); - register_file (x, "content.xml"); + create_writer (&odt->content_file, &odt->content_wtr); + register_file (odt, "content.xml"); /* Some necessary junk at the start */ - xmlTextWriterStartElement (x->content_wtr, _xml("office:document-content")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("xmlns:office"), + 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 (x->content_wtr, _xml("office:body")); - xmlTextWriterStartElement (x->content_wtr, _xml("office:text")); + xmlTextWriterStartElement (odt->content_wtr, _xml("office:body")); + xmlTextWriterStartElement (odt->content_wtr, _xml("office:text")); /* Close the manifest */ - xmlTextWriterEndElement (x->manifest_wtr); - xmlTextWriterEndDocument (x->manifest_wtr); - xmlFreeTextWriter (x->manifest_wtr); + 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 string zip_cmd; - struct string rm_cmd; - struct odt_driver_ext *x = this->ext; + struct odt_driver *odt = odt_driver_cast (driver); - xmlTextWriterEndElement (x->content_wtr); /* office:text */ - xmlTextWriterEndElement (x->content_wtr); /* office:body */ - xmlTextWriterEndElement (x->content_wtr); /* office:document-content */ - - xmlTextWriterEndDocument (x->content_wtr); - xmlFreeTextWriter (x->content_wtr); + if (odt->content_wtr != NULL) + { + xmlTextWriterEndElement (odt->content_wtr); /* office:text */ + xmlTextWriterEndElement (odt->content_wtr); /* office:body */ + xmlTextWriterEndElement (odt->content_wtr); /* office:document-content */ - /* Zip up the directory */ - ds_init_empty (&zip_cmd); - ds_put_format (&zip_cmd, "cd %s ; rm -f ../pspp.odt; zip -q -X ../pspp.odt mimetype; zip -q -X -u -r ../pspp.odt .", x->dirname); - system (ds_cstr (&zip_cmd)); - ds_destroy (&zip_cmd); + xmlTextWriterEndDocument (odt->content_wtr); + xmlFreeTextWriter (odt->content_wtr); + zip_writer_add (odt->zip, odt->content_file, "content.xml"); + close_temp_file (odt->content_file); + zip_writer_close (odt->zip); + } - /* Remove the temp dir */ - ds_init_empty (&rm_cmd); - ds_put_format (&rm_cmd, "rm -r %s", x->dirname); - system (ds_cstr (&rm_cmd)); - ds_destroy (&rm_cmd); + fh_unref (odt->handle); + free (odt->file_name); + free (odt); +} - free (x->dirname); - free (x); +static void +write_xml_with_line_breaks (struct odt_driver *odt, const char *line_) +{ + xmlTextWriterPtr writer = odt->content_wtr; - return true; + 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_open_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) { + 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_close_page (struct outp_driver *this) +write_table_item_cell (struct odt_driver *odt, + const struct pivot_table *pt, + const struct table_cell *cell) { + 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_output_chart (struct outp_driver *this, const struct chart *chart) +write_table__ (struct odt_driver *odt, const struct pivot_table *pt, + const struct table *t) { - printf ("%s\n", __FUNCTION__); + 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); + } + } } - -/* Submit a table to the ODT driver */ static void -odt_submit (struct outp_driver *this, struct som_entity *e) +write_table_layer (struct odt_driver *odt, const struct pivot_table *pt, + const size_t *layer_indexes) { - int r, c; - - struct odt_driver_ext *x = this->ext; - struct tab_table *tab = e->ext; - + struct table *title, *layers, *body, *caption, *footnotes; + pivot_output (pt, layer_indexes, true, &title, &layers, &body, + &caption, &footnotes, NULL, NULL); /* Write a heading for the table */ - 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_table__ (odt, pt, title); + write_table__ (odt, pt, layers); /* Start table */ - xmlTextWriterStartElement (x->content_wtr, _xml("table:table")); - xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:name"), - "TABLE-%d.%d", e->table_num, e->subtable_num); + 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")); - + if (body->h[V][0] > 0) + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows")); + /* Write all the rows */ - for (r = 0 ; r < tab->nr; ++r) + for (int r = 0 ; r < body->n[V]; ++r) { - int spanned_columns = 0; /* Start row definition */ - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-row")); + xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-row")); /* Write all the columns */ - for (c = 0 ; c < tab->nc ; ++c) + for (int c = 0 ; c < body->n[H] ; ++c) { - char *s = NULL; - unsigned int opts = tab->ct[tab->nc * r + c]; - struct substring ss = tab->cc[tab->nc * r + c]; + struct table_cell cell; - if (opts & TAB_EMPTY) - { - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); - xmlTextWriterEndElement (x->content_wtr); - continue; - } + table_get_cell (body, c, r, &cell); - if ( opts & TAB_JOIN) - { - if ( spanned_columns == 0) - { - struct tab_joined_cell *j = (struct tab_joined_cell*) ss_data (ss); - s = ss_xstrdup (j->contents); - } - } - else - s = ss_xstrdup (ss); + if (c == cell.d[H][0] && r == cell.d[V][0]) + { + int colspan = table_cell_colspan (&cell); + int rowspan = table_cell_rowspan (&cell); - if ( spanned_columns == 0 ) - { - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:value-type"), _xml("string")); - - if ( opts & TAB_JOIN ) - { - struct tab_joined_cell *j = (struct tab_joined_cell*) ss_data (ss); - spanned_columns = j->x2 - j->x1; - - xmlTextWriterWriteFormatAttribute (x->content_wtr, - _xml("table:number-columns-spanned"), - "%d", spanned_columns); - } - - 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); /* text:p */ - xmlTextWriterEndElement (x->content_wtr); /* table:table-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); + + 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 { - xmlTextWriterStartElement (x->content_wtr, _xml("table:covered-table-cell")); - xmlTextWriterEndElement (x->content_wtr); + xmlTextWriterStartElement (odt->content_wtr, _xml("table:covered-table-cell")); + xmlTextWriterEndElement (odt->content_wtr); } - if ( opts & TAB_JOIN ) - spanned_columns --; - - free (s); } - - xmlTextWriterEndElement (x->content_wtr); /* row */ - if ( tab->t > 0 && r == tab->t - 1) - xmlTextWriterEndElement (x->content_wtr); /* table-header-rows */ + 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 pivot_table *pt) +{ + size_t *layer_indexes; + PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, pt, true) + write_table_layer (odt, pt, layer_indexes); +} -/* ODT driver class. */ -const struct outp_class odt_class = +static void +odt_output_text (struct odt_driver *odt, const char *text) { - "odf", - 1, + xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + xmlTextWriterWriteString (odt->content_wtr, _xml(text)); + xmlTextWriterEndElement (odt->content_wtr); +} + +/* Submit a table to the ODT driver */ +static void +odt_submit (struct output_driver *driver, const struct output_item *item) +{ + struct odt_driver *odt = odt_driver_cast (driver); - odt_open_driver, - odt_close_driver, + switch (item->type) + { + case OUTPUT_ITEM_CHART: + break; + + case OUTPUT_ITEM_GROUP_OPEN: + break; + + case OUTPUT_ITEM_GROUP_CLOSE: + break; + + case OUTPUT_ITEM_IMAGE: + break; + + case OUTPUT_ITEM_MESSAGE: + { + char *s = msg_to_string (item->message); + odt_output_text (odt, s); + free (s); + } + break; + + case OUTPUT_ITEM_PAGE_BREAK: + break; + + case OUTPUT_ITEM_PAGE_SETUP: + break; + + case OUTPUT_ITEM_TABLE: + write_table (odt, item->table); + break; + + case OUTPUT_ITEM_TEXT: + { + char *text = text_item_get_plain_text (item); + odt_output_text (odt, text); + free (text); + } + break; + } +} - odt_open_page, - odt_close_page, - NULL, +struct output_driver_factory odt_driver_factory = + { "odt", "pspp.odf", odt_create }; - odt_output_chart, +static const struct output_driver_class odt_driver_class = +{ + "odf", + odt_destroy, odt_submit, - - NULL, - NULL, NULL, };