#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"
#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;
struct zip_writer *zip; /* ZIP file writer. */
+ struct file_handle *handle; /* Handle for 'file_name'. */
char *file_name; /* Output file name. */
/* content.xml */
return UP_CAST (driver, struct odt_driver, driver);
}
-/* Create the "mimetype" file needed by ODF */
-static bool
-create_mimetype (struct zip_writer *zip)
-{
- FILE *fp;
-
- fp = create_temp_file ();
- if (fp == NULL)
- {
- msg_error (errno, _("error creating temporary file"));
- return false;
- }
-
- fprintf (fp, "application/vnd.oasis.opendocument.text");
- zip_writer_add (zip, fp, "mimetype");
- close_temp_file (fp);
-
- return true;
-}
-
/* Creates a new temporary file and stores it in *FILE, then creates an XML
writer for it and stores it in *W. */
static void
_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"));
output_driver_init (d, &odt_driver_class, file_name, device_type);
odt->zip = zip;
+ odt->handle = fh;
odt->file_name = xstrdup (file_name);
- if (!create_mimetype (zip))
- {
- output_driver_destroy (d);
- return NULL;
- }
+ zip_writer_add_string (zip, "mimetype",
+ "application/vnd.oasis.opendocument.text");
/* Create the manifest */
create_writer (&odt->manifest_file, &odt->manifest_wtr);
zip_writer_close (odt->zip);
}
+ fh_unref (odt->handle);
free (odt->file_name);
free (odt);
}
xmlTextWriterStartElement (odt->content_wtr, _xml("text:h"));
xmlTextWriterWriteFormatAttribute (odt->content_wtr,
_xml("text:outline-level"), "%d", 2);
- xmlTextWriterWriteString (odt->content_wtr, _xml (text->content) );
+ xmlTextWriterWriteString (odt->content_wtr, _xml (text->content));
for (size_t i = 0; i < text->n_footnotes; i++)
write_footnote (odt, text->footnotes[i]);
xmlTextWriterEndElement (odt->content_wtr);
}
+static void
+write_table_item_cell (struct odt_driver *odt,
+ const struct table_cell *cell)
+{
+ if (!cell)
+ return;
+
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:h"));
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr,
+ _xml("text:outline-level"), "%d", 2);
+ xmlTextWriterWriteString (odt->content_wtr, _xml (cell->text));
+ for (size_t i = 0; i < cell->n_footnotes; i++)
+ write_footnote (odt, cell->footnotes[i]);
+ xmlTextWriterEndElement (odt->content_wtr);
+}
+
+static void
+write_table_item_layers (struct odt_driver *odt,
+ const struct table_item_layers *layers)
+{
+ if (!layers)
+ return;
+
+ for (size_t i = 0; i < layers->n_layers; i++)
+ {
+ const struct table_item_layer *layer = &layers->layers[i];
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:h"));
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr,
+ _xml("text:outline-level"), "%d", 2);
+ xmlTextWriterWriteString (odt->content_wtr, _xml (layer->content));
+ for (size_t i = 0; i < layer->n_footnotes; i++)
+ write_footnote (odt, layer->footnotes[i]);
+ xmlTextWriterEndElement (odt->content_wtr);
+ }
+}
+
static void
write_table (struct odt_driver *odt, const struct table_item *item)
{
int r, c;
/* Write a heading for the table */
- write_table_item_text (odt, table_item_get_title (item));
- write_table_item_text (odt, table_item_get_layers (item));
+ write_table_item_cell (odt, table_item_get_title (item));
+ write_table_item_layers (odt, table_item_get_layers (item));
/* Start table */
xmlTextWriterStartElement (odt->content_wtr, _xml("table:table"));
/* Start column definitions */
xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-column"));
- xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:number-columns-repeated"), "%d", table_nc (tab));
+ xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:number-columns-repeated"), "%d", tab->n[H]);
xmlTextWriterEndElement (odt->content_wtr);
/* Deal with row headers */
- if ( table_ht (tab) > 0)
+ if (tab->h[V][0] > 0)
xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows"));
/* Write all the rows */
- for (r = 0 ; r < table_nr (tab); ++r)
+ for (r = 0 ; r < tab->n[V]; ++r)
{
/* Start row definition */
xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-row"));
/* Write all the columns */
- for (c = 0 ; c < table_nc (tab) ; ++c)
+ for (c = 0 ; c < tab->n[H] ; ++c)
{
struct table_cell cell;
- size_t i;
table_get_cell (tab, c, r, &cell);
- if (c == cell.d[TABLE_HORZ][0] && r == cell.d[TABLE_VERT][0])
+ if (c == cell.d[H][0] && r == cell.d[V][0])
{
int colspan = table_cell_colspan (&cell);
int rowspan = table_cell_rowspan (&cell);
odt->content_wtr, _xml("table:number-rows-spanned"),
"%d", rowspan);
- for (i = 0; i < cell.n_contents; i++)
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+
+ if (r < tab->h[V][0] || c < tab->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"));
+
+ if (cell.options & TAB_MARKUP)
{
- const struct cell_contents *contents = &cell.contents[i];
- int j;
-
- 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 (contents->options & TAB_MARKUP)
- {
- /* XXX */
- char *s = output_get_text_from_markup (
- contents->text);
- write_xml_with_line_breaks (odt, s);
- free (s);
- }
- else
- 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 */
+ /* XXX */
+ char *s = output_get_text_from_markup (cell.text);
+ write_xml_with_line_breaks (odt, s);
+ free (s);
}
+ else
+ write_xml_with_line_breaks (odt, cell.text);
+
+ for (int i = 0; i < cell.n_footnotes; i++)
+ write_footnote (odt, cell.footnotes[i]);
+
+ xmlTextWriterEndElement (odt->content_wtr); /* text:p */
xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */
}
else
xmlTextWriterStartElement (odt->content_wtr, _xml("table:covered-table-cell"));
xmlTextWriterEndElement (odt->content_wtr);
}
-
- table_cell_free (&cell);
}
xmlTextWriterEndElement (odt->content_wtr); /* row */
- if ( table_ht (tab) > 0 && r == table_ht (tab) - 1)
+ int ht = tab->h[V][0];
+ if (ht > 0 && r == ht - 1)
xmlTextWriterEndElement (odt->content_wtr); /* table-header-rows */
}
projects / pspp / blobdiff