/* 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
#include <config.h>
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
/* A driver for creating OpenDocument Format text files from PSPP's output */
-#include <libpspp/assertion.h>
-#include <libpspp/version.h>
-
-#include <output/manager.h>
-#include <output/output.h>
-#include <output/table.h>
-
-#include <time.h>
+#include <errno.h>
+#include <libgen.h>
+#include <libxml/xmlwriter.h>
+#ifdef HAVE_PWD_H
#include <pwd.h>
+#endif
#include <sys/stat.h>
#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+#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 "output/driver-provider.h"
+#include "output/message-item.h"
+#include "output/options.h"
+#include "output/tab.h"
+#include "output/table-item.h"
+#include "output/table-provider.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
-#include <libgen.h>
-
-#include <libxml/xmlwriter.h>
-
-#include "xalloc.h"
-
-#include "error.h"
-
-#define _xml(X) (const xmlChar *)(X)
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define _xml(X) (CHAR_CAST (const xmlChar *, X))
-struct odf_driver_options
+struct odt_driver
{
- struct outp_driver *driver;
-
+ struct output_driver driver;
+
+ struct zip_writer *zip; /* ZIP file writer. */
char *file_name; /* Output file name. */
- bool debug;
-};
+ /* 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;
+ /* Number of tables so far. */
+ int table_num;
- /* Writer fot the manifest.xml file */
- xmlTextWriterPtr manifest_wtr;
+ /* Name of current command. */
+ char *command_name;
- struct odf_driver_options opts;
+ /* Number of footnotes so far. */
+ int n_footnotes;
};
+static const struct output_driver_class odt_driver_class;
+static struct odt_driver *
+odt_driver_cast (struct output_driver *driver)
+{
+ assert (driver->class == &odt_driver_class);
+ return UP_CAST (driver, struct odt_driver, driver);
+}
/* Create the "mimetype" file needed by ODF */
-static void
-create_mimetype (const char *dirname)
+static bool
+create_mimetype (struct zip_writer *zip)
{
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);
+ fp = create_temp_file ();
+ if (fp == NULL)
+ {
+ msg_error (errno, _("error creating temporary file"));
+ return false;
+ }
+
fprintf (fp, "application/vnd.oasis.opendocument.text");
- fclose (fp);
+ zip_writer_add (zip, fp, "mimetype");
+ close_temp_file (fp);
+
+ return true;
}
-/* 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);
-
- w = xmlNewTextWriterFilename (ds_cstr (&str), 0);
-
- ds_destroy (&str);
+ /* XXX this can fail */
+ *file = create_temp_file ();
+ *w = xmlNewTextWriter (xmlOutputBufferCreateFile (*file, NULL));
- 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"),
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"));
{
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);
}
-enum
-{
- output_file_arg,
- boolean_arg,
-};
-
-static const struct outp_option option_tab[] =
+static struct output_driver *
+odt_create (const char *file_name, enum settings_output_devices device_type,
+ struct string_map *o UNUSED)
{
- {"output-file", output_file_arg,0},
+ struct output_driver *d;
+ struct odt_driver *odt;
+ struct zip_writer *zip;
- {"debug", boolean_arg, 1},
+ zip = zip_writer_create (file_name);
+ if (zip == NULL)
+ return NULL;
- {NULL, 0, 0},
-};
+ odt = xzalloc (sizeof *odt);
+ d = &odt->driver;
+ output_driver_init (d, &odt_driver_class, file_name, device_type);
-static bool
-handle_option (void *options_, const char *key, const struct string *val)
-{
- struct odf_driver_options *options = options_;
- struct outp_driver *this = options->driver;
- int subcat;
- char *value = ds_cstr (val);
+ odt->zip = zip;
+ odt->file_name = xstrdup (file_name);
- switch (outp_match_keyword (key, option_tab, &subcat))
+ if (!create_mimetype (zip))
{
- case -1:
- error (0, 0,
- _("unknown configuration parameter `%s' for %s device "
- "driver"), key, this->class->name);
- break;
- case output_file_arg:
- free (options->file_name);
- options->file_name = xstrdup (value);
- break;
- case boolean_arg:
- if (!strcmp (value, "on") || !strcmp (value, "true")
- || !strcmp (value, "yes") || atoi (value))
- options->debug = true;
- else if (!strcmp (value, "off") || !strcmp (value, "false")
- || !strcmp (value, "no") || !strcmp (value, "0"))
- options->debug = false;
- else
- {
- error (0, 0, _("boolean value expected for %s"), key);
- return false;
- }
- break;
-
- default:
- NOT_REACHED ();
+ output_driver_destroy (d);
+ return NULL;
}
- return true;
-}
-
-
-static bool
-odt_open_driver (const char *name, int types, struct substring option_string)
-{
- struct odt_driver_ext *x;
- struct outp_driver *this = outp_allocate_driver (&odt_class, name, types);
-
- this->ext = x = xmalloc (sizeof *x);
-
- x->opts.driver = this;
- x->opts.file_name = xstrdup ("pspp.pdt");
- x->opts.debug = false;
-
- outp_parse_options (this->name, option_string, handle_option, &x->opts);
-
- outp_register_driver (this);
-
- x->dirname = xstrdup ("odt-XXXXXX");
- mkdtemp (x->dirname);
-
- create_mimetype (x->dirname);
-
/* 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;
-
- 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);
-
- /* Zip up the directory */
- ds_init_empty (&zip_cmd);
- ds_put_format (&zip_cmd,
- "cd %s ; rm -f ../%s; zip -q -X ../%s mimetype; zip -q -X -u -r ../pspp.odt .",
- x->dirname, x->opts.file_name, x->opts.file_name);
- system (ds_cstr (&zip_cmd));
- ds_destroy (&zip_cmd);
+ struct odt_driver *odt = odt_driver_cast (driver);
-
- if ( !x->opts.debug )
+ if (odt->content_wtr != NULL)
{
- /* 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);
- }
- else
- fprintf (stderr, "Not removing directory %s\n", x->dirname);
+ xmlTextWriterEndElement (odt->content_wtr); /* office:text */
+ xmlTextWriterEndElement (odt->content_wtr); /* office:body */
+ xmlTextWriterEndElement (odt->content_wtr); /* office:document-content */
- free (x->dirname);
- free (x);
+ xmlTextWriterEndDocument (odt->content_wtr);
+ xmlFreeTextWriter (odt->content_wtr);
+ zip_writer_add (odt->zip, odt->content_file, "content.xml");
+ close_temp_file (odt->content_file);
- return true;
+ zip_writer_close (odt->zip);
+ }
+
+ free (odt->file_name);
+ free (odt->command_name);
+ free (odt);
}
static void
-odt_open_page (struct outp_driver *this UNUSED)
+write_xml_with_line_breaks (struct odt_driver *odt, const char *line_)
{
-}
+ xmlTextWriterPtr writer = odt->content_wtr;
-static void
-odt_close_page (struct outp_driver *this UNUSED)
-{
+ 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_output_chart (struct outp_driver *this UNUSED, const struct chart *chart UNUSED)
+write_footnote (struct odt_driver *odt, const char *footnote)
{
- printf ("%s\n", __FUNCTION__);
-}
+ char marker[16];
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:note"));
+ xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:note-class"),
+ _xml("footnote"));
+
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:note-citation"));
+ str_format_26adic (++odt->n_footnotes, false, marker, sizeof marker);
+ if (strlen (marker) > 1)
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:label"),
+ "(%s)", marker);
+ else
+ xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:label"),
+ _xml(marker));
+ xmlTextWriterEndElement (odt->content_wtr);
+
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:note-body"));
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+ write_xml_with_line_breaks (odt, footnote);
+ xmlTextWriterEndElement (odt->content_wtr);
+ xmlTextWriterEndElement (odt->content_wtr);
+
+ 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 (struct odt_driver *odt, const struct table_item *item)
{
+ const struct table *tab = table_item_get_table (item);
+ const char *title = table_item_get_title (item);
int r, c;
-
- struct odt_driver_ext *x = this->ext;
- struct tab_table *tab = e->ext;
-
/* 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);
+ if (title != NULL)
+ {
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:h"));
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr,
+ _xml("text:outline-level"), "%d", 2);
+ xmlTextWriterWriteString (odt->content_wtr,
+ _xml (table_item_get_title (item)) );
+ xmlTextWriterEndElement (odt->content_wtr);
+ }
/* 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", table_nc (tab));
+ xmlTextWriterEndElement (odt->content_wtr);
/* Deal with row headers */
- if ( tab->t > 0)
- xmlTextWriterStartElement (x->content_wtr, _xml("table:table-header-rows"));
+ if ( table_ht (tab) > 0)
+ xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows"));
/* Write all the rows */
- for (r = 0 ; r < tab->nr; ++r)
+ for (r = 0 ; r < table_nr (tab); ++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 (c = 0 ; c < table_nc (tab) ; ++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;
+ size_t i;
- if (opts & TAB_EMPTY)
- {
- xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell"));
- xmlTextWriterEndElement (x->content_wtr);
- continue;
- }
+ table_get_cell (tab, 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[TABLE_HORZ][0] && r == cell.d[TABLE_VERT][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);
+
+ for (i = 0; i < cell.n_contents; i++)
+ {
+ const struct cell_contents *contents = &cell.contents[i];
+ int j;
+
+ if (contents->text)
+ {
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+
+ if ( r < table_ht (tab) || c < table_hl (tab) )
+ 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_xml_with_line_breaks (odt, contents->text);
+
+ for (j = 0; j < contents->n_footnotes; j++)
+ write_footnote (odt, contents->footnotes[j]);
+
+ xmlTextWriterEndElement (odt->content_wtr); /* text:p */
+ }
+ else if (contents->table)
+ write_table (odt, contents->table);
+
+ }
+ 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);
+ table_cell_free (&cell);
}
- xmlTextWriterEndElement (x->content_wtr); /* row */
+ xmlTextWriterEndElement (odt->content_wtr); /* row */
- if ( tab->t > 0 && r == tab->t - 1)
- xmlTextWriterEndElement (x->content_wtr); /* table-header-rows */
+ if ( table_ht (tab) > 0 && r == table_ht (tab) - 1)
+ xmlTextWriterEndElement (odt->content_wtr); /* table-header-rows */
}
- xmlTextWriterEndElement (x->content_wtr); /* table */
+ xmlTextWriterEndElement (odt->content_wtr); /* table */
}
+static void
+odt_output_text (struct odt_driver *odt, const char *text)
+{
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+ xmlTextWriterWriteString (odt->content_wtr, _xml(text));
+ xmlTextWriterEndElement (odt->content_wtr);
+}
-/* ODT driver class. */
-const struct outp_class odt_class =
+/* Submit a table to the ODT driver */
+static void
+odt_submit (struct output_driver *driver,
+ const struct output_item *output_item)
{
- "odf",
- 1,
+ struct odt_driver *odt = odt_driver_cast (driver);
- odt_open_driver,
- odt_close_driver,
+ output_driver_track_current_command (output_item, &odt->command_name);
- 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))
+ {
+ struct text_item *text_item = to_text_item (output_item);
- odt_output_chart,
- odt_submit,
+ if (text_item_get_type (text_item) != TEXT_ITEM_COMMAND_CLOSE)
+ odt_output_text (odt, text_item_get_text (text_item));
+ }
+ else if (is_message_item (output_item))
+ {
+ const struct message_item *message_item = to_message_item (output_item);
+ const struct msg *msg = message_item_get_msg (message_item);
+ char *s = msg_to_string (msg, odt->command_name);
+ odt_output_text (odt, s);
+ free (s);
+ }
+}
- NULL,
- NULL,
+struct output_driver_factory odt_driver_factory =
+ { "odt", "pspp.odf", odt_create };
+
+static const struct output_driver_class odt_driver_class =
+{
+ "odf",
+ odt_destroy,
+ odt_submit,
NULL,
};
projects / pspp / blobdiff