/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010 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 "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/text-item.h"
#include "gl/xalloc.h"
-#include "gl/error.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#define _xml(X) (const xmlChar *)(X)
+#define _xml(X) (CHAR_CAST (const xmlChar *, X))
struct odt_driver
{
static const struct output_driver_class odt_driver_class;
+static void write_table (struct odt_driver *, const struct table *);
+
static struct odt_driver *
odt_driver_cast (struct output_driver *driver)
{
{
FILE *fp;
- fp = tmpfile ();
+ fp = create_temp_file ();
if (fp == NULL)
{
- error (0, errno, _("error creating temporary file"));
+ msg_error (errno, _("error creating temporary file"));
return false;
}
fprintf (fp, "application/vnd.oasis.opendocument.text");
zip_writer_add (zip, fp, "mimetype");
- fclose (fp);
+ close_temp_file (fp);
return true;
}
create_writer (FILE **file, xmlTextWriterPtr *w)
{
/* XXX this can fail */
- *file = tmpfile ();
+ *file = create_temp_file ();
*w = xmlNewTextWriter (xmlOutputBufferCreateFile (*file, NULL));
xmlTextWriterStartDocument (*w, NULL, "UTF-8", NULL);
xmlTextWriterEndDocument (w);
xmlFreeTextWriter (w);
zip_writer_add (odt->zip, file, "styles.xml");
- fclose (file);
+ close_temp_file (file);
}
static void
xmlTextWriterEndDocument (w);
xmlFreeTextWriter (w);
zip_writer_add (odt->zip, file, "meta.xml");
- fclose (file);
+ close_temp_file (file);
}
static struct output_driver *
xmlTextWriterEndDocument (odt->manifest_wtr);
xmlFreeTextWriter (odt->manifest_wtr);
zip_writer_add (odt->zip, odt->manifest_file, "META-INF/manifest.xml");
- fclose (odt->manifest_file);
+ close_temp_file (odt->manifest_file);
return d;
}
xmlTextWriterEndDocument (odt->content_wtr);
xmlFreeTextWriter (odt->content_wtr);
zip_writer_add (odt->zip, odt->content_file, "content.xml");
- fclose (odt->content_file);
+ close_temp_file (odt->content_file);
zip_writer_close (odt->zip);
}
+ free (odt->file_name);
free (odt->command_name);
free (odt);
}
+static void
+write_xml_with_line_breaks (xmlTextWriterPtr writer, char *line)
+{
+ char *newline;
+ char *p;
+
+ for (p = line; *p; p = newline + 1)
+ {
+ newline = strchr (p, '\n');
+
+ if (!newline)
+ {
+ xmlTextWriterWriteString (writer, _xml(p));
+ 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_submit_table (struct odt_driver *odt, struct table_item *item)
{
- const struct table *tab = table_item_get_table (item);
const char *caption = table_item_get_caption (item);
- int r, c;
/* Write a heading for the table */
if (caption != NULL)
{
xmlTextWriterStartElement (odt->content_wtr, _xml("text:h"));
- xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:level"),
- "%d", 2);
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr,
+ _xml("text:outline-level"), "%d", 2);
xmlTextWriterWriteString (odt->content_wtr,
_xml (table_item_get_caption (item)) );
xmlTextWriterEndElement (odt->content_wtr);
}
+ write_table (odt, table_item_get_table (item));
+}
+
+static void
+write_table (struct odt_driver *odt, const struct table *tab)
+{
+ int r, c;
+
/* Start table */
xmlTextWriterStartElement (odt->content_wtr, _xml("table:table"));
xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:name"),
for (c = 0 ; c < table_nc (tab) ; ++c)
{
struct table_cell cell;
+ size_t i;
table_get_cell (tab, c, r, &cell);
odt->content_wtr, _xml("table:number-rows-spanned"),
"%d", rowspan);
- 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"));
-
- xmlTextWriterWriteString (odt->content_wtr, _xml(cell.contents));
-
- xmlTextWriterEndElement (odt->content_wtr); /* text:p */
- xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */
+ for (i = 0; i < cell.n_contents; i++)
+ {
+ const struct cell_contents *contents = &cell.contents[i];
+
+ 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"));
+
+ if (strchr (contents->text, '\n'))
+ {
+ char *line = xstrdup (contents->text);
+ write_xml_with_line_breaks (odt->content_wtr, line);
+ free (line);
+ }
+ else
+ xmlTextWriterWriteString (odt->content_wtr, _xml(contents->text));
+
+ xmlTextWriterEndElement (odt->content_wtr); /* text:p */
+ }
+ else if (contents->table)
+ {
+ write_table (odt, contents->table);
+ continue;
+ }
+ }
+ xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */
}
else
{
odt_submit_table (odt, to_table_item (output_item));
else if (is_text_item (output_item))
{
- /* XXX apply different styles based on text_item's type. */
- odt_output_text (odt, text_item_get_text (to_text_item (output_item)));
+ struct text_item *text_item = to_text_item (output_item);
+
+ 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))
{
}
}
-struct output_driver_factory odt_driver_factory = { "odt", odt_create };
+struct output_driver_factory odt_driver_factory =
+ { "odt", "pspp.odf", odt_create };
static const struct output_driver_class odt_driver_class =
{
projects / pspp / blobdiff